summary refs log tree commit diff
path: root/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix')
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix27787
1 files changed, 18944 insertions, 8843 deletions
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 = {