Merge branch 'master' of github.com:NixOS/nixpkgs

4 files changed, 1999 insertions, 1321 deletions

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 2ce8b23203fe..d54b686244e8 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -471,10 +471,10 @@
     debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }:
     elpaBuild {
         pname = "debbugs";
-        version = "0.10";
+        version = "0.11";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/debbugs-0.10.tar";
-          sha256 = "0vrsa70h6ipsq01qr9qzlaw1704xqviby321ri6w69wkwlcjkpin";
+          url = "https://elpa.gnu.org/packages/debbugs-0.11.tar";
+          sha256 = "10v9s7ayvfzd6j6hqfc9zihxgmsc2j0xhxrgy3ah30qkqn6z8w6n";
         };
         packageRequires = [ cl-lib soap-client ];
         meta = {
@@ -711,10 +711,10 @@
       }) {};
     exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
         pname = "exwm";
-        version = "0.10";
+        version = "0.11";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/exwm-0.10.tar";
-          sha256 = "1c8558dxy7a2m61a0bc0p5vrdw3nw03zq9s8wxgmdvlklyzbqa22";
+          url = "https://elpa.gnu.org/packages/exwm-0.11.tar";
+          sha256 = "108n09b6512y05rskq754hzwc5nzqmkq1lfrarl34my41wsc1qnf";
         };
         packageRequires = [ xelb ];
         meta = {
@@ -767,10 +767,10 @@
     ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "ggtags";
-        version = "0.8.11";
+        version = "0.8.12";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ggtags-0.8.11.el";
-          sha256 = "1q2bp2b7lylf7n6c1psfn5swyjg0y78ykm0ak2kd84pbyhqak2mq";
+          url = "https://elpa.gnu.org/packages/ggtags-0.8.12.el";
+          sha256 = "0ny3llk021g6r0s75xdm4hzpbxv393ddm2r6f2xdk8kqnq4gnirp";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1336,10 +1336,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20160912";
+        version = "20161003";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20160912.tar";
-          sha256 = "0g44hcyk9x0103mfkmkbrn4f36vlyrfxil1qd3fpwardcnaxr5w4";
+          url = "https://elpa.gnu.org/packages/org-20161003.tar";
+          sha256 = "077v69l3w5q0rfbj1mm92cs2pz5yh3p89qnxxj0zn3g5m0dg9yjm";
         };
         packageRequires = [];
         meta = {
@@ -1687,10 +1687,10 @@
       }) {};
     stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "stream";
-        version = "2.2.2";
+        version = "2.2.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/stream-2.2.2.el";
-          sha256 = "00p24ipn8frlhhwzrz6za7dq4fkhs8i8cwp48yhsq9zpnj9y38xb";
+          url = "https://elpa.gnu.org/packages/stream-2.2.3.el";
+          sha256 = "1y9nh5473p0dd149g675nybsdnzp8c4mq3wdql066nir7scz6rhy";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2061,10 +2061,10 @@
     ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "ztree";
-        version = "1.0.3";
+        version = "1.0.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ztree-1.0.3.tar";
-          sha256 = "1mwzk48sah4w5jmlmzqxnwhnlnc2mf25ayhgymv24sv8c6hdllsw";
+          url = "https://elpa.gnu.org/packages/ztree-1.0.4.tar";
+          sha256 = "0xiiaa660s8z7901siwvmqkqz30agfzsy3zcyry2r017m3ghqjph";
         };
         packageRequires = [ cl-lib ];
         meta = {
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index ca751b21fc01..92ef4d0393c7 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -2,12 +2,12 @@
     _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "_0blayout";
-        version = "20160918.133";
+        version = "20160919.823";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "0blayout-mode";
-          rev = "2383bd5a71faaf451db24897f107728aa0626d61";
-          sha256 = "0238cavnwr1j06ablc3cznhiyrizns2ri599sk509858jyvcaz04";
+          rev = "b8bb44b5336965b5519b9a826a0f46f8ee31c471";
+          sha256 = "1apv5zd3zzni2llj9is7h2bzq1xxbx67kr7c07dfjd26n7l0zvfi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6521ec44ae8b0ba2e0523517f0f3d5b94ddbe1be/recipes/0blayout";
@@ -20,6 +20,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "_0xc";
+        version = "20161001.1852";
+        src = fetchFromGitHub {
+          owner = "AdamNiederer";
+          repo = "0xc";
+          rev = "9a05fcafe6727df0844feba7fbeb75e39ffe15a4";
+          sha256 = "0yy83di1jc5nnnvfxd2l0pnzikp07m0d5szz2pkl88yrpacpnndn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3fbb2c86a50a8df9a3967787fc10f33beab2c933/recipes/0xc";
+          sha256 = "0lxcz1x1dymsh9idhkn7jn8vphr724d6sb88a4g55x2m1rlmzg3w";
+          name = "_0xc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/0xc";
+          license = lib.licenses.free;
+        };
+      }) {};
     _2048-game = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "_2048-game";
@@ -359,8 +380,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "4b873d36a3a9a90999a59c074c0a9e86fdbb9c51";
-          sha256 = "0mnaahi5pjkz67vykpaqzi9w005zsy18k4s3scksvpd6as4jbdid";
+          rev = "6e52e1b8501288e57dd0523270ed6406795b0b9e";
+          sha256 = "0jx04r7jz1ijq8y7kzcj1j8msxjnh3vbzi378dazr3762ixj51m5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -418,12 +439,12 @@
     ac-etags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ac-etags";
-        version = "20151031.1921";
+        version = "20161001.807";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-ac-etags";
-          rev = "e53cb3a8dd44e41fba3d2b737f90a8cfc529e2a6";
-          sha256 = "140i02b2ipyfmki945l1xd1nsqdpganhmi3bmwj1h9w8cg078bd4";
+          rev = "7983e631c226fe0fa53af3b2d56bf4eca3d785ce";
+          sha256 = "1vvgcy5hybrip4jn4pj9r3fahr6rc70k28w5aw951h0x7g7laipr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fda9c7def8bc54af4ab17dc049dd94324c8f10fa/recipes/ac-etags";
@@ -443,8 +464,8 @@
         src = fetchFromGitHub {
           owner = "xiaohanyu";
           repo = "ac-geiser";
-          rev = "0e2e36532336f27e3dc3b01fff55ad1a4329817d";
-          sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
+          rev = "cecfcf1a5c4be580b9337d9f4f9337c6ae1e0d91";
+          sha256 = "0zaia963kpnqmlxafp0m0jibzz6fvvjj7f1v4lcwb9cvs2b7vq1m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/586ef409e3ae758b459b625d4bf0108f0525a085/recipes/ac-geiser";
@@ -716,8 +737,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "b9e3d647d1724f50af5622be944ea94d04078194";
-          sha256 = "0jbx7vhbib5p2j6db2q79mi7ivqqzc92l5f6y0pyi5d4x8c5nyjb";
+          rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a";
+          sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -737,8 +758,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "b9e3d647d1724f50af5622be944ea94d04078194";
-          sha256 = "0jbx7vhbib5p2j6db2q79mi7ivqqzc92l5f6y0pyi5d4x8c5nyjb";
+          rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a";
+          sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -859,12 +880,12 @@
     ace-isearch = callPackage ({ ace-jump-mode, avy, emacs, fetchFromGitHub, fetchurl, helm-swoop, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-isearch";
-        version = "20160804.1608";
+        version = "20160927.330";
         src = fetchFromGitHub {
           owner = "tam17aki";
           repo = "ace-isearch";
-          rev = "1355f15b49490eeff0336716f4b27b02784ef55a";
-          sha256 = "15rsb0i53k9vi7w2p08k89wdqcy51av0jg8zb5a0vssc7awpk4sk";
+          rev = "b8c59511d7ff13ed050a80be372121d9cba9e160";
+          sha256 = "1flfskn0bsz0mxfys0ipn20355v20d48l8mgf41wb49kvnnd1bmz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/344f0cf784a027cde196b7d766024fb415fa1968/recipes/ace-isearch";
@@ -901,12 +922,12 @@
     ace-jump-helm-line = callPackage ({ avy, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-jump-helm-line";
-        version = "20160329.1218";
+        version = "20160918.1136";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "ace-jump-helm-line";
-          rev = "8779050e4794279946892b6a156d0086554a9c9e";
-          sha256 = "1d4bxxcnjbdr6cjr3jmz2zrnzjv5pwrypbp4xqgqyv9rz02n7ac1";
+          rev = "1483055255df3f8ae349f7520f05b1e43ea3ed37";
+          sha256 = "191a2g1if1jliikbxkpwmvlp4v1sp541j71xrlymili8ygm0idq5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8925f3daa92ff39776b55642aa9ec0e49245c0c7/recipes/ace-jump-helm-line";
@@ -964,12 +985,12 @@
     ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-link";
-        version = "20160912.853";
+        version = "20160925.1210";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-link";
-          rev = "624c5ffeb98f7805768084b8a2530ea21a78cf38";
-          sha256 = "0s5zsa1asq5wcjkrcrpd82075irg9yzz1wj8hrir7bfxmwpmz1k5";
+          rev = "822628e39345b77f9444fdfc17bd660b7831e536";
+          sha256 = "002wi64awig3kdyihqdisxsfaiailyjw90ah9j1i6qqasgvm9acn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1048,12 +1069,12 @@
     ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-window";
-        version = "20160225.819";
+        version = "20160923.1117";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-window";
-          rev = "77cc05f7284577ed396f292de0e7bb8ec561ea81";
-          sha256 = "1afc0f8ax334gv644zdrrp55754gxa353iijvmfzxmlr67v23j96";
+          rev = "92bd29c4fd8132944385083600b29a3f9a50a37c";
+          sha256 = "078wsnslyh1wr8j8flwj7n06cf6vl152d92l9cjsj91hgy70bb73";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window";
@@ -1131,12 +1152,12 @@
     addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "addressbook-bookmark";
-        version = "20160316.2303";
+        version = "20160925.22";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "addressbook-bookmark";
-          rev = "f58b944d11f8522ab85bbaf52a9591518e296545";
-          sha256 = "0dk7hyp7cs0ws4w7i32g7di5aqkkxlxkvmrllg43bi5ivlji7pvn";
+          rev = "53732af6e225976f8d51c971041eed4320987c36";
+          sha256 = "0qnh9bk5xgggh80wylzq06alxkj22y9p8lixncjanwhygh80vv3s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark";
@@ -1339,12 +1360,12 @@
     airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "airline-themes";
-        version = "20160907.922";
+        version = "20161003.811";
         src = fetchFromGitHub {
           owner = "AnthonyDiGirolamo";
           repo = "airline-themes";
-          rev = "6f7c62553a265d6b8b09df355bbd6bb36e9a15f7";
-          sha256 = "021chmk8xxf3pq0avw54n9683v6swkhpxk927mfpnlw1824pqkbf";
+          rev = "563638c5b4102805e5b3282abfb2278921c07898";
+          sha256 = "10c3cgjz9q5di3cpnvx970l36akf1i0w7sxas0ppk7gpy22cg2wl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes";
@@ -1381,12 +1402,12 @@
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "alchemist";
-        version = "20160917.613";
+        version = "20161002.2144";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "c9852e692b26f9cafa226b279c07c562ea41a000";
-          sha256 = "0f40q1s78j5j0l4hj5q73hssl86dbvjqpk09cq93zwgcsmr1ydi9";
+          rev = "5693e5a7b1d75faee0dd424cd89fd20b3b9d77f6";
+          sha256 = "1cim833y3xh2s0vz3zawxbybb1yri8qmfhhk3iqbiw2w9gg2y4qs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1507,12 +1528,12 @@
     all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20160918.1";
+        version = "20160921.935";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "4386585272116656dd84558977df70d000aacc25";
-          sha256 = "0a3gm4wvy416vah5hwmyzh1m58246f4gy40vb0zl681bivz0a97m";
+          rev = "21b2e084a8779a6eb2e800add37671e21e5fc5d8";
+          sha256 = "1zw6mkayf9dqxkk6pfb6niarkxk1jcwdln45jp7q7n8vq3cqg6rp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1528,12 +1549,12 @@
     amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }:
     melpaBuild {
         pname = "amd-mode";
-        version = "20160801.1445";
+        version = "20160923.134";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "amd-mode.el";
-          rev = "f785c5bf39f04194dbeb5c55138c03de1524bb22";
-          sha256 = "1f6q4p31v0j0n088blz87fp8n4awr39w7fpid9yfkccpi7grmjkn";
+          rev = "c610c1a85728d161d28854d7373fc13b3dec311b";
+          sha256 = "1ghs3gh410c9w2v17zb93wk184lwl5izpkzrm0qn37qz8i87jqcr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode";
@@ -1579,12 +1600,12 @@
     ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ample-theme";
-        version = "20160913.544";
+        version = "20161002.1640";
         src = fetchFromGitHub {
           owner = "jordonbiondo";
           repo = "ample-theme";
-          rev = "75bd5c7f2fd45d6f3f68ea6f06e95175a7b4e4ce";
-          sha256 = "0w753zs6xzbqaxym02dh4gfgab0cslqa74s7rlhlq0dzjm1sbn7r";
+          rev = "7546ab41c4c106be7b781a8c351abfb59fe95078";
+          sha256 = "124kxhp7q4ddlj4nhjn8y2w3s08ln8am49cwjvwsvrfliz87n9kq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme";
@@ -1871,12 +1892,12 @@
     ansible-doc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ansible-doc";
-        version = "20150524.1005";
+        version = "20160924.124";
         src = fetchFromGitHub {
           owner = "lunaryorn";
           repo = "ansible-doc.el";
-          rev = "d0ce210674b5bee9836e6773c4e823747a6f1946";
-          sha256 = "1h3rqrjrl8wx7xvvd631jkbbczq3srd4mgz7y9wh3cvz1njdpy62";
+          rev = "bc8128a85a79b14f4a121105d87a5eddc33975ad";
+          sha256 = "0z3y69sfzka764wjbx31dywdq4d6bfsafv2gmmbpmxqmwfmy8sz4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1daaaa7462f0b83c15ed9d9e7e6d0ee94434b8e9/recipes/ansible-doc";
@@ -1889,6 +1910,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ansible-vault";
+        version = "20161001.1001";
+        src = fetchFromGitHub {
+          owner = "zellio";
+          repo = "ansible-vault-mode";
+          rev = "8b4cdebb817c979b13eab625e3bbeebb08ddf026";
+          sha256 = "1gqga59qinmkjalk1jkbh8w70sqvb3p033sbx69qljc2mivs8rh8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault";
+          sha256 = "0pmsvpc866rgcajb2ihhb62g3rwhda7vvq2kxkvr566y609vv021";
+          name = "ansible-vault";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ansible-vault";
+          license = lib.licenses.free;
+        };
+      }) {};
     ant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ant";
@@ -2715,12 +2757,12 @@
     auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auctex-latexmk";
-        version = "20160706.503";
+        version = "20160923.7";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "auctex-latexmk";
-          rev = "c4d5a1ecea2506fc9854f3740550616a92c76686";
-          sha256 = "0bfr0fc6mjll6jg15g8k46vp5xaqkjhda1caynwzpb26mr3jcf3q";
+          rev = "b7053f71f578ffb0d247f8a9e8d5152efd86e096";
+          sha256 = "0slihygr74vyijnyzssckapscxmdd7zlgrs0wvmpw9hnjzwwzzql";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk";
@@ -3073,8 +3115,8 @@
         src = fetchFromGitHub {
           owner = "sebastiw";
           repo = "distel-completion";
-          rev = "994c61dda2e3256b41fa2e53821c484b5ffd13e6";
-          sha256 = "00nifdhwy89zmi50hln5p5albdx7ypm4mbdfjzhk4870crx4zjr2";
+          rev = "2ba4eea51cecfa75cf62f58180460ee9ff43131f";
+          sha256 = "1761lgplngmpn1vd8syc1h4g6q1dhngamz1j3n48z07c1ylzpkdd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/auto-complete-distel";
@@ -3294,6 +3336,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "auto-org-md";
+        version = "20160923.708";
+        src = fetchFromGitHub {
+          owner = "jamcha-aa";
+          repo = "auto-org-md";
+          rev = "7604c06c1b2f1d01c2e88f114bb0d2d00f21dabb";
+          sha256 = "18js1pa60095fs8qjzhjhkx9sjwa2h2iribb27gqv59796qxkfsg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/39f934f86b5dc04078c204bcbd268af60857e268/recipes/auto-org-md";
+          sha256 = "1yh9g8407kym6r0b8kr18qshxlrkw47ac17a9lvql0ksshfmnqvk";
+          name = "auto-org-md";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "https://melpa.org/#/auto-org-md";
+          license = lib.licenses.free;
+        };
+      }) {};
     auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auto-package-update";
@@ -3402,12 +3465,12 @@
     auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "auto-yasnippet";
-        version = "20160809.46";
+        version = "20160925.225";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "auto-yasnippet";
-          rev = "4496ad507041e48d36522ed1616e430df3f87efe";
-          sha256 = "17g463clsyi69fl2mzy84yg6v3sh7nq3ij06spx5j0fpxvmbf6z8";
+          rev = "d1ccfea87312c6dd8cf8501ab5b71b1d3d44d95b";
+          sha256 = "1i8k2qiyzd5rq0zplk4xb5nfa5mp0ibxbzwqj6c7877waq7244xk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d33c0aee6a5d27217bbae28fc8f448c3badc8a4b/recipes/auto-yasnippet";
@@ -3423,12 +3486,12 @@
     autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "autobookmarks";
-        version = "20160917.1423";
+        version = "20160930.1113";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "autobookmarks";
-          rev = "4237f7b64d8eab7c0717f110a78bf689b06c99b5";
-          sha256 = "06ng67slv468a2sqqvr82hy2r90nk5nk75f60cc65qs4i4hf8b0c";
+          rev = "067c29cd6088c019578df8530356c126eef9ea2c";
+          sha256 = "0iqcl1y1lnfma95lhdyy1zkkn8xlp2hin2wb0gbmkcrlfy0cw364";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks";
@@ -3607,19 +3670,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    avandu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
+    avandu = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "avandu";
         version = "20140412.1426";
-        src = fetchFromGitHub {
-          owner = "dk87";
-          repo = "avandu";
-          rev = "98155b6da0e81e9480de94791df75f1f7b9653f6";
-          sha256 = "06fwpqj21z1xrfl0i9jjrn14vk83a0h32scja34hk7pj9vc2854m";
+        src = fetchgit {
+          url = "git://ryuslash.org/avandu.git";
+          rev = "891a847b0fff0ec1abfa717ede28250a16d5c429";
+          sha256 = "01mcp4q8qsbcz2nfsfd5wndpnka7qfiqfn2f35y0pm56di7a49v5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/824aa2dbc230142e893ace4470d386290db8785e/recipes/avandu";
-          sha256 = "00fhc3mw7ihfil8fbnibgs8bch9712fya2d1k7k3ll2aln25jjxw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a67d2cd2d62c5deb4b9bbbe8efcd014c151f58e/recipes/avandu";
+          sha256 = "1pyjpdyk8s4zandz8n1wgyvn0mpvrqn7g34ljnpjr8xciv6qsfpq";
           name = "avandu";
         };
         packageRequires = [];
@@ -3715,12 +3776,12 @@
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
-        version = "20160908.1034";
+        version = "20161001.845";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "404cc625a374d183cc8bf2dc89d7bd77d5f54e3a";
-          sha256 = "0zj20wg3irdkydlqnlmb4idq9aa8kfgjpl42clckprlcrdmf3ca5";
+          rev = "74d57be48c29a05e79a920f890a083ab0da75769";
+          sha256 = "0s9lhg6kjm51h4wzv2rz6rbl2wr7k54i4bhvsifq6c66cmwz5phl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -3736,12 +3797,12 @@
     avy-zap = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy-zap";
-        version = "20160330.1130";
+        version = "20160921.1444";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "avy-zap";
-          rev = "173dbb6339e683ff8ed0114cdd5a6490ab6b28f0";
-          sha256 = "0nv6y9jwy2z4rlnd6qklhqww367kaqjc5id7yr4hsmxmxw2jj43p";
+          rev = "6081738668ab726099ce1c711c580d9745dfaede";
+          sha256 = "0byanv32kxsd1lzvyq82xmyfx4drx5j5i10whyyq8a5hhvrpg1qy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10a2a57c78ac1d8ab621031caa21e8574daeb9a0/recipes/avy-zap";
@@ -3772,22 +3833,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    aws-ec2 = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, tablist }:
+    aws-ec2 = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, tablist }:
     melpaBuild {
         pname = "aws-ec2";
-        version = "20160710.2110";
+        version = "20161002.628";
         src = fetchFromGitHub {
           owner = "Yuki-Inoue";
           repo = "aws.el";
-          rev = "408c4e7973d5cf148c5379237d18326e99fdfca2";
-          sha256 = "0k97xwyi1img990ynkq5lqh9g651azmb49p9400fs9m5z64q9hn8";
+          rev = "2bac460bd54cefe4d1781255ea4800a9037fc520";
+          sha256 = "0d8n7ii5z81cc4i5fhbs31b0wfh492qmi8n207cy0ndvpm774l8v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90ac00160cbf692baa1f3953122ac828356944e0/recipes/aws-ec2";
           sha256 = "040c69g8rhpcmrdjjg4avdmqarxx3dfzylmz62yxhfpn02qh48xd";
           name = "aws-ec2";
         };
-        packageRequires = [ dash dash-functional emacs magit-popup tablist ];
+        packageRequires = [ cl-lib dash emacs magit-popup tablist ];
         meta = {
           homepage = "https://melpa.org/#/aws-ec2";
           license = lib.licenses.free;
@@ -3946,12 +4007,12 @@
     badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "badwolf-theme";
-        version = "20160917.1018";
+        version = "20160920.839";
         src = fetchFromGitHub {
           owner = "bkruczyk";
           repo = "badwolf-emacs";
-          rev = "9aa8bb4e387192211fde213f5344a017266e3974";
-          sha256 = "0k1ahcxj64s4g1c9w8qjyp23gskvp4b5nqbssspjhlcc46j99fpa";
+          rev = "436f48df120530f4eab7c9f02e0b55805122b970";
+          sha256 = "0hnb3a4yyz4q94cgbmv1ygpir7azgmzd70l7zafibbxvsp4zir43";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01f3deade0759830ed2e70e00e596915be5f5c11/recipes/badwolf-theme";
@@ -3985,15 +4046,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bar-cursor";
+        version = "20160923.920";
+        src = fetchFromGitHub {
+          owner = "ajsquared";
+          repo = "bar-cursor";
+          rev = "afa1d4bc1937610cc30575d71aab85ea20ebf2ea";
+          sha256 = "1cj28v48xajy1nsqk92vinaz2rh1crm5g58ma5gnibkdnkpq828s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/932e7b128f092ec724ebf18c9c5ca84e16edc82c/recipes/bar-cursor";
+          sha256 = "0f7z3mlnh3p28pmn1bnqbszcy1j68dwm8xra1wz8jgykvrdlyf2s";
+          name = "bar-cursor";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/bar-cursor";
+          license = lib.licenses.free;
+        };
+      }) {};
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20160914.1130";
+        version = "20160930.2031";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "97359d48a00b30776c5416ea90735d8302687677";
-          sha256 = "0f0gg5kfzgii0rf75gh48wnwimkc88xzwbifkwdf745jhzkyqn6s";
+          rev = "4a50d7fce61c96865d603829f5fe1003848e8fbb";
+          sha256 = "1v0ayygk51m292b4vb677v1mafma6a68zxfkhv9a0825ax8w42ix";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4131,11 +4213,11 @@
       }) {};
     bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bbdb";
-        version = "20160720.2318";
+        version = "20161001.2212";
         src = fetchgit {
           url = "git://git.savannah.nongnu.org/bbdb.git";
-          rev = "2ea2846d5f34a843dcaf666ad0fc8f603d949b16";
-          sha256 = "1xhxnw2svxnb0g3wj86ffcjcsx9jf29s0cpxj2nqgab9r5pyqh1k";
+          rev = "2ee0d69610808f84b958f868c3268b75a24aced0";
+          sha256 = "0azkjnspn97y0fx4k37spvmxxy7p3g106prcbkmsaqm8jkkxc0qj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6b6801fe29cb6fb6183f0babf528375d14f966b3/recipes/bbdb";
@@ -4698,8 +4780,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "3f6ba1bb8ad3fd81278b6787c664639a6a0df6f5";
-          sha256 = "161bdn6b76rf0sm7881pyr6xs8mvyvpxhzicf0g2dqncisg4y0gn";
+          rev = "ca736c378404d66e9ff0df27969bad2b921c8d08";
+          sha256 = "1133n9rgclqyyqba91cc8n1hfhcqxkzh67c6nq5szwy30zjqpzy1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -4985,12 +5067,12 @@
     bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bm";
-        version = "20151222.1603";
+        version = "20160924.1310";
         src = fetchFromGitHub {
           owner = "joodland";
           repo = "bm";
-          rev = "b91f87c8f78d2430edc376830d5ba15f45d28637";
-          sha256 = "1ggqg0lgvxg2adq91damvh55m36qsa23n3z6zyf5z6855ilzaa4x";
+          rev = "acdd5fef7c72969c1e973113ce4989a9651e2d32";
+          sha256 = "19gh8mzq6hvpssp5fdm17gchqmwpdhdrfhg3mvd6qinh0wn2hrgz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm";
@@ -5110,7 +5192,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20160910.2019";
+        version = "20160921.1035";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad";
@@ -5129,12 +5211,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20160917.657";
+        version = "20160929.1310";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "477a3d9fa8b6e0eb726d731c4961bd311f0e7413";
-          sha256 = "1sabwcc51jlq0c031lm04qm0cr2bbimv1d464n6z85qd7yqrn3kj";
+          rev = "dde68b2e64ea7192d313d57536960237ce2db1fd";
+          sha256 = "1mbma82ikhywfk71x3y0y49ys101aidxikgsmxyiy26ngfvkm9ml";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -6253,12 +6335,12 @@
     cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
     melpaBuild {
         pname = "cask";
-        version = "20160907.306";
+        version = "20161003.1152";
         src = fetchFromGitHub {
           owner = "cask";
           repo = "cask";
-          rev = "f5b828ef4ff6c367f87181a5b998aa78e42c2f24";
-          sha256 = "0kmm1dlyf4f8b7dy2v2n7nf6620v6cq70ndlv5607dibhmaa8ksr";
+          rev = "8712ea35172e8c63320f963a982c1b50fc7578d1";
+          sha256 = "0709zak2y1ifwl9p6qqnzz9vpblan4n7zyrlx81jrkxd3x697dkq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@@ -6337,12 +6419,12 @@
     cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cbm";
-        version = "20160905.303";
+        version = "20160926.1150";
         src = fetchFromGitHub {
           owner = "akermu";
           repo = "cbm.el";
-          rev = "bd74f5f83ea1778d2e871cbcbedf458ccde40128";
-          sha256 = "1smj2l0g0643qp2c5jgj7z9yk6y8yia5a33pfbdpa4qwgq1ap3m4";
+          rev = "bf8cbbcef82e4643c5f0399f0198f606275af08c";
+          sha256 = "1p88fx90xwjk7dmd5gmbqyajyxf859kjsjzqmzljwai91skbb3pm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm";
@@ -6362,8 +6444,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "fa713612fbf12a599b20f31e0aa6f35931bc92a0";
-          sha256 = "0adl3njl8p4jgzwbjfw30yf1z0qis4nilbdkssgag8n9jld53ayz";
+          rev = "c06ead712c4c0f44c809552014ba6f12f36102fb";
+          sha256 = "1ixg1871v9k755yflh4c92bp00ylip5aax5zgsqhbxj7mpi535pd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6404,8 +6486,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "fa713612fbf12a599b20f31e0aa6f35931bc92a0";
-          sha256 = "0adl3njl8p4jgzwbjfw30yf1z0qis4nilbdkssgag8n9jld53ayz";
+          rev = "c06ead712c4c0f44c809552014ba6f12f36102fb";
+          sha256 = "1ixg1871v9k755yflh4c92bp00ylip5aax5zgsqhbxj7mpi535pd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -6591,8 +6673,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "d084f691ba42cd34527be2c2e3a801776e275b87";
-          sha256 = "11ylkywjnf2xiv4gwhwa7x01gfwjvky8rp2z5kfc97rw7jpmvma7";
+          rev = "2029d3e544c83a43ef785ab59a3969bb6992186a";
+          sha256 = "0vfaxdf87ry4ykvmnyk5b5skmrmz207slpf9nm94zi9lq40nscdd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -6631,7 +6713,7 @@
         version = "20160801.615";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11718";
+          rev = "11758";
           sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl";
         };
         recipeFile = fetchurl {
@@ -6961,12 +7043,12 @@
     chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20160831.2112";
+        version = "20160923.2342";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "d173f6da0fa304bf69504aa99b64ffa8a2a1beee";
-          sha256 = "12wy66binrbakbj2ak6a54j9z7nx1fgpsngyhl5vrb8vhbg60f9c";
+          rev = "3d0ccf663fd6b3753a886239dd64fbef44bc02fd";
+          sha256 = "0ggz80wlq86scdvfpg4fg9hvwgis9qwsfs52dyk2gpwfpqyn7pmc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
@@ -7168,12 +7250,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";