diff options
Diffstat (limited to 'pkgs')
77 files changed, 1926 insertions, 1087 deletions
diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix new file mode 100644 index 0000000000000..41a68656d007a --- /dev/null +++ b/pkgs/applications/editors/atom/beta.nix @@ -0,0 +1,52 @@ +{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}: + +stdenv.mkDerivation rec { + name = "atom-${version}"; + version = "1.21.0-beta0"; + + src = fetchurl { + url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; + sha256 = "1syxlyb62vp9hmjdiazhmvq8w52b90l8mvf502xkdav4vi3yxzfz"; + name = "${name}.deb"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/usr/ + ar p $src data.tar.xz | tar -C $out -xJ ./usr + substituteInPlace $out/usr/share/applications/atom-beta.desktop \ + --replace /usr/share/atom-beta $out/bin + mv $out/usr/* $out/ + rm -r $out/share/lintian + rm -r $out/usr/ + sed -i "s/'atom-beta'/'.atom-beta-wrapped'/" $out/bin/atom-beta + wrapProgram $out/bin/atom-beta \ + --prefix "PATH" : "${gvfs}/bin" + + fixupPhase + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:$out/share/atom-beta" \ + $out/share/atom-beta/atom + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}" \ + $out/share/atom-beta/resources/app/apm/bin/node + + #rm -f $out/share/atom-beta/resources/app/node_modules/dugite/git/bin/git + #ln -s ${pkgs.git}/bin/git $out/share/atom-beta/resources/app/node_modules/dugite/git/bin/git + + find $out/share/atom-beta -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom-beta" {} \; + + paxmark m $out/share/atom-beta/atom + paxmark m $out/share/atom-beta/resources/app/apm/bin/node + ''; + + meta = with stdenv.lib; { + description = "A hackable text editor for the 21st Century"; + homepage = https://atom.io/; + license = licenses.mit; + maintainers = [ maintainers.offline maintainers.nequissimus ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 5fe4d0910ee70..65df31aaa2265 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.19.7"; + version = "1.20.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0ividd7bmx0fqz1ykcx5cbnd6qyms1h7r662pcclyzzm3vxj9zif"; + sha256 = "1jzpa44ny78djdxc8d2w4jz1m68xmi8bzq87q3wmdffa4g9z4aa0"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 282aeef447f61..7cd57642aadfb 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -199,6 +199,19 @@ license = lib.licenses.free; }; }) {}; + auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "auto-correct"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/auto-correct-1.1.el"; + sha256 = "19i84dqqnxc5v36lsmj9zj8wbmg267c50jvq2i9bb66i9pzd0s53"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/auto-correct.html"; + license = lib.licenses.free; + }; + }) {}; auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auto-overlays"; version = "0.10.9"; @@ -266,6 +279,19 @@ license = lib.licenses.free; }; }) {}; + captain = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "captain"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/captain-1.0.1.el"; + sha256 = "1jqbgzcgq4kxpcsma9ia6w6rjy9sdn51lz2f4rfjjy3qgy4fqjx5"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/captain.html"; + license = lib.licenses.free; + }; + }) {}; chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "chess"; @@ -919,10 +945,10 @@ gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnorb"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.2.3.tar"; - sha256 = "1bqm08i2aam4v4gfzyxfmic0rg0ka7cns38khwj42vhwgv045xc7"; + url = "https://elpa.gnu.org/packages/gnorb-1.2.4.tar"; + sha256 = "013sdzpix9mc7d99mmpqv0r80zr50l1c7jld09p6767f86j6vahi"; }; packageRequires = [ cl-lib ]; meta = { @@ -1530,10 +1556,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170904"; + version = "20170911"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20170904.tar"; - sha256 = "1nbdphd102lwkj0sg1lywydkc547fzc8p1n8y507xwvxdjazdnyb"; + url = "https://elpa.gnu.org/packages/org-20170911.tar"; + sha256 = "0w91f5lx64klwbpym0b73z919dagzakykkmx6g13iscsh7fflx06"; }; packageRequires = []; meta = { @@ -1893,14 +1919,14 @@ license = lib.licenses.free; }; }) {}; - sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + sokoban = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "sokoban"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sokoban-1.4.5.tar"; - sha256 = "1hh35g1p2f5al88jsbgiz35bvhn7iw5sf9zhsjimiig5isv7khip"; + url = "https://elpa.gnu.org/packages/sokoban-1.4.6.tar"; + sha256 = "112cl1l36zn5q9cw81rxi96zflf7ddp3by1h7fsz48yjfidpfbzn"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/sokoban.html"; license = lib.licenses.free; diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 7053e2d33bdf5..b0449cc7c4244 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -822,8 +822,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "b0e017ed66f0e1cbdc37a028b9e35860353ee86f"; - sha256 = "085ljih87dx4p4wrmqv9ck4h778vrfwiwscxj19i8rl9hcxhqr6f"; + rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; + sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1028,12 +1028,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20170528.1158"; + version = "20170904.340"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "8af476ac323e56d3c69ec2ecd1c095de56ecd18e"; - sha256 = "0218qfmpjw57842w1wn6p5bkn1qmn39scnnsnc0a1xn8ywz1ivw0"; + rev = "34eefe3c94042a20abf4d340fdae71955a087926"; + sha256 = "02lh4kmjwf8d67b33ha4shwkkfvy9igvg88v5xq7282wxp6y3lx7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1130,6 +1130,26 @@ license = lib.licenses.free; }; }) {}; + achievements = callPackage ({ fetchhg, fetchurl, keyfreq, lib, melpaBuild }: + melpaBuild { + pname = "achievements"; + version = "20150530.1126"; + src = fetchhg { + url = "https://bitbucket.com/gvol/emacs-achievements"; + rev = "18a422131c12"; + sha256 = "0nk1zhqx0lvckjc98b36125148zgx1l2axln8gvkdwlhrd2cc6vj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/83ec19a4ebac6b2d0fd84939b393848f82620978/recipes/achievements"; + sha256 = "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr"; + name = "achievements"; + }; + packageRequires = [ keyfreq ]; + meta = { + homepage = "https://melpa.org/#/achievements"; + license = lib.licenses.free; + }; + }) {}; ack-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, mag-menu, melpaBuild }: melpaBuild { pname = "ack-menu"; @@ -2501,12 +2521,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20170901.648"; + version = "20170908.1740"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "74b27a95429b3207d0005610d11223728039ba81"; - sha256 = "1vp5crdjk3pswn6ip3vgkkc49kqnpayfjgzivfi6fplvhz8klrr1"; + rev = "db7a2abbbb74719dfd0867612a9a3bde4c574cc7"; + sha256 = "133mgzks4ig2z67bk63gligg45zj82mra99m9qdz7d3qpx7c9027"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -3481,12 +3501,12 @@ auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-dim-other-buffers"; - version = "20161004.539"; + version = "20170911.307"; src = fetchFromGitHub { owner = "mina86"; repo = "auto-dim-other-buffers.el"; - rev = "31c13e7ed87dd862c73b836d11c127164edb1458"; - sha256 = "0snkc7pkiv8iiy7xb64mg8ja7ig0rzkp5b6qkbalgxk9m4l8nmcb"; + rev = "90f6a6f0fba8dac1cfd5e4140638eceebc88bfab"; + sha256 = "1z1d7gzfv573rw1kr3bb6viybj63zbfwad15gvgha9fld2jhmakz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/auto-dim-other-buffers"; @@ -4066,12 +4086,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20170411.858"; + version = "20170907.955"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "97020c34176538480cfd28004f16f9b5494315e6"; - sha256 = "1dgjkhcsb1iyjcwbjyccr7550lczg74jl7w1g7kif8g0df0mc5g6"; + rev = "0074b70fda731169888571013b4b618a6f0914e7"; + sha256 = "153xv2k0v86k8c2w7cm68d6vs3xbrbhc660ka1dywprr7q1l3jrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -4404,12 +4424,12 @@ bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bash-completion"; - version = "20170903.634"; + version = "20170909.650"; src = fetchFromGitHub { owner = "szermatt"; repo = "emacs-bash-completion"; - rev = "583d1dde611c513aa81a0165e809e8d5bafb915a"; - sha256 = "1j2zprvv275270ss1s51c8l5rbhn8ri2n7pb1cw8679f1dlwjzpm"; + rev = "a789093cd32b2007cb64943de30aca51d5b3106b"; + sha256 = "1fqkslxjdfqcwq1dj4fhw80naq58gpz3d50xar4wrxn76z7vkbcz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion"; @@ -4944,12 +4964,12 @@ bibretrieve = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bibretrieve"; - version = "20170709.1150"; + version = "20170906.1036"; src = fetchFromGitHub { owner = "pzorin"; repo = "bibretrieve"; - rev = "6aea308680f8f2cab4c5ae06bb3b64bd0a2d9215"; - sha256 = "1lf1az6ijamvqcyvmyyppn53cqf2hp5v0bdj6d95j99rpz38pnfk"; + rev = "41b9a77e49d6c2e6e6f854fb8b1b45b2967c2f86"; + sha256 = "0rmb5qw9lj7xzwcw3haz6a22gpcb61cgkks194lq1w03gayj61rd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e548e0cf8babaf32f1db58099599a72cebdbb84d/recipes/bibretrieve"; @@ -5007,12 +5027,12 @@ bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bifocal"; - version = "20170625.1258"; + version = "20170906.1948"; src = fetchFromGitHub { owner = "riscy"; repo = "bifocal-mode"; - rev = "05d1076069d0a19292a38e835c32137e43ee9708"; - sha256 = "1fvr8vvpdd2xawv1j58wpxakbia31rzy513dakd78mlfkih2ixvg"; + rev = "5e89ad1a9a47e890ce080a79fd32c71eb128d1c4"; + sha256 = "1rwxw1wniws31gbmpxgglxbc2g4jag19dvsjrym0f43yy4w2mbpw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal"; @@ -5530,12 +5550,12 @@ boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "boogie-friends"; - version = "20170621.1207"; + version = "20170907.922"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie-friends"; - rev = "27c372592e19678bda5012f1ec3c60bcf9df78d4"; - sha256 = "1qcjbmkx6qim2j1sbzjjidqhrakjsipay9bdssyfyi4bwwp8mnq2"; + rev = "c30b229fb765b42d059c15e76029379ed3fc7202"; + sha256 = "1cdl0sxa4rwr162cg8qhlwhvav4i0pv0njkfca7dg6xwfjkq6g8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends"; @@ -6029,12 +6049,12 @@ buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-manage"; - version = "20170903.1113"; + version = "20170912.1621"; src = fetchFromGitHub { owner = "plandes"; repo = "buffer-manage"; - rev = "1c63a3267bc7b790cebcea6308b64ca7ae08ef98"; - sha256 = "1g4qchgf7gcy8mhynxklz3bh2nlrhshczpq6yzh7gpvgcaf2zg32"; + rev = "7a37c2ffa3d8ff446fe9cb5adc693095696b8341"; + sha256 = "0shxy0apdmyajlhssxkgpzcch02c1ffbpgajddbr68m8npilq6p5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; @@ -6128,6 +6148,27 @@ license = lib.licenses.free; }; }) {}; + buffer-watcher = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "buffer-watcher"; + version = "20170913.139"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "buffer-watcher"; + rev = "b32c67c8a5d724257d759f4c903d0dedc32246ef"; + sha256 = "0mygs48mk2z8cw1csz2wfyn7kln9662d16hwpmbxs5x8k71aq8jx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8681776d467951d14d8247e6939bd9a6f2a80ec/recipes/buffer-watcher"; + sha256 = "0v096021xk7k821bxb5zddw6sljqa6fs8f7s8j0w3pv6lmhra1ln"; + name = "buffer-watcher"; + }; + packageRequires = [ cl-lib f ]; + meta = { + homepage = "https://melpa.org/#/buffer-watcher"; + license = lib.licenses.free; + }; + }) {}; bufshow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bufshow"; @@ -7286,8 +7327,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "cdaf4cc639d93f6fc648d0f622cb7238f30d416b"; - sha256 = "1y5qvbblskyvv65hgwiyz2sx4n9zvalwn9mgx50s65rhdinja697"; + rev = "83fd2b5014d2eb5d685941bed1ee64bf750e4f94"; + sha256 = "1ffdscvp624gh8vgb01nsdbafynw7b2r83mr1nqf356jpn43ah7a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7386,11 +7427,11 @@ }) {}; cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cg"; - version = "20170201.347"; + version = "20170911.610"; src = fetchsvn { url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12321"; - sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; + rev = "12362"; + sha256 = "0bmydpv3slv5fvy1admgsm1qlkfp4sdsd0caik48dn7bnghifggz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/cg"; @@ -7887,12 +7928,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170829.941"; + version = "20170913.434"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "7a53a92054d12b698790b3ec59af757014522b95"; - sha256 = "180xirnh1v0sv6my4ymwdd1av8jbyr84ymw2cjwycg4m3rni0ccx"; + rev = "8a9eab32646abcaaf31fe83b2d897c01971b98f1"; + sha256 = "0ddkm87l9ann05a6j57r0x59qqgfavwrvlzhkc5xhak1nmk5556h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8163,8 +8204,8 @@ version = "20170120.137"; src = fetchsvn { url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "312487"; - sha256 = "063lnsasva07rnlhhb9dqpf5z92bjf1abs9z4rfggg5jqx1gmhs2"; + rev = "313143"; + sha256 = "0zldh5nk5i3y41q70kwlhf576xmv0baim3q4jam01d41p4p040mq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/clang-format"; @@ -8348,12 +8389,12 @@ clips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clips-mode"; - version = "20170904.323"; + version = "20170909.123"; src = fetchFromGitHub { owner = "grettke"; repo = "clips-mode"; - rev = "ee419b393277f45c7bcc2938b07b321f2f9d22bc"; - sha256 = "027xpg25iffxj1v7xi8gdqdj5cg0j8kbri786ckfk8znx4ghqi5l"; + rev = "dd38e2822640a38f7d8bfec4f69d8dd24be27074"; + sha256 = "1q2jz72wi8d2pdrjic9kwqixp5sczjkkx8rf67rgaz37ysjpcbf6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d28484bf5e9ad72778ad63f73deeea1eb1263236/recipes/clips-mode"; @@ -8805,8 +8846,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "8d13e9c1f5fa7871153ef83aa67d67e72fcaa5c1"; - sha256 = "1fq7v4vlx2r5jwnx63y18yffi57y9yz23mrahfzp1c8wbyja6rxl"; + rev = "a763cffd6b65bbe5572527e39969981bf31d5aca"; + sha256 = "1jrvsqcb123z1r84c074qz1z6ljz6psc7ysabzsxkrkcs3f66v58"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9305,8 +9346,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-solarized"; - rev = "99fb4753f071542690e7a17b3dd76b5f2a05e9fc"; - sha256 = "1vhncjyw0qbglgsd04cgyqc3473kz97ks15586ljrpa14f8fnjk2"; + rev = "74a7065808f82dbdd9638ae33ed0e4f7a55da35c"; + sha256 = "1af6j8qyzcm4x5p2wkhfh6f62n5i4fapjfrii3rl3l9im39fl8jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-solarized"; @@ -9322,12 +9363,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20170902.2300"; + version = "20170908.216"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "aad353819ad8a588c4b9e6910604733d9755c42c"; - sha256 = "03mf2jamm04arlsimx3r2wiqjkx6av4ipz3arhq02r8lwy3rm1f6"; + rev = "6c9b01bb5268f00d0e65fb8351a7ad87abbfb127"; + sha256 = "1gr1iab6dyyx47v2fbx7g1lf8x1hm9vppra9ypf8957fxzi99l2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -10070,12 +10111,12 @@ company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "company-irony"; - version = "20170831.1300"; + version = "20170905.1346"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "company-irony"; - rev = "26cb30bcb055909770d4dc7fcd54792ce64ec249"; - sha256 = "1f45zprhi5fv0p8f4gadww35sn8kkvrm607scghw15a4mb5837ra"; + rev = "52aca45bcd0f2cb0648fcafa2bbb4f8ad4b2fee7"; + sha256 = "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony"; @@ -10374,8 +10415,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "b0e017ed66f0e1cbdc37a028b9e35860353ee86f"; - sha256 = "085ljih87dx4p4wrmqv9ck4h778vrfwiwscxj19i8rl9hcxhqr6f"; + rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; + sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10786,6 +10827,27 @@ license = lib.licenses.free; }; }) {}; + contextual-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "contextual-menubar"; + version = "20170908.408"; + src = fetchFromGitHub { + owner = "aaronjensen"; + repo = "contextual-menubar"; + rev = "67ddb1c8eec62e2b26524c09585a4f25f03ebb11"; + sha256 = "06rfkv7q9brahjgaqvpixqb26v4a65hyphl7ymjx8qyyypzrzac5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cba21d98f3abbf1f45d1fdd9164d4660b7d3e368/recipes/contextual-menubar"; + sha256 = "0r9bsnvf45h7gsdfhsz7h02nskjvflfa2yjarjv9fcl7aipz8rr6"; + name = "contextual-menubar"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/contextual-menubar"; + license = lib.licenses.free; + }; + }) {}; contrast-color = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "contrast-color"; @@ -10957,12 +11019,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170830.1025"; + version = "20170911.1121"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e9f7dcb0d26e02c2883774bae568c6eda7fe56ff"; - sha256 = "1wwngrf9fjq1dbl59lj14kihywz8gfkjz1dpy0n9i1nm7fd5w9my"; + rev = "0a1d361b926291874124f8c63a653d83ead64a36"; + sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11062,12 +11124,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20170816.200"; + version = "20170911.1304"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "363c875df6ea658e543df59c11497f79bfa36b54"; - sha256 = "1l6gd4ir5xh8ldw028i4s28jymd62926a7yzd0a52y5b2z7f4knr"; + rev = "20557b47a963cc5304ac2bc3ea4800c3a7da7feb"; + sha256 = "0cszbczgpsm6l2pwh8pci3md0aranilqw6j0519vr6aaj5j6g15p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -11523,12 +11585,12 @@ csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: melpaBuild { pname = "csound-mode"; - version = "20170731.1504"; + version = "20170911.1412"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "34d9499e8da475c491eac1158bd429bf0e10e7de"; - sha256 = "1j7gykp16im5rlrlhrxk5svz9w543350q6lz41754ah0f7i8gc6m"; + rev = "c5243852d20e54e43a4a7fc19c58bbd10fa8570b"; + sha256 = "1wa4356xykkfmfp8pkk72r2s18l9vhv9mdhrq827fh6cgz64p4s8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; @@ -11731,12 +11793,12 @@ cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cubicaltt"; - version = "20170421.1132"; + version = "20170912.317"; src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "a331f1d355c5d2fc608a59c1cbbf016ea09d6deb"; - sha256 = "1anwj210gini3p98wy3fj1gbn5ijkbd5vnfc3526h4vppsb4vili"; + rev = "c920475b9f9b50559d81d39ad177dbe22b258a35"; + sha256 = "0s7az1j0dpi306j01wzw5ldy6cvpz56fk0x4jhb7bsnq01lkm7jy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11998,12 +12060,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "20170723.1342"; + version = "20170907.1648"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "91ee421e9228dc7656519c7bdca6c715ca22bb56"; - sha256 = "0basrjflmb3ika3s7xcvadwn4xvpy79laxxcbjm9p48p53mvskvf"; + rev = "e6315294395ad44e667a804710938ee799575296"; + sha256 = "07lgc3g66w8ggmnhqn7vrck3vl9jcvwmg67mlb772kz9d5v4kn5x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12187,12 +12249,12 @@ darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darcula-theme"; - version = "20161004.2218"; + version = "20170905.941"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-darcula-theme"; - rev = "834202004507221c3bdf49457219a56760b13d22"; - sha256 = "1j2g94cz9b3ivv0w88gw1hcf236kc0c7hnrf13yyspxjm5jfdmd5"; + rev = "da9852867ac115a54ee350a750d4dae182706117"; + sha256 = "03059ydiw73a7kdvgn3namfqz87pqm2xfrnf87irkiv5pl9h482s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme"; @@ -12646,46 +12708,6 @@ license = lib.licenses.free; }; }) {}; - debian-bug = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "debian-bug"; - version = "20140131.929"; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.alioth.debian.org:/cvs/pkg-goodies-el"; - module = "emacs-goodies-el"; - sha256 = "5c75978cdb4339ae7153edeafdf81d6effd8e23df6e406001c8106e105852105"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/19ea27b9e95dafa13b0740e850d065f169625c4f/recipes/debian-bug"; - sha256 = "0qlksbiw9qb0bv85b3rimsmzfr8dhbjjg4h0wnx7x434m6wqlm1a"; - name = "debian-bug"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/debian-bug"; - license = lib.licenses.free; - }; - }) {}; - debian-changelog-mode = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "debian-changelog-mode"; - version = "20140131.929"; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.alioth.debian.org:/cvs/pkg-goodies-el"; - module = "emacs-goodies-el"; - sha256 = "5c75978cdb4339ae7153edeafdf81d6effd8e23df6e406001c8106e105852105"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/19ea27b9e95dafa13b0740e850d065f169625c4f/recipes/debian-changelog-mode"; - sha256 = "185l9ghsi6rlbmhs99lpsq257r5q87j8vra6h7jd9fwxfp4n9r22"; - name = "debian-changelog-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/debian-changelog-mode"; - license = lib.licenses.free; - }; - }) {}; debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "debpaste"; @@ -12819,8 +12841,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "default-text-scale"; - rev = "5dc4c4e66d860ce783ce6f2b8ddf39d263a53207"; - sha256 = "0mwqzgn6y9kc94gy1mrgk905b4785l4avhyn7g0imh5l0kjay6zx"; + rev = "968e985e219235f3e744d6d967e592acbaf6e0a8"; + sha256 = "0zds01c3q5yny6ab1fxfkzzgn1kgl3q23lxxap905f4qd70v922h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db5e0b70e2d9c80aa41ae2c397f822789c2d3cc2/recipes/default-text-scale"; @@ -13384,8 +13406,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; - sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; + rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; + sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13401,12 +13423,12 @@ dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-collapse"; - version = "20170806.1203"; + version = "20170910.1522"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; - sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; + rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; + sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13570,8 +13592,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; - sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; + rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; + sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13591,8 +13613,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; - sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; + rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; + sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13717,8 +13739,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; - sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; + rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; + sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13738,8 +13760,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; - sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; + rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; + sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13799,8 +13821,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; - sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; + rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; + sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13820,8 +13842,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; - sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; + rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; + sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13837,12 +13859,12 @@ dired-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-sidebar"; - version = "20170903.1538"; + version = "20170904.2004"; src = fetchFromGitHub { owner = "jojojames"; repo = "dired-sidebar"; - rev = "1f3c8ba993c94663628acc2270ca5327d0d5ea68"; - sha256 = "0mrkxj6md4jjfpcb3374hc9ybbxp1nan189c35mlh3xnbznvxs4m"; + rev = "9ac42bb6663e6c0c5e4e3dd2258b63e24cf33c90"; + sha256 = "0x6gmpjm1rv38h6w5zv98vk86d7s0qvsa3pl5sab268dbhw0l9w2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar"; @@ -13937,12 +13959,12 @@ dired-subtree = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-subtree"; - version = "20160920.130"; + version = "20170910.1521"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "0521a3ad7bdf392991786596b04e7f1625d4802d"; - sha256 = "1vav5jcrcqrjmaaxhf1qqk307s62wz4xq8zcm2zvx8bhhimgpzfh"; + rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; + sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -14130,8 +14152,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "disable-mouse"; - rev = "3b8681b099eb0c3af6078fa0e479d0d0ce6686ad"; - sha256 = "0k65jddjd0xbm91fzjll8j69qd4ql9qz47x2mdhb2xc344kdwp9x"; + rev = "f7d6f70a3c0a751a946613f997330fbc95a38c3e"; + sha256 = "0d2hmaiz8v8kzkbdi281hyf3yfjwr03ngxr2qphgm7xk9298351v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse"; @@ -14761,12 +14783,12 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "20170820.327"; + version = "20170910.1034"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "a002d5f9fb2cb1b0cac2cf512a672b69e7fd6d14"; - sha256 = "0k7igf738wsgxiglafhby8rlqdhsm3vsgpq39frmrzgvrfs69lxs"; + rev = "372df2f0de34a4bd44d4a7274b9ab85117ac7392"; + sha256 = "14vgjhy2j60xhf38zm5nlkr4d3r455kw6paw0wff4mqmdjcg3pds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; @@ -14908,12 +14930,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170903.748"; + version = "20170912.726"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "0fa93998c6375538dd77ed5a319820411d95d302"; - sha256 = "1jm9622qp4w8y607yhclqd2qs8jrsl5k4ah3gj9lb2l0vzn82igz"; + rev = "f7185cf7536e1f96e7cede2ce81c2b51205df850"; + sha256 = "1wqa5b9ni8rci4h8m78h7cb3387gi45v1w6z5dbya4zvaw1gwx8p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15364,7 +15386,7 @@ version = "20130120.1257"; src = fetchsvn { url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1807231"; + rev = "1808231"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15465,12 +15487,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20170821.13"; + version = "20170911.1951"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "497f5e68e01f71612f1d2d4040ed55e501c6ed03"; - sha256 = "1b8gi0swzrsmb9x47xdsf7yjl0075vs7h34ifdks7izzr28n1pi2"; + rev = "67928ef6449318a8653812167540aa5919301260"; + sha256 = "0i7jyh0zzk4ifkqwi89bnnwgvaaphnf4n5z299mg0fj4walzx3rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -16470,12 +16492,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20170802.238"; + version = "20170912.2223"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "1e75aa41aaf61ac26cd833635f9d61d44065a915"; - sha256 = "11ym09hijk3dy445pn826r7ng27w2032id3h1pzk0nzfq9zxhwlk"; + rev = "f527731c0d24a094f6fc784366558e2bf3d0e201"; + sha256 = "0im24f2h2n4ijdmkjkkphngk2sgj1g2rg0ygppq03rbzmqg0r6sm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -16708,11 +16730,11 @@ }) {}; eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eide"; - version = "20170830.1113"; + version = "20170906.1216"; src = fetchgit { url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; - rev = "f939b1fd5eaca72e5e1ce8a379468c60caf4efca"; - sha256 = "0wlsp57hy8pzq31raqna9yj9g50y25m47rnwxbyabfl5xlflzs7g"; + rev = "25f9af215781163b10d411fe2b5674033eb24165"; + sha256 = "0mwy5a67hap9bx1klk2pzfaav65drd6mfkkhnk2045z4jvzgkn70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide"; @@ -16876,8 +16898,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "c98016bf352bb17ca4aafcc68e12583001fbea71"; - sha256 = "077knnb16416jhhz0w0a4vh4mqkh5wg362pf3by5k7sysxr5zmgx"; + rev = "07c75d259d89dabb34878d6085a94fb11aef1947"; + sha256 = "1b1cgfh7wzcw5m32mhn9w6gzllr09hfv2ghdb4wwaw567xcqd4qh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -17180,22 +17202,22 @@ license = lib.licenses.free; }; }) {}; - eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild }: + eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }: melpaBuild { pname = "eldoc-overlay-mode"; - version = "20170826.434"; + version = "20170909.651"; src = fetchFromGitHub { owner = "stardiviner"; repo = "eldoc-overlay-mode"; - rev = "e008b78afc5fc2b85f6d84188bafb3b5ee86e2fb"; - sha256 = "1ii2il6vbh53j6z2dq9ah81fk1qng4q13wd024xzxk7wy90vmmnk"; + rev = "4512e5499cd4f647ad3b5212b853f0299d6cff47"; + sha256 = "1dp7pjr89bq0fjjqvha2smw54aymy4pyjx643qp0x1dhpwa7bv5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eldoc-overlay-mode"; sha256 = "09rhh8rj9rcdnl1jfnjlyzcdr56h9yhmfsb27i4v59g06x8qc954"; name = "eldoc-overlay-mode"; }; - packageRequires = [ emacs inline-docs ]; + packageRequires = [ emacs inline-docs quick-peek ]; meta = { homepage = "https://melpa.org/#/eldoc-overlay-mode"; license = lib.licenses.free; @@ -17309,12 +17331,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20170902.1318"; + version = "20170910.1453"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "aadc93acbc77ac75110c870a7af099911a939a57"; - sha256 = "077x8nkq3lwx281l7dkcff0gi5wv8kqlrp77gi2dz70d2f9q9dfv"; + rev = "b62a2d0040f1a8ad0a23a48e3843d2ed5cbc2a8c"; + sha256 = "1fxxcdrm7138pb06wxk9k519kag03jllkwf2fyxh755x6fnxlgin"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17383,8 +17405,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "aadc93acbc77ac75110c870a7af099911a939a57"; - sha256 = "077x8nkq3lwx281l7dkcff0gi5wv8kqlrp77gi2dz70d2f9q9dfv"; + rev = "b62a2d0040f1a8ad0a23a48e3843d2ed5cbc2a8c"; + sha256 = "1fxxcdrm7138pb06wxk9k519kag03jllkwf2fyxh755x6fnxlgin"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17551,8 +17573,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "elisp-slime-nav"; - rev = "8a1c2717a6fb50b654b8d1ffa12a40420ee32990"; - sha256 = "1nn97aqfawygvwybr5d51y82az4pj774d6qmwsqfpx7yppd45hsd"; + rev = "34938422929800839e2f935aca890cd4a229ca99"; + sha256 = "00v8iqlf6pk8a0656s14jd0gv5msqy6q2af15q21f2nl4j0gl9qj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/elisp-slime-nav"; @@ -19044,12 +19066,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20170819.1411"; + version = "20170905.1210"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "7528d95ca296997ddc98427ff4ea547208848bef"; - sha256 = "1b3xkbivwdzg9ndjwc3q1zq6swny0bd78b3f4ahplqqsrfgzksh4"; + rev = "42528f4f1d3310361d84bb557c4b7270adb5fd5b"; + sha256 = "1d14160l1w65a3klhd71972a726kzhcn07bljp5q57y1qxbq648m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19253,12 +19275,12 @@ erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-image"; - version = "20170713.1438"; + version = "20170909.312"; src = fetchFromGitHub { owner = "kidd"; repo = "erc-image.el"; - rev = "a7e6c6d766f8c2589abf6fd79c5211f970fcbed3"; - sha256 = "044cbz8r788j80f88d2irijpfvh22m9zjvd9ffj201fck428nakh"; + rev = "15805aa7ed4b13eeaaa4ec294443ef0f9d21c0c2"; + sha256 = "0ja8iv4wp58xab190mf3pj1bbaz25w8pvns03ayajzrflpkhjs79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image"; @@ -19568,12 +19590,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20170828.600"; + version = "20170912.58"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "9b832080feadc764f7981739174df06084a2eeaa"; - sha256 = "1vmb1jifr4248i6dx3j6i1r9bsis8q5lilf2lsan495nbaqwsd7a"; + rev = "b36f0b6d381746a16c8d8c2bb3767d9ffb44c3f8"; + sha256 = "1i0aqq3vwy10jbky6ahka2vqk55iqanq1liqj81r76l5v55flcz6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19655,8 +19677,8 @@ version = "20161018.1217"; src = fetchgit { url = "https://bitbucket.org/olanilsson/ert-junit"; - rev = "e1d7b795176dceae40adb15c28717276c00269e4"; - sha256 = "0d6ab0f22sing9cimpc86yydvyzb3z3s36372x082pg62ilrj0pi"; + rev = "b8e23617bbd5228dfa37fdc00e7b5227fd6382df"; + sha256 = "1f5r1ns2h53q5qmrr31xbwrsinnk4ialh4a7siz2n513znq6dq8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit"; @@ -19945,12 +19967,12 @@ eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-git-prompt"; - version = "20170316.1051"; + version = "20170909.752"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-git-prompt"; - rev = "ec246fa4c27ecb7df10c93b0710e6a64fa5ef4c9"; - sha256 = "0dc1d6z8m3dvgqvp16nsw84g4fwzqv3nh21k1v2mr3iy8nmdf0l2"; + rev = "b6bb2d7bd4e393b4170b29891cfefb72ae020aab"; + sha256 = "02i00an9wa8ns66xq900la68m7pd4hwv95g83cvf22bypivx7p2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt"; @@ -20155,12 +20177,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20170728.238"; + version = "20170911.149"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "1f40b23d5b9d9b87cda741bd483e1dfb7fefd035"; - sha256 = "0irwysn402spv5035dj6rngma4q5kx11zm5c9cas42v3wahpr9m8"; + rev = "23e6d3ef5b314223043c9f03301b3e7018141385"; + sha256 = "1fih6rphz5bsd2kvwblygaymp1mvz710xjvcqg52l9awlawgvbwb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20529,12 +20551,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170902.759"; + version = "20170904.1346"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "a6ef21d6dad1076e5ef64fa5d1675870db37e6f1"; - sha256 = "1419zi57ad1f4nnjdmn03cic09xx6ja4ksh6b106mncvvdsaqjbk"; + rev = "485bf5399bbad17ff0cbb3787de67b9a5a5665dd"; + sha256 = "02zd9pk2x44lz9cb8cqy0apvdbb8vwlxgvrgfkfswvx34ww4rqmc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20886,12 +20908,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20170830.2329"; + version = "20170913.59"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "1e9ebe5e4cad65b17c58390cc79527a36ae22392"; - sha256 = "18zssqc7habn2ka6lmkk0hm1nnll26frdklwd1j14hgrzcsm4a1h"; + rev = "221a5ed8ea0455e4274ef9ba14fe852cc512112d"; + sha256 = "0qjzkg1cms6ska213n1ldm511ivdawxwpvn8qzl8l75yf3whzw05"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -20988,6 +21010,27 @@ license = lib.licenses.free; }; }) {}; + evil-ledger = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-ledger"; + version = "20170905.519"; + src = fetchFromGitHub { + owner = "atheriel"; + repo = "evil-ledger"; + rev = "a282fae7921d2648a32c3207413d927d1adda8b8"; + sha256 = "0b8801mpq55x9r0sgm548wb1qn74wk3dydswrxi8bp6ga49k7rhv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/500e99a1b92f0a0c144f843cd7645872034d9fbb/recipes/evil-ledger"; + sha256 = "13idy2kbzhckzfwrjnzjrf8h2881w3v8pmhlcj26xcyf4ch0dq9r"; + name = "evil-ledger"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-ledger"; + license = lib.licenses.free; + }; + }) {}; evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-lion"; @@ -21159,12 +21202,12 @@ evil-mu4e = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mu4e"; - version = "20160813.413"; + version = "20170911.122"; src = fetchFromGitHub { owner = "JorisE"; repo = "evil-mu4e"; - rev = "3edf45cbf94bb304a1d99b00fe43e72b86b3ee94"; - sha256 = "1zd6dccsb7f8rsb6nw29a4kp37q4s5d63c73ppi268nn0jsa3f28"; + rev = "64b663c3b31d14c4260921a7ec4b8d475d5ed339"; + sha256 = "1cms5kvgkhaq1gb6yai5ykn3mkb3vjs99b75f7lyl6da89k9kx9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332f3f9c6dc106e58345abbc2d8fd99056d518c0/recipes/evil-mu4e"; @@ -21201,12 +21244,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20170829.353"; + version = "20170905.653"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "0a46b911200c75c4737bfdb2b71f10a9a8254969"; - sha256 = "03v53zhm33fz6aib03j00bwkfqh2j45ziz7nwynynxm50j32axkg"; + rev = "92bee71aa6fbb36299a4e69e710da786f3694637"; + sha256 = "1sxwiar17jvqj7plf7jdpwx9kymabr0dsfl7mbkcxpzvrfdlmp12"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -21264,12 +21307,12 @@ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "evil-org"; - version = "20170802.1428"; + version = "20170911.1135"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-org-mode"; - rev = "1725325eae0e3bf3609cb1a86effaa790afcc5de"; - sha256 = "0r9n7yqj9fdcqpz99fwjnln9w0w5lqhsgyipjvihb56plrrc2w8c"; + rev = "1b0cb009fcc593ba851d243d2e3291a8cfeb2fb0"; + sha256 = "0qnb5vbsrwxsn2zjl6dy6gvc1y77ac9c8nqrhpzyvjbkby2gkwzh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; @@ -21474,12 +21517,12 @@ evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20170124.1110"; + version = "20170910.1952"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "43a266461517d2eb715338da0a31dc6616073116"; - sha256 = "04pzlkblziir91g38kmlmr7p1q5cxjw4q7difwhly3iz567minkq"; + rev = "7839abe0e04740e2928a6b799557d1b16460fa5f"; + sha256 = "03lfn8clcbcmax5nzn6awzfd895inavzrn45n07hrq6abw98yjrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -21562,8 +21605,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "a6ef21d6dad1076e5ef64fa5d1675870db37e6f1"; - sha256 = "1419zi57ad1f4nnjdmn03cic09xx6ja4ksh6b106mncvvdsaqjbk"; + rev = "485bf5399bbad17ff0cbb3787de67b9a5a5665dd"; + sha256 = "02zd9pk2x44lz9cb8cqy0apvdbb8vwlxgvrgfkfswvx34ww4rqmc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -21600,12 +21643,12 @@ evil-textobj-anyblock = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-textobj-anyblock"; - version = "20161020.1112"; + version = "20170905.1207"; src = fetchFromGitHub { owner = "noctuid"; repo = "evil-textobj-anyblock"; - rev = "b611a54e62a6e6ce40bbb8b5094bd88028fc7efd"; - sha256 = "1wgdzl14hrzjsh6wvc83njfd0321rnbhc68mzcvn27g04zx9a1d0"; + rev = "ff00980f0634f95bf2ad9956b615a155ea8743be"; + sha256 = "0wn5lp7kh3ip1bmqi12c9ivpjj0x602h8d7ag39qw36smv4jqvnb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36b734960313d4cb484cebaac0f112781436631c/recipes/evil-textobj-anyblock"; @@ -21621,12 +21664,12 @@ evil-textobj-column = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "evil-textobj-column"; - version = "20151228.1344"; + version = "20170905.1205"; src = fetchFromGitHub { owner = "noctuid"; repo = "evil-textobj-column"; - rev = "d45a0f2831e6da51435abe27294222055f04ab32"; - sha256 = "0nff90v6d97n2xizvfz126ksrf7ngd5rp0j7k7lhbv0v5zcqgxiv"; + rev = "835d7036d0bc9a6e44fc9b7c54ccf2a7c01428cd"; + sha256 = "0g9d62sgcpzvhbrdk4hf3phphfss74mjz6xv4wd9895rzjsziwkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de7d6dc0d9c42a89be2959d015efa30960df2de7/recipes/evil-textobj-column"; @@ -22111,12 +22154,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "20170517.847"; + version = "20170906.821"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "6c7e6ac20e27a26e7b27761f11a3a959ea815b5c"; - sha256 = "1jzqb1w8ax5h6g9nwqwnagalag2kj7mabq889vl59ka5lvccac0f"; + rev = "63395a2367d1d48983a9363d2d0bf518177297bd"; + sha256 = "15vgv0z4vzdnc3vb98j2hy4bv5x83f4c1dzgx49r61vka7p5is0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -22504,12 +22547,12 @@ faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faust-mode"; - version = "20160930.222"; + version = "20170908.542"; src = fetchFromGitHub { owner = "magnetophon"; repo = "emacs-faust-mode"; - rev = "41379dd52a8be01cdfac06996ea1593877fdaf58"; - sha256 = "0q624nm9wfyg95wybi542bx8pdpqk9vibyb6b9fin4mw102nah9j"; + rev = "0f099007574d1430bb0cf73f73dcc284d9d3a190"; + sha256 = "0rmq6ca75x47hk2bpsk1j2ja62kpplgyanpiqq4hk6q259rd4lyv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode"; @@ -22522,21 +22565,21 @@ license = lib.licenses.free; }; }) {}; - faustine = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faustine"; - version = "20170904.140"; + version = "20170908.658"; src = fetchgit { url = "https://bitbucket.org/yassinphilip/faustine"; - rev = "153f3aaaa0058736dfefeb006d06e6d43d51ef45"; - sha256 = "0fsrh43g2l56g3ck5d398v0z7hqladdaamkhcc1cpnwajmnpa9vp"; + rev = "feb938af3a5363e0e0210aa98a447e1896ceca47"; + sha256 = "1c0xc1nk9djjk39ksysszliphibnpm7c472p4lvgkmrsmg28i23k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b298e399335efbbdbc6e9bb06ab915fc07909faa/recipes/faustine"; sha256 = "0pkjxfzgdhkjjx38d1c2kw8m5cw5ryhfj7lykpym79wsa471hf9s"; name = "faustine"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs faust-mode ]; meta = { homepage = "https://melpa.org/#/faustine"; license = lib.licenses.free; @@ -22587,12 +22630,12 @@ feature-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "feature-mode"; - version = "20161123.532"; + version = "20170907.748"; src = fetchFromGitHub { owner = "michaelklishin"; repo = "cucumber.el"; - rev = "aa06b88ad96bc556992f011b6aef9b78e99ae48b"; - sha256 = "1iybvdkszrqwz9knmfffmcknsdhnpc71961y0xb4xgad8i043n2y"; + rev = "722b352c4f0b800a9356dd369c79612782b3b847"; + sha256 = "0myaddivhvl8x3n2z2vjc6mc2jn1jja67mzwx1jp9gb9p958irk0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a70991695f9ff305f12cfa45e0a597f4a782ba3/recipes/feature-mode"; @@ -22728,12 +22771,12 @@ fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fill-column-indicator"; - version = "20170901.528"; + version = "20170905.1008"; src = fetchFromGitHub { owner = "alpaker"; repo = "Fill-Column-Indicator"; - rev = "2cd7469a40464dab0b3c3148d5e24c68c3f1ce51"; - sha256 = "002yys43zc0wdm7pff08q2b4z2lc579zxcfzigl1x2fasgv6rc67"; + rev = "23ad25f2c2fddd32a1ea12a9e0f631e243e6a779"; + sha256 = "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator"; @@ -22831,12 +22874,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20170903.2000"; + version = "20170906.2011"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "b1de8479159b722caf74e9b4972406533b800ff0"; - sha256 = "0sh3q9wnpk90x0mqbyzyvkg8grla2dakrgiwaxgiv70mga3mbqv2"; + rev = "dcc0801c4781d76efd9ac0d86bab4084b4b93663"; + sha256 = "0axk4a4b3s0x8wn4a4mj1i89kix88cv94iclhw4wigsscndpr03v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -23566,12 +23609,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170902.312"; + version = "20170911.127"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "9cd155bd08dc33b51268b6f9a36796d236f734de"; - sha256 = "1m9plvf2ydzbm888gi7fifscpv59x5fn4wd1crdw9yfz276scx5r"; + rev = "eeb915b51f2fe9f7afe125b1028737b8c2b44712"; + sha256 = "13dsjngb5lbhzrlcw3skk7v6j7c2k3vn596msin9f6ssjwmgc94k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -24347,8 +24390,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-ledger"; - rev = "cba408d61e26cf7c31c4a6f82a28a3a32e145c05"; - sha256 = "0ysc2hwz0xmmlwfwd70nfqvd81dvf4gfrynkrfgg9w6hp7y4z522"; + rev = "2944c56ad72945f78f88fa363e0239b40650d829"; + sha256 = "16zfa0npi6jmyvjalsiqk11zp41vc5bfpgz5ssh1xa8v9fk6rxaj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc715e6849aa5d6017e2478514c4a0d84c7ddbe5/recipes/flycheck-ledger"; @@ -24515,8 +24558,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-package"; - rev = "cb526f54f4017454e2503b340757ba15578a5aed"; - sha256 = "1x1pmz7gd909s11fsyqrh8a7bg2j4hw572wwqy1kjz2qf42mfw53"; + rev = "6d99248b45eea1e5236062f38e524230efdb1a84"; + sha256 = "00wyi2adiv9cb3x8bid2fhg3cjqlkc7z70i18vldbpmrpppjg4x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package"; @@ -24746,8 +24789,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "b0e017ed66f0e1cbdc37a028b9e35860353ee86f"; - sha256 = "085ljih87dx4p4wrmqv9ck4h778vrfwiwscxj19i8rl9hcxhqr6f"; + rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; + sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24830,8 +24873,8 @@ src = fetchFromGitHub { owner = "swift-emacs"; repo = "flycheck-swift"; - rev = "c6c416a1b7a7d346e5c040e4e4065abc68d3a844"; - sha256 = "0wa60i99jh0dsks30jssg7l17bcmr6jzkwmkjg8brl756p593zp5"; + rev = "4c5ad401252400a78da395fd56a71e67ff8c2761"; + sha256 = "094vpmpjq0skhkq634p3zgj3nmsiq1dl8k0z7hzafnaw2y157z1s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd99bea06079c4231363c37e3361bd9e5b1ba490/recipes/flycheck-swift"; @@ -26433,6 +26476,27 @@ license = lib.licenses.free; }; }) {}; + frecency = callPackage ({ a, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "frecency"; + version = "20170908.2331"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "frecency.el"; + rev = "132130088ef5695cffed6fcacfa219cb0c389026"; + sha256 = "17s34gaq6jvwr6f4l500xyhv33ykwxiwzsq2rrasgs7l301wqsw0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6e855d01e0b1c9a23c006af67c487719c50bd/recipes/frecency"; + sha256 = "033zhzwvh23igfqxbiy68cq6i1wflna19pbg81r0hh9kcfg2afpa"; + name = "frecency"; + }; + packageRequires = [ a dash emacs ]; + meta = { + homepage = "https://melpa.org/#/frecency"; + license = lib.licenses.free; + }; + }) {}; free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "free-keys"; @@ -26582,8 +26646,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "b473c5ff4c88014e4ee04d0fc58ed7d59d320db2"; - sha256 = "0xr5d4qsap8vcgvbnp7n4a3i29k5kv4vyipaxfcq0dqg9mc9qpg1"; + rev = "705e7018c824e8160ecd8f0e81117dbebf6e90a0"; + sha256 = "16j855qg046q8p8dbsry1nr4ljfn90wk36yqrbcklb93m1g0f9ny"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -26708,8 +26772,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "b7d27066200d187a185e0433831a3307998c099a"; - sha256 = "1jq1vzrn0dbghj71vszgqpzicazfn4bikcl7d5z9184w6dwgigbn"; + rev = "d4a741d1e87123c1691c3fcf9842895ba7d692f6"; + sha256 = "1zvk5mp1hk6lq0bmisl3nzmqclm00qjr74j3zl66q56sxn4sgxwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26868,12 +26932,12 @@ fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fzf"; - version = "20170824.904"; + version = "20170908.945"; src = fetchFromGitHub { owner = "bling"; repo = "fzf.el"; - rev = "9b1744b8cf8817912164fc08d01b3d9e541d6479"; - sha256 = "0x16m5ysifw6vqm09i834ykjalxzg7yrnlf2lpafbg1f31mr0hhj"; + rev = "cbcc56c372ec2d907c690a05cb420a4bf643c355"; + sha256 = "046hwfnn787c7q5y2pvqxzs5a67my2zmbg5l5rnw1g9swhfh9rfw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf"; @@ -26928,6 +26992,25 @@ license = lib.licenses.free; }; }) {}; + gap-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "gap-mode"; + version = "20160204.736"; + src = fetchhg { + url = "https://bitbucket.com/gvol/gap-mode"; + rev = "617eff4ff846"; + sha256 = "08dx8ijivhsfmqkxn33121qcjd6nckpn0jdlh0lhx4z4zg8x37bl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/83ec19a4ebac6b2d0fd84939b393848f82620978/recipes/gap-mode"; + sha256 = "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2"; + name = "gap-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/gap-mode"; + license = lib.licenses.free; + }; + }) {}; gather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gather"; @@ -27313,8 +27396,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "887ba91d724c656c35fed3eecd2e7d826553ff91"; - sha256 = "1ngin66i3rn0j9wz1lhc8nh1saka924ilnw4r91pkr7gsyd3c20s"; + rev = "7c52e9063ad10f76d45d816a92c65cf1f6c7b9af"; + sha256 = "1iynfqza146mnkvsgfjnfmja4m42m71s0nw015iks428nzrrkf1j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; @@ -27519,12 +27602,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20170823.2103"; + version = "20170913.343"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "6caaae553112f85cb051d41fe5368a6806430902"; - sha256 = "1psx7iscw6vn370x351ffzliw1fil1lrxhiizfk7qf3d4b9j60zw"; + rev = "ae72710292a94d9af92799d3ddeb86f365f34a56"; + sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -29117,8 +29200,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "ef4219f259a8a9779e179a4c777c8258f6366848"; - sha256 = "04ncd18m1dbzqp0h7nddypj56x1jcbxxady7rja6qh0jy81g451r"; + rev = "520cd9f88cc4bb6fa47345d566fffd8dd95c7450"; + sha256 = "1xghwnjl2wi78bcn4nhjdxhann18r1nczq47yia2rxl0yg61wwxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -29260,12 +29343,12 @@ gorepl-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s }: melpaBuild { pname = "gorepl-mode"; - version = "20170904.126"; + version = "20170905.245"; src = fetchFromGitHub { owner = "manute"; repo = "gorepl-mode"; - rev = "3346ee960aac04a8bea4328bc7b259bd21e6e426"; - sha256 = "14xjpdzdj40z1d62n4qnazvwb0s70syb1r4aymyancll6nj27hwl"; + rev = "bbd27f6a0a77f484e2a3f082d70dc69da63ae52a"; + sha256 = "01lqirxgw7svxy1fdv49mvcbhpslf64in6c4dk36b8xhngyqbilf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gorepl-mode"; @@ -29388,8 +29471,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "6ce8848e808c01db99dea4064068cebe230b11a5"; - sha256 = "190smd9d8y1j602xiapnw65ii0vkayfbi7md49qv0657pc4h3hf1"; + rev = "17b8c9ccb7f8c7b015d44c4ea39305c970a7bf31"; + sha256 = "0g1vd8g6kbmz5ni0hdqg4yjlisf1lcxnfhrzcnwim5pw8zj549k2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -30609,12 +30692,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170903.948"; + version = "20170907.903"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "adccbc4429ea5e90d75219a0c2f19f522fabbae1"; - sha256 = "0q331sjispy2qv3312if224c7s6zf6l1pfr08cf6nz3w5zxdy77v"; + rev = "9ced44c934e9d02dc41ab2f47686cc041f7ae5f5"; + sha256 = "1j10irax6h67wz76zlbhkylmmn4qnb9padwld9fk43n98cismbix"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -30899,12 +30982,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170904.308"; + version = "20170912.523"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "10669b0875e3d6e2613260ad879d4a2de9ee6fa0"; - sha256 = "01167pl0awv7vlx9n28f7z0jy0bs6k0kjri0jbghhvsvjgmjg5m4"; + rev = "20fd1fdc80c05b1b2c03a9dd02f4a8358d2ed883"; + sha256 = "08rli1i3k1kvv7bavdb9s1y333cldxla9v0k3g7x72lyqncl25pr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31529,12 +31612,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170902.2335"; + version = "20170906.141"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "10669b0875e3d6e2613260ad879d4a2de9ee6fa0"; - sha256 = "01167pl0awv7vlx9n28f7z0jy0bs6k0kjri0jbghhvsvjgmjg5m4"; + rev = "20fd1fdc80c05b1b2c03a9dd02f4a8358d2ed883"; + sha256 = "08rli1i3k1kvv7bavdb9s1y333cldxla9v0k3g7x72lyqncl25pr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -31592,12 +31675,12 @@ helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dash"; - version = "20170831.324"; + version = "20170913.345"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "a4e8da47d3a82b316d2b3668c95215746c6c375b"; - sha256 = "11mgpcxv25szf8gwyjpvicq520j0nkmbnvaqr64ahg0k4d7lv31j"; + rev = "3d215210191c61b775f7f63f3f5306ddfefc7e33"; + sha256 = "1vnkvlyg6br0a5a002il4fr0r819kl7nsff6l1zbiay75sgnj93d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; @@ -32918,8 +33001,8 @@ src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "1db8ee9b6c1f8341612216e715b048ab225dedec"; - sha256 = "0z9pcrb4xazv2a2m2kxy26kw0ai1lfnj53y967y40mrkbmsrsa6q"; + rev = "502ea1285b8ce858a3acbc39dd4f54ff1af5b7e3"; + sha256 = "1j87fd9qv7pl7s52ksj7iy023lw76qy4mkgjc4w5rljvm5bdnrgp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -33422,8 +33505,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "b0e017ed66f0e1cbdc37a028b9e35860353ee86f"; - sha256 = "085ljih87dx4p4wrmqv9ck4h778vrfwiwscxj19i8rl9hcxhqr6f"; + rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; + sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33979,12 +34062,12 @@ helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "helpful"; - version = "20170902.1350"; + version = "20170910.1046"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "0998bf11e258914eb12e7082ae0b6f7a03c88864"; - sha256 = "14a0nbv6szb7vj2na1hhyypqrmpiv8c0rk4xcaha5f7sl17mzm1c"; + rev = "62ede4c121c0a0a9917682f28adf746e21bbfa45"; + sha256 = "1kp61f18l0ll9k1r72id2xgfdc857d5qhhh5pamp5ps6kjfpz6h6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -34468,12 +34551,12 @@ highlight-function-calls = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-function-calls"; - version = "20170819.2025"; + version = "20170907.2200"; src = fetchFromGitHub { owner = "alphapapa"; repo = "highlight-function-calls"; - rev = "ab017fe1f6576c7183fe297cf4a77d370d0db426"; - sha256 = "1jf7gln3fxfz3d0crr5jawlpi0ccazlahdmm5s1jb90b53rx40nx"; + rev = "f7a1eaf95fc64cc0db4d0567f9ff79ec4ae04787"; + sha256 = "1gbj1awjp69352a5p49ldimvij5mj8cngjp2sh45qw1cm5dpq653"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d1eed3f9af218d21ea8db37ee91888e23e59bd5/recipes/highlight-function-calls"; @@ -34552,12 +34635,12 @@ highlight-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }: melpaBuild { pname = "highlight-numbers"; - version = "20170815.1412"; + version = "20170905.342"; src = fetchFromGitHub { owner = "Fanael"; repo = "highlight-numbers"; - rev = "444614973a4af7c9ad2431bdaa2005d95db41ee7"; - sha256 = "0f8sczh4vm18qq9w350jzd5gigqai3m00khw4b9j85v85czx4p7d"; + rev = "f952ecb7448c125d4ef82ee6ad136b25e640d74a"; + sha256 = "0fgb63iwdaakzm9cddivmr2j0mmay3512wmd14dh804a62j5l2pv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/882e3a4877ddd22cc52f56f0ce3d55b6e4831c7a/recipes/highlight-numbers"; @@ -35549,12 +35632,12 @@ http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "http"; - version = "20170822.2149"; + version = "20170906.1111"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "http.el"; - rev = "f7844d9f84cb5e89655934ab0f23f9e4b82402cb"; - sha256 = "1hgri43sazjja2c1h4kff1zpmlwhxyy2845cp9avmdqlp2i9d2g8"; + rev = "193a7bf843dd6b6805c7b18dab31f50c8325d710"; + sha256 = "1v6adfy1774axplsjfsdkm0azfwb5g7iq26zcss4mj966q1633xv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http"; @@ -35714,22 +35797,22 @@ license = lib.licenses.free; }; }) {}; - hy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20170903.2234"; + version = "20170908.922"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "5e0f73ca5459ef11de87bdd20b54f0d72c20097e"; - sha256 = "14dhqsxvml1fq5b1gwrsl60gj2v943ybzfnqp7fh5fka2iqskdn7"; + rev = "d44dce8475cd1e8d14a533c604c3c32fcdcd4a9f"; + sha256 = "19zv3xj4lzwv9vvlqsnn4nqxjhnq1hvl81qin1kr7z6bmhmidhns"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m"; name = "hy-mode"; }; - packageRequires = []; + packageRequires = [ dash dash-functional emacs s ]; meta = { homepage = "https://melpa.org/#/hy-mode"; license = lib.licenses.free; @@ -35908,8 +35991,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-projectile"; - rev = "d99fb0d918f13664856178402efe64b4b237648b"; - sha256 = "1rlicnrjs8nmha90i9d4z4ps5dskry08rj5sa3ax2igxwbq1z4w5"; + rev = "431e29d6cf12fc333fc8dc16ceeba54b9416a4aa"; + sha256 = "1z5a4ygqmp4yjyfpcqlb846vsxvv5s2awhd3r63whw1hs9h6qqah"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile"; @@ -35971,8 +36054,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-vc"; - rev = "de75fb3345384fe13d0500435241ca4a056f5fc7"; - sha256 = "0c8y53aim35v88w5h4zn49187j6v8j7frxlhcw8crfxi1v6i7wdh"; + rev = "e504f9233a9a15834562b6646883b6bf81986674"; + sha256 = "04a9y4kgbzw5s34rl3xidv21h35vs2rsy061vjsppglggyp1jpl5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ibuffer-vc"; @@ -35987,7 +36070,7 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20170811.1012"; + version = "20170910.1711"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1089"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; @@ -36635,12 +36718,12 @@ iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iedit"; - version = "20170901.1951"; + version = "20170909.423"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; - rev = "abb577e44714ff0524a79c6cda278db75bd9322d"; - sha256 = "1w227x3ivkn8mwkqm4z0w9jcrqmq8dvr5rzh3vv4qh9nar5iq5fi"; + rev = "796ee5298dd3f4b7c51fbbcd9510a8631c5cbb4b"; + sha256 = "0k70i4k8rrgcj3cl6k4nki3k55fsd4yz8fnwaazhckjr6pvrwz8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit"; @@ -37111,12 +37194,12 @@ indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: melpaBuild { pname = "indent-tools"; - version = "20170803.418"; + version = "20170907.715"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "indent-tools"; - rev = "8ea9f4bbe95a118801f8b6a1f5950e331b43876a"; - sha256 = "0sb1c7gdm4ni1jcpb0rz3xgfgs45a8pi4nhks7cm2mly7rb7wvl0"; + rev = "5605fee418287bf13d2e132fa7f90a6b7ec08584"; + sha256 = "0ps3n6m3il7gj1v04fq1a0fmw8wz32jcxrf2ig6qvxyx0q12672k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools"; @@ -37203,12 +37286,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170809.114"; + version = "20170910.30"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "21d3e978652bcbb995954bf95e80c0ee4669701a"; - sha256 = "0g0qs0znys123yr50ykhgiz505spar3q2cgsyn61ky44df2pl4ff"; + rev = "864356a543cac50b24c67901d1d04c4e6160070a"; + sha256 = "07z131rxmwz3gwdy40qczz4is20jqdjylky7rsrxij5da3g017si"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -37287,12 +37370,12 @@ inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inflections"; - version = "20161126.1727"; + version = "20170913.216"; src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; - rev = "95a9559bd301ff86fa3b72b15126dc4851ce4a69"; - sha256 = "0fyrrzilvacvrxbw8r6wc0jphrk3h4dsw86zp3d63h4s6rlldhsa"; + rev = "e4f1372cf22e811faca52fc86bdd5d817498a4d8"; + sha256 = "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections"; @@ -37620,12 +37703,12 @@ intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "intellij-theme"; - version = "20170416.359"; + version = "20170905.941"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-intellij-theme"; - rev = "ad207c8c3d266d566fb1e4862df154096c059171"; - sha256 = "06slahp36mj39ri4v4k7sv3mly6cgk76m4zpc1why3h6dmd7hhyr"; + rev = "2bbabe3f2f87716b10ccdfcacbf51016ecc32d54"; + sha256 = "0b3615lbm8fv4svv3g72dz62h9rv18m68b656lwl2ba9sn465rsl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme"; @@ -37683,12 +37766,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170826.2220"; + version = "20170912.648"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "77efbde5158317c93939d94383ae1d43e8fda562"; - sha256 = "02jnss8y56q0dx1izsvdbx5mkpzb1rkfkcxzxv6mhj2yjrl9l6bj"; + rev = "7176857391c064e1f16a4f9fd0a51775cfedd42b"; + sha256 = "10w2jgr4nq2iff9jlk2kjbjf3hpbhlwgjvnnpvxnrkz4y4ap0bdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -37996,12 +38079,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20170828.1218"; + version = "20170905.1316"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "9950212a55fa09ef41ce53a90bea7d26cb3af99a"; - sha256 = "04qipvshmfar8znr1rbf9acx8ray4n8jwdrsnji9ywblfb74czpy"; + rev = "72e1e73f3c9da2ad04286e13bfc8fc401626b7a9"; + sha256 = "155wvzsmhb8vz30jcd3xj91z74268pq7szax7jwd725ndx6x7ny8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -38307,12 +38390,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170902.234"; + version = "20170911.1034"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e9f7dcb0d26e02c2883774bae568c6eda7fe56ff"; - sha256 = "1wwngrf9fjq1dbl59lj14kihywz8gfkjz1dpy0n9i1nm7fd5w9my"; + rev = "0a1d361b926291874124f8c63a653d83ead64a36"; + sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -38437,8 +38520,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e9f7dcb0d26e02c2883774bae568c6eda7fe56ff"; - sha256 = "1wwngrf9fjq1dbl59lj14kihywz8gfkjz1dpy0n9i1nm7fd5w9my"; + rev = "0a1d361b926291874124f8c63a653d83ead64a36"; + sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38458,8 +38541,8 @@ src = fetchFromGitHub { owner = "julienXX"; repo = "ivy-lobsters"; - rev = "0bcd566b7c3df183bf5e3cc9e30ac2fc3f5208f5"; - sha256 = "0l6zzvh0ng0wbcch9cxhyyjkbwi8w4by4410434jm5j842pl12hg"; + rev = "49923d6b59fc8ede5d930317f63f00577fef60b9"; + sha256 = "1z593062phsxn7y408zj82w4xc8l5y4x6kj919hm8a0d3nf28kg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9774fbf133ce8db3ce996b1a40c586309a2fec6/recipes/ivy-lobsters"; @@ -38563,8 +38646,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "b0e017ed66f0e1cbdc37a028b9e35860353ee86f"; - sha256 = "085ljih87dx4p4wrmqv9ck4h778vrfwiwscxj19i8rl9hcxhqr6f"; + rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; + sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -38685,12 +38768,12 @@ j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "j-mode"; - version = "20140702.809"; + version = "20170911.823"; src = fetchFromGitHub { owner = "zellio"; repo = "j-mode"; - rev = "caa55dfaae01d1875380929826952c2b3ef8a653"; - sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9"; + rev = "cf27446120c779f90aeb0b14aae24d55d2a4fe36"; + sha256 = "1f61finp605k7bii7g0gm92vpjrl5q3w28nykc0w95lm36hmg7qv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode"; @@ -39651,8 +39734,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "17dff6480c8d0b8e4daf44d65181ebc1371d3bdf"; - sha256 = "0fs9w3110cc62a8g6dasfmxi5zsmhhvhviw8r17p63f3snga6xi7"; + rev = "924936b42777f2513ec6893c68a41756bcfeba83"; + sha256 = "00p4yvlc0bcwrcr203my4i737fbsv42iz92pfgxwq6p47c42nq2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -40006,8 +40089,8 @@ src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; - rev = "95a9559bd301ff86fa3b72b15126dc4851ce4a69"; - sha256 = "0fyrrzilvacvrxbw8r6wc0jphrk3h4dsw86zp3d63h4s6rlldhsa"; + rev = "e4f1372cf22e811faca52fc86bdd5d817498a4d8"; + sha256 = "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump"; @@ -40294,12 +40377,12 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20170802.1135"; + version = "20170905.1243"; src = fetchFromGitHub { owner = "0rdy"; repo = "kaolin-theme"; - rev = "37b5b837051834cf7f8eb5b486d8b04b021433f3"; - sha256 = "0bmzfc337pv3scs717yhyw0vsrp864s6l255afli0bd2hicncnaa"; + rev = "7bf265de58fe412d7f445ee84c460e6b90d7e0cf"; + sha256 = "1zd8vgg54hj8jycixh3vr34pf8grb02hhk10y1xh0ddpxw3mpb1s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; @@ -40802,8 +40885,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "6af68c41ff7c10b8af6a121e84efc0a9b053cb55"; - sha256 = "02d1f7yhj2i5cav08qjarsipkvxmwmygjmwnxz5h0wpbphm31xa0"; + rev = "f32bb16e5b477f5b54f3dc23ff048b490e906590"; + sha256 = "05lr10wnwghzsi59y7spy8a2jps11dmpm7wndzaj62nkx0d09a73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -41304,8 +41387,8 @@ src = fetchFromGitHub { owner = "storvik"; repo = "emacs-lastpass"; - rev = "a2c94ff358db43a977d02032ba84ee1008579522"; - sha256 = "1nc21pf7cmbfidnilk6012h7124yxhkhzwim7yg95sqcmr8ws9js"; + rev = "264250725b3ba23412919ec10cfa7390473b534c"; + sha256 = "1qqmg59vbwb31nx3vi88d53484gy3sg8wnq45xrra45drpjka3ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass"; @@ -41723,8 +41806,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "less-css-mode"; - rev = "59bf174c4e9f053ec2a7ef8c8a8198490390f6fb"; - sha256 = "1rkjamdy2a80w439vb2hhr7vqjj47wi2azlr7yq2xdz9851xsx9f"; + rev = "2c3f69640c3c98457255f601db98f520dee2e7b6"; + sha256 = "01cxa7p299k3kgcv2x4lcri154fij7p02v1kl3fx4vnc88nr9jwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/less-css-mode"; @@ -41782,12 +41865,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20170818.250"; + version = "20170907.413"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "26fbd23d7417ae59e2d034d1873d97418d462268"; - sha256 = "184k26i3f69nas5iqzlmbd3b4414dvs3xshnj689w58p08qsqgcl"; + rev = "b6889c336fc4f046138334ed700c5c9a13e39992"; + sha256 = "0j8d6h61nvz2gpkbf73v246srjg6wm93giijc7f0rks9g0nlp1rc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -41849,8 +41932,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "40c239a608460e55563edb68c1b6faca57518b54"; - sha256 = "1xcbl1y5yr2lsc9j2k0rm6fdsa1ygbb91n1hd0rd66rpa5lh83y3"; + rev = "71d8e5bafc59424bacd23c8af4b368d5a6db686c"; + sha256 = "1wdxi1fbhw6k4dyq91vg7j33hcxjbhb1ydb5qaq292iach525wrq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -41990,12 +42073,12 @@ link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "link-hint"; - version = "20170313.1945"; + version = "20170904.1442"; src = fetchFromGitHub { owner = "noctuid"; repo = "link-hint.el"; - rev = "6b926a6fbb7288eb062b28747a32644c5c8fea4f"; - sha256 = "047y75wkqiv1vlrgg6fy78xsfms14drfwmil2sb7j5p5p0cw5xc7"; + rev = "366bce32f8cb1aa5f0f1ce4eceb4d60cc802abd6"; + sha256 = "09k1cz3l2ql2fdn3kx43q3bjlwqcz67fw2as6m59951lyd8fnmxp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint"; @@ -42164,12 +42247,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170825.1129"; + version = "20170911.1138"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "72a72815b7bff1d6bc6c420c9bb7e9ddb4f1ec5f"; - sha256 = "1459yd1yl4i8qlzj54aqknx01j7xhj9v8rj11s9vzcdqpw0lb2ks"; + rev = "134d815c843813950cbffc4516cabafd8ae75ed4"; + sha256 = "1xw8j3hjahp6vl3qnfab0kyl20zxclnbfpy9x1zp344zic61n02m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -42206,12 +42289,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20170823.1458"; + version = "20170907.926"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "dbf62c3b50723e3970a80d181805c395d4d4c33c"; - sha256 = "0xjqdkimw65qa9ldh9ms03mgh6sh5yyir16vyi2fmwjlb1j4vvh9"; + rev = "522fd8dcce23b2719c758e64f99b64591406f2f5"; + sha256 = "0sbqw585lv5j3w13zq2adrcqybw88y36qnnd2vp8nk9kgzvl4p62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -42314,8 +42397,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "list-unicode-display"; - rev = "1719e7e90035c78dcc8a780c34cd18e6b3dcc6b1"; - sha256 = "1xy06vlwlhz872099xplzsz7rbyf6jsvcqyg6qpry4b2c57zjx8d"; + rev = "222c21c68ccc930b2843ea919c960de9be3b55c2"; + sha256 = "15gz7iw8k4xlj1ik216qw4q1j7nxihlnqgr983ic4k1n2r29fys7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8e2a974a56665b97d7622b0428994edadc88a0/recipes/list-unicode-display"; @@ -42499,12 +42582,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170805.1249"; + version = "20170906.2104"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "467285fa70dc5f349f2deb0d2950df037fb89f2d"; - sha256 = "0sm2k5988rf0q1zwqsnklx5p7wp4wrma0h11q7jd8j7v8vniqryz"; + rev = "4d972a859e6a56d969b075688b425ac246b40962"; + sha256 = "0qzg5i9x9f5skp2bk5avxw30nhs44z4didk69prli6p6sfd4bgqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -42607,8 +42690,8 @@ version = "20150910.644"; src = fetchgit { url = "https://llvm.org/git/llvm"; - rev = "e17ef297f0841306e1126830714652511e3f8d9b"; - sha256 = "0lkwihxqga42cgxsiawag45fhmhwivx69w7c8jr86sffi04illln"; + rev = "ae7945dc893db824632135ea16929e14ca185595"; + sha256 = "0vsj8i29qkfl2a6fsdplzdh2kb9vrc2rkbbh7hak81ngn19q41l8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; @@ -43084,12 +43167,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20170830.617"; + version = "20170905.1130"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "1d29d6b1ccc59fa60f2e326c74364b4b2305dd87"; - sha256 = "0b2pbvpvga6qi9k6n295ldbjhqyhknlh0nylk3yqp3w1g97nhhkc"; + rev = "d69692651742b65398b4c1f9ee06d1670d9443d0"; + sha256 = "1f09shdirq81c37sg2hdgj1wqqvwmg5m7bkprz28fych76xi8jgr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -43319,8 +43402,8 @@ src = fetchFromGitHub { owner = "pawelbx"; repo = "maces-game"; - rev = "6a067422d305ac51612842930ed6686dc615ffec"; - sha256 = "07pl2y4qlpcn9ap2vp1gpvdqh4l05gb7pp11c1krlaxybhwdcqjb"; + rev = "c0fb795f5642467ea528d2f04d904547e8a77ecd"; + sha256 = "1sf1h5660fd3mfcca3h1fqk3xssgigkil26wz1kp1kvxfx9lm31m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9f33b926ecec48a43ba4f0484c687a7349ce50/recipes/maces-game"; @@ -43481,12 +43564,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170829.1128"; + version = "20170913.343"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "6caaae553112f85cb051d41fe5368a6806430902"; - sha256 = "1psx7iscw6vn370x351ffzliw1fil1lrxhiizfk7qf3d4b9j60zw"; + rev = "ae72710292a94d9af92799d3ddeb86f365f34a56"; + sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -43698,12 +43781,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170824.1130"; + version = "20170913.343"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "6caaae553112f85cb051d41fe5368a6806430902"; - sha256 = "1psx7iscw6vn370x351ffzliw1fil1lrxhiizfk7qf3d4b9j60zw"; + rev = "ae72710292a94d9af92799d3ddeb86f365f34a56"; + sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -43992,12 +44075,12 @@ makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "makefile-executor"; - version = "20170721.13"; + version = "20170913.56"; src = fetchFromGitHub { owner = "thiderman"; repo = "makefile-executor.el"; - rev = "105f76bce212bfe511eda191366fef9ee45fd1ab"; - sha256 = "0p6vk0f3qpcpa7fa4q3r6w5a9d0v67gv4khf5jy9g2nc9bz9ai57"; + rev = "90872c2e2ab05da7e8a9dd195fc696b4388c0f35"; + sha256 = "03505bzrlz8jxp5fda5zqn58860xbhhz5xy33wvnh1w9632ljdg9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor"; @@ -44181,12 +44264,12 @@ mandm-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mandm-theme"; - version = "20170826.307"; + version = "20170903.306"; src = fetchFromGitHub { owner = "choppsv1"; repo = "emacs-mandm-theme"; - rev = "4cbd651445cf92137261b863ed5f16fdee6b8d11"; - sha256 = "0sryf8cg0j9argi2cfmv7v257xcxlgvl9q0yrbviqrb4gvdg5wi2"; + rev = "889cdcb8ea7234d2e6d9dad663e39bd5f872c28d"; + sha256 = "0x7fhzsx7pcbyy5dkx9aa2qvpnn7psc3nf8mqv96mvnzr5q1xg53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mandm-theme"; @@ -44202,12 +44285,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20170614.306"; + version = "20170908.247"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "01255150a80ada47bf3708daa93069ac3011831f"; - sha256 = "1djlzcg6dl29rifdss3cy0g3xmscblqvkfwzykiqs2y7vl51r60b"; + rev = "14e2d3f7586001ae4b44582ef03728eaf8326643"; + sha256 = "0c1n5lnllm9mqar68jxm9sr5kyzl4v4ckrdmms68a9rvcfrbn6lg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -45900,6 +45983,27 @@ license = lib.licenses.free; }; }) {}; + mo-git-blame = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mo-git-blame"; + version = "20160129.959"; + src = fetchFromGitLab { + owner = "mbunkus"; + repo = "mo-git-blame"; + rev = "254a675eb794cdbbdef9fa2b4b7bb510b70089c0"; + sha256 = "1dh92hzpicfvrlg6swrw4igwb771xbsmsf7hxp1a4iry4w8dk398"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a784f931849ca836557390999b179ef9f6e775f3/recipes/mo-git-blame"; + sha256 = "14ngwwgzrnnysq1k1k681b5i06ad8r3phhgpvn5alp2fj3il03l3"; + name = "mo-git-blame"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/mo-git-blame"; + license = lib.licenses.free; + }; + }) {}; mo-vi-ment-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mo-vi-ment-mode"; @@ -46546,12 +46650,12 @@ move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "move-text"; - version = "20170213.2128"; + version = "20170908.2030"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "move-text"; - rev = "ea57d20a49bcffbcd948ad2f6f6c710fdd71d689"; - sha256 = "0cc6cyqwm6nivnplr1226xz25vmjk6icsjp80kkwdwgfbiyj986j"; + rev = "bdaf3e3a0d33cd528cad1d10facbdf0635232e4d"; + sha256 = "06jxk5g23822gfmwrxhc34zand3dr8p2wjh1zs3j61ibz6n0nmz1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text"; @@ -46592,8 +46696,8 @@ src = fetchFromGitHub { owner = "bard"; repo = "mozrepl"; - rev = "8cc81245f030874072c1e6b821b6390f279d04e4"; - sha256 = "0mfpxj23wr38q5ds4i2gxb222rr8w4bcp50a3c7svfjvr5x8hymr"; + rev = "ab3e79914445039ceb62f7f2dc342358fec3492e"; + sha256 = "1c7dsip5wmlf7x2hziwil5n3igvpnh17d7yg8lsg001y5sjl3mjv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6839c5e52364fb32f6d8a351e5c2f21fbd6669a1/recipes/moz"; @@ -46777,12 +46881,12 @@ mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mtg-deck-mode"; - version = "20170822.1344"; + version = "20170904.2002"; src = fetchFromGitHub { owner = "mattiasb"; repo = "mtg-deck-mode"; - rev = "a5f2dbca51c1c77dbcc0d4b752b78c0971ef43bd"; - sha256 = "0zpw6mdngf0zh8x8zj3m00irk28kw5qh0l6wxdc4cwzsnbc10lkn"; + rev = "c1ab6dbfbe83d0c90f2c9ba4dfeb31b09f1fb875"; + sha256 = "1xyd827b6wfdbhzj2ba4mywikfjwjs9xspn2aksbsl2bcby0n6zn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; @@ -47047,12 +47151,12 @@ multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multiple-cursors"; - version = "20170831.1633"; + version = "20170908.1452"; src = fetchFromGitHub { owner = "magnars"; repo = "multiple-cursors.el"; - rev = "e048e04bd8a637095bac9291c72606300de8f74a"; - sha256 = "0ng85q650r7la7nh3mn3qww1nsqnbrhrly8ic15p6wjjqb31gphq"; + rev = "10752700084595bb24712c27ba70a2326302e45b"; + sha256 = "1hg693xq45bjxdla4drn6qn0np417hyvw6x3bmhfykg6lpibslz6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors"; @@ -48153,12 +48257,12 @@ niconama = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "niconama"; - version = "20160703.802"; + version = "20170910.801"; src = fetchFromGitHub { owner = "NOBUTOKA"; repo = "niconama.el"; - rev = "533559931670d49e930dfe4d19bc7a182dbbd3a8"; - sha256 = "0iwgfqwywlrgf3151619z7ppf39r5dq2891qhgk0vs76kz6frai2"; + rev = "96e7553e50e6bf7b58aac50f52c9b0b8edb41c56"; + sha256 = "1gihjzwl6309vgav5z7jzi8jb7is8vx8lr23kb6h373gwws4bi10"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad8e7189e9c4c5d86cef268f45be0dda2d702805/recipes/niconama"; @@ -48195,12 +48299,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20170811.646"; + version = "20170909.1336"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "26a5bd7d31d9c203aa4e1cc4961fb6cdf0ddc0f9"; - sha256 = "1m326skvvirkf938ymch135p2gxxdyqx4plpvivp09qpfzrj0b1d"; + rev = "71b3a560e6d017907f43f7dd074d300653c1588b"; + sha256 = "0ip330ylvy6rwgvqravm58qh8ssbrd8nw2rbd3gbhcwiqakawsjl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -48220,8 +48324,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "b98941a605d3cc47966d8407ace6e454d781af9b"; - sha256 = "15aywznyrjwqpxp1991597h5x0fnsyr7xk2mc8d8s67y0iq7va1f"; + rev = "87111bff382655075f2577c591745a335f0103c7"; + sha256 = "1rmh2a2q3lw3wmnlh5y7g06nzhcgnhz5libgsjfl3jvpxzdlck76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -48262,8 +48366,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "4a5b6d5d2c5fcca1bf7a925dfaaa1f13e552a1ea"; - sha256 = "10wplxvzmx98an29bzm4p9khszrfhfjq4ry2p0j2jyl8wxn5a8v3"; + rev = "eb7623fb3b23afec25619a76adab6bab5e338bf2"; + sha256 = "1shgbh2iawml605qhr1s8bcmy0by7d455lm70wb2wkznsdlwv6wp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode"; @@ -48405,12 +48509,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170823.518"; + version = "20170906.558"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "c1e2cd9daf37f6a1e455be108bececef7c362692"; - sha256 = "145ivrf0km7aknd318vzy4c4wyjzz4681kcl84amqvwwdzbmsnxi"; + rev = "d1d649711c4ba63e458b229afdc64ed4639cf988"; + sha256 = "0416i7gv89r46x30swvqhqf7na9rkpm0w9lw1v49kxqdrqqdci67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -48612,11 +48716,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170823.408"; + version = "20170912.1817"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "0260ee371ea561d3e6876ab800e934ddeacb3482"; - sha256 = "1yfvmsx8pq15ma3m0qk8v9pg64xm1c3v432yr2p7hqqm5h2jqbgv"; + rev = "f2ed177e6260d835b8a13d2a53e1c8d5fa76edf2"; + sha256 = "0d4110cai0z2h2gggx93wfm8fj2av4dwk57gf835crsmv8y3wkj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -48650,6 +48754,27 @@ license = lib.licenses.free; }; }) {}; + nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nov"; + version = "20170910.1145"; + src = fetchFromGitHub { + owner = "wasamasa"; + repo = "nov.el"; + rev = "91c4329f64ddc9a598fa6c58e1d9264aee073e72"; + sha256 = "0x3ijjhjg2q8gdqf4hgr2d8wy32qhxy48kbz0slibkn9yik3pvlz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; + sha256 = "0hlcncpdazi4rn5yxd0zq85v7gpjhw7a6dl2i99zf4ymsan97lhq"; + name = "nov"; + }; + packageRequires = [ dash emacs esxml ]; + meta = { + homepage = "https://melpa.org/#/nov"; + license = lib.licenses.free; + }; + }) {}; novice-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "novice-plus"; version = "20170307.925"; @@ -49868,12 +49993,12 @@ occur-context-resize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "occur-context-resize"; - version = "20151227.2002"; + version = "20170904.1609"; src = fetchFromGitHub { owner = "dgtized"; repo = "occur-context-resize.el"; - rev = "36e69b9d3b7c6de884a8e8822d67856b78a07f4f"; - sha256 = "1v1c2481v2xgnw8kgbbqhqkdd41lzvki9hm3iypbf3n0jxz8nnzy"; + rev = "cdee5a631ceed9337579d4090e0acf8140747f80"; + sha256 = "0h7ypw45h5rcbwx4c4mn2ps9hp84dpjp3iay2nc9zaavv05n7ysa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2425d82b365784b17ab56af5f77c6095664c784/recipes/occur-context-resize"; @@ -50267,12 +50392,12 @@ 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 = "20170824.1418"; + version = "20170909.319"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "8aa56979fe85211b1e12c42e91b68a4ebee5176e"; - sha256 = "15bsmi5cm208iq8rw87gvkkqja2shldbc4287x1qxny3cplcvwqi"; + rev = "b425270bed93b427ff519d6f51ad1d97531a0a92"; + sha256 = "0l9dk9idfsr21q0icx9fpgqyi4qlhnqal6sypak5zh8dgchrqif9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -50736,12 +50861,12 @@ org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-beautify-theme"; - version = "20170829.1443"; + version = "20170908.1518"; src = fetchFromGitHub { owner = "jonnay"; repo = "org-beautify-theme"; - rev = "18528986b19246d7763f4db8f336fb0a0ab4bfe9"; - sha256 = "02zqwfxxkmcb7c1w3vnf5b3zkz84fqyhldyriccd80mr3agq8wnk"; + rev = "df6a1114fda313e1689363e196c8284fbe2a2738"; + sha256 = "1lkz7736swimad12khwbbqc4gxjydgr1k45p4mx03s25pv1w920y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f55f1ee9890f720e058401a052e14c7411252967/recipes/org-beautify-theme"; @@ -50799,12 +50924,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20170826.1412"; + version = "20170908.634"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "f5a147c1f94eb21c61d15bc3e19f5bc95ebc055e"; - sha256 = "1bnbyd1w59kqh78q58171vsl1fgj8vkczx12pqvvvi7316714flg"; + rev = "9a84111f759c264bd6ab435995803d0f6234b78a"; + sha256 = "00a92064bjlrjrmy7xcfc5ajajxviar82pjisdm4pxd3jcab8qcw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -50967,12 +51092,12 @@ org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-clock-csv"; - version = "20170813.1602"; + version = "20170904.1745"; src = fetchFromGitHub { owner = "atheriel"; repo = "org-clock-csv"; - rev = "e45d277a8811ee228119349f51af9788befb3b22"; - sha256 = "0fg1ky6aw0hmm6a6zv0i4f8h9xam4d65cnpm2k2a3p1zpn0yzdk7"; + rev = "20ab6ee4395bedc0a7b8dfaf7b51f2c63dc8d2c6"; + sha256 = "00lcvmls7zlkqmsi0yfiihyxv49803jlc9khcbqawxlkijvr65pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; @@ -51240,12 +51365,12 @@ org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-edit-latex"; - version = "20170830.1628"; + version = "20170908.822"; src = fetchFromGitHub { owner = "et2010"; repo = "org-edit-latex"; - rev = "39cbc9a99acb030f537c7269ab93958187321871"; - sha256 = "1w0lyz71dq8x28ira4hig1b70bqn1dr53w3k5dgch9szcf6xa86y"; + rev = "1f228310ef2f3f2959a527f6d99e42ce977384c8"; + sha256 = "1zfimgnmn7nqaq8aglyly55k5dr548467masr2g4x3m0z1by1z6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex"; @@ -51557,8 +51682,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "b792e281681962679585090be9e35de47c317402"; - sha256 = "1ksip87mf4yfl26d7ypn2bp8f7qj4751kqgmhl5mapmji6x1lw6x"; + rev = "657302b97e222abb262070586c56fe5d64355035"; + sha256 = "0myi67sdr62q0qxjijkxbpmyhxvnrxwjwpq2al1cds0bk8q7nzq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -51577,8 +51702,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "b792e281681962679585090be9e35de47c317402"; - sha256 = "1ksip87mf4yfl26d7ypn2bp8f7qj4751kqgmhl5mapmji6x1lw6x"; + rev = "657302b97e222abb262070586c56fe5d64355035"; + sha256 = "0myi67sdr62q0qxjijkxbpmyhxvnrxwjwpq2al1cds0bk8q7nzq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -51615,12 +51740,12 @@ org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-mind-map"; - version = "20170827.1554"; + version = "20170912.1411"; src = fetchFromGitHub { owner = "theodorewiles"; repo = "org-mind-map"; - rev = "c3c6e23242d92ea289650ea97c81e2c7711fe155"; - sha256 = "00yic00cv6hqxhjixqprqkzrb7xhxa8asslnvsx0hacz65p1lrvd"; + rev = "73026279191516396637e6e33628be9c0314545b"; + sha256 = "04v5gdmprga75y9yqx2ism28vnwsy5ky7hfzzdi44mq2gd3m8hfl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map"; @@ -52024,22 +52149,22 @@ license = lib.licenses.free; }; }) {}; - org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, frecency, lib, melpaBuild, org }: melpaBuild { pname = "org-recent-headings"; - version = "20170807.1014"; + version = "20170907.2129"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-recent-headings"; - rev = "a9f3fdf1cb3deb34103ea9f6f604bdf0edac1968"; - sha256 = "1kbba9x1x2jn1081zy8ync0vfsnj2cjflnlyycpb7lprsjbdq3zs"; + rev = "a09c2670c400c7a4fbbf0ac05d2d9226aa10e8f4"; + sha256 = "1m0v94zaz30c5p4k1s213dpg0kjs6nd92bph2zlbm37wq8znizmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings"; sha256 = "0b51pyxdk8fdbksx7h1c88sw1liwng8wkjfb1q7w7lglw6f8sjsa"; name = "org-recent-headings"; }; - packageRequires = [ dash emacs org ]; + packageRequires = [ dash emacs frecency org ]; meta = { homepage = "https://melpa.org/#/org-recent-headings"; license = lib.licenses.free; @@ -52227,12 +52352,12 @@ org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org, s }: melpaBuild { pname = "org-super-agenda"; - version = "20170823.151"; + version = "20170904.1516"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-super-agenda"; - rev = "2b6d6a98b06e4744790cdf2820753ef2f9ac7851"; - sha256 = "00mbp8bzi93pywv1bd31g4c2yssdgis9xri17ygnv9754ma92byn"; + rev = "00b0dbbc48b99e89f6e76e6a6b000f2f5716c40e"; + sha256 = "126v1zc5cm1sbm56z2h8v5lvlbjsnccgf80x7zm3970q0rdf0qh4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda"; @@ -52539,6 +52664,27 @@ license = lib.licenses.free; }; }) {}; + org-web-tools = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: + melpaBuild { + pname = "org-web-tools"; + version = "20170906.102"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "org-web-tools"; + rev = "9ae976aedacefdbe4a827bd66a4642f40bc878d4"; + sha256 = "18hbcjg30fd342mvab3h7v8y5mja90g54823mnvmffhrp657z7qc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools"; + sha256 = "19zpspap85fjqg5a20ps34rcigb0ws986pj6dzd7xik8s6ia29s7"; + name = "org-web-tools"; + }; + packageRequires = [ dash emacs org s ]; + meta = { + homepage = "https://melpa.org/#/org-web-tools"; + license = lib.licenses.free; + }; + }) {}; org-wunderlist = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred, s }: melpaBuild { pname = "org-wunderlist"; @@ -52996,8 +53142,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "osx-location"; - rev = "84e9269f6c66e52e8bbe8a0cd55932e7b3e7977e"; - sha256 = "0yixzqx2b5pnc4qs2qas0jm7sxls511x9ahasqizsawcnqd43apg"; + rev = "8bb3a94cc9f04b922d2d730fe08596cc6ee12bf2"; + sha256 = "09hjcpmh0fxhsx63vcaz05w94xcc8q35vgffggjqaybs7hyzlx69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8673dafb02a8d70c278bfd2c063f40992defe3a3/recipes/osx-location"; @@ -53202,12 +53348,12 @@ outrespace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outrespace"; - version = "20170818.1835"; + version = "20170904.511"; src = fetchFromGitHub { owner = "articuluxe"; repo = "outrespace"; - rev = "ef13c944735e8b3cb41c8067d0a2c1de400071b8"; - sha256 = "18jc9yx5p5rx7pqj8yqlzz4vfqxjhydi5mhrycafdwi001hc493k"; + rev = "cf2a397971f82c87dcfbe3400e3e7c2de79fa68e"; + sha256 = "1rxyyvax3f0fh3k8majkhpdrnlqg4pg7hl68q61csiccayx04213"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2659a78181b8fe98ca4a80c75ec8c9b6dff44bb5/recipes/outrespace"; @@ -53223,12 +53369,12 @@ outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }: melpaBuild { pname = "outshine"; - version = "20170903.318"; + version = "20170904.1524"; src = fetchFromGitHub { owner = "alphapapa"; repo = "outshine"; - rev = "cd44e13800f63482511d2c70acaf4da0de78460e"; - sha256 = "01j6n1h5k999g8kpy62kkd3vrxzxw5bhpgki31s5ih4c5znd2d5x"; + rev = "a695215b47ca4a950c47a69a5c6e4c695892b1b3"; + sha256 = "18c1iqfw2q9if6yhvgspcw5arhd549gcvwyphnsl9cl6q40q2vly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine"; @@ -53430,6 +53576,27 @@ license = lib.licenses.free; }; }) {}; + ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "ox-hugo"; + version = "20170912.1322"; + src = fetchFromGitHub { + owner = "kaushalmodi"; + repo = "ox-hugo"; + rev = "a486141e4e2c3f9f67e799e20af150611d77f850"; + sha256 = "1srrkc0bajmhp614avk4yr51zsp0gnmn47r1wi7qxkr6ybxwx8k1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; + sha256 = "1niarxj2y4a14lrv2nqcc36msw7k61h8fbjpcdrfbaw3n0kchd40"; + name = "ox-hugo"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/ox-hugo"; + license = lib.licenses.free; + }; + }) {}; ox-impress-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-impress-js"; @@ -53685,12 +53852,12 @@ ox-textile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-textile"; - version = "20151114.2025"; + version = "20170907.351"; src = fetchFromGitHub { owner = "yashi"; repo = "org-textile"; - rev = "0dfca070e35bc6f4a412319e2474bb88666c8c2d"; - sha256 = "1r9c4s9f7cvxxzf9h07rg75bil0295zq1inh5i4r6za5jabkr4dg"; + rev = "04bcaa64a0c5a099bd7adae5e6584cfa685b2b67"; + sha256 = "1z1574n6br5rabv9g5qcwk49lx05a4j1gzl3hc2axkxdrrm4m6kk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a68a7a99ecce8f1afa03e72ff1f636edaf5868/recipes/ox-textile"; @@ -53853,12 +54020,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20170506.1759"; + version = "20170910.124"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "940c991ccd0dab53bd7c120601b3db35669c5e73"; - sha256 = "18yr4qq3jyf9zhlwqrbfq616svsgn5spnj0s4gsni7kb2ijjh2bp"; + rev = "46055de8792a1c7c01d06f74148dae6d700b00d6"; + sha256 = "1x1kln1bdqxxgan1pkjs98a9d3737j4qfpza4r70va7wvsy3ndhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -53895,12 +54062,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170828.452"; + version = "20170907.201"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "a7bcde21d5f2d1ea3b69834a8f6b56b4c4e78dea"; - sha256 = "0yid4kaqbqf3w7a10ghbds8bbhkhn7k2xhw921zwvri00w98gqgx"; + rev = "2fc3bc9530caea437a55e23c13d31d8803193107"; + sha256 = "076da92vc86kdc7gdh8id7w8qadh0fbiz068qzk8kr8w5bw6zkr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -54046,8 +54213,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "page-break-lines"; - rev = "913732ad06d838661989fb1fef05fcc9ca88f725"; - sha256 = "0cpcbjxm158475jq96hms0qyk14ijvzcxfac4gw8nwhik9n4mv1r"; + rev = "c82759f267a81a07ed7aafffbbbfaa3e94941b59"; + sha256 = "17kly423l5fyqzmhbxqwd9fvn191bzq6pn3ng1ynla51cg47zskl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines"; @@ -54166,12 +54333,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20170829.939"; + version = "20170910.537"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "a476d240cfb73e826ccb907de36516b4e1d774ac"; - sha256 = "02l709xv2jyz0d3mi06mp7z2m35p3z5vv00z6qp7bnxydk82l91b"; + rev = "d452c3baa19d51fb04c5a52f550b560fe695eb0a"; + sha256 = "02qrc3qxajzxm9lfrd33i9sbawh9nf4gz9i3drzhv11ca549paaq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -54542,12 +54709,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: melpaBuild { pname = "pass"; - version = "20170829.105"; + version = "20170911.456"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "60bc00c0931bf1229ddaaf7839155bcc07fc3bec"; - sha256 = "1vjxm0q9l0d4dj8v1l4cif51cphn6gjvkkw2p92c59psbqa371rz"; + rev = "f811120c33279fb6881c0a70ae26862adefcd659"; + sha256 = "07m80mscxfi5wmf0cvymlnpcp4aprzn8ynaxs6vxgpr11gwr8zvm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -54664,6 +54831,27 @@ license = lib.licenses.free; }; }) {}; + password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }: + melpaBuild { + pname = "password-store-otp"; + version = "20170912.349"; + src = fetchFromGitHub { + owner = "volrath"; + repo = "password-store-otp.el"; + rev = "2965da7d8edd32bd4ef62f487ea6bcd08c599c89"; + sha256 = "1svm6rlh4f0rjcl0fjy3x4bfakdn9npi8w7ak217ad2k08j44bzd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp"; + sha256 = "0m3n4gjf6hmcs2kg80h1whzbl74zsj79ihliyqfcdfc4v31m32sg"; + name = "password-store-otp"; + }; + packageRequires = [ emacs password-store s ]; + meta = { + homepage = "https://melpa.org/#/password-store-otp"; + license = lib.licenses.free; + }; + }) {}; password-vault = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "password-vault"; @@ -55108,12 +55296,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20170820.1117"; + version = "20170912.711"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "c70520068cb316f736811e922a015347fdbcd30b"; - sha256 = "03ys82k68d4f5xvhwjq2i2qxh8r4scj49rvgv2bdrsmnmzcpxdrd"; + rev = "c1b183f71e618693ac6ec20f051ca41270be3bce"; + sha256 = "059fmrakfzwq4xqf246ksi9h7gfm37f29565w9mvlq4z7hhbf5z3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -55379,12 +55567,12 @@ persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }: melpaBuild { pname = "persp-fr"; - version = "20161226.1241"; + version = "20170908.44"; src = fetchFromGitHub { owner = "rocher"; repo = "persp-fr"; - rev = "ba989ad309c2023d1826e79446908bd1b881a56a"; - sha256 = "1l9yb14sqxxfxzh76yv415ifnmrdi5qqp4m0858drs9wcm9f23pm"; + rev = "4d2d1a75019f520742da79f1aeed9c4a960677e0"; + sha256 = "1waakbmxwm0xdnl0iznyk61ccwdjvwv5g1naml31r7q0cnk0jfz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr"; @@ -55400,12 +55588,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20170902.1110"; + version = "20170908.648"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "298420817486ab7dcbe6f0d7b3f272814f0670ee"; - sha256 = "0kqhkdg0dwyzagzwz995hpx68mdv1rsmzjn0hydqpg5bspwqg7bw"; + rev = "fd57484756b7a7e34895bf55238413005ab35959"; + sha256 = "1f7qcy5swiqx17835dvwb89x0ndhviyxi5bqk2gn14c1z8fmld5a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -56114,12 +56302,12 @@ picpocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "picpocket"; - version = "20170903.1254"; + version = "20170905.1133"; src = fetchFromGitHub { owner = "johanclaesson"; repo = "picpocket"; - rev = "8ec47cd36bd4058656f4f0fb7d60b606eff2ba29"; - sha256 = "13wyn4nvdr80zglzf5gwvh4rbd4wgss5q8ckj8n5i253fhyvw51a"; + rev = "e0ca0f1fc03b4166ce2eab9d7532b9b29989e5bd"; + sha256 = "0ldiwfysfwz6mr54j7rl1jccfx9lq31a4v9r6cm55js75mamhbw1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket"; @@ -58391,8 +58579,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "6699f2cf64c656d96f4d6f93fa9563faf02e94b4"; - sha256 = "0q22i3iipzv0hq6blp7cpaqn8k3rj50r4l1vrf7axkkdxnglb1pj"; + rev = "06aa8dc9e730cc39c67d0ff9c0c95e645ccf03c9"; + sha256 = "0na3apgapd78z57jfdwns35mflqgwjwbcj2lmspg9ipg0x191378"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -58565,12 +58753,12 @@ pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20170127.1949"; + version = "20170913.348"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "83599129c0de6f9f5082d019373c3d9347150191"; - sha256 = "17fwl967kw0kykakvga9vk7i294y5iysff263ir4y6vsnca3syn8"; + rev = "3a3bdf96e64dc6f5d031bf0ed2b6002a600187ad"; + sha256 = "02mx4gs8hlinrxm8jas9jy83kvglaqjz3sxn4m4hrrj07gz0si96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -59844,12 +60032,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170902.924"; + version = "20170913.509"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "548cf7bc2f45d3b2db45d908bb2137b2c87f0917"; - sha256 = "0ycy66q10vhwi7mgnxciin6xqhzwg4vpjhi9bgis7m9nvv0j8py9"; + rev = "d57b3a6c64835fe334501bb2b1f8e370be777d90"; + sha256 = "11mh94lcmwh0qb68lyqmdkannq9p9y3j32mmwc23q88z1z7vvbf6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -60240,27 +60428,6 @@ license = lib.licenses.free; }; }) {}; - rcirc-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "rcirc-color"; - version = "20151130.758"; - src = fetchFromGitHub { - owner = "kensanata"; - repo = "rcirc-color"; - rev = "9fa5150685fac91323e7e32a1df190270de2ac01"; - sha256 = "08v3gldqdhrix7k1qw1in1c9kr0xa43dlnscq0lm63arlnmijh3c"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/146b31de03f1f588fda3f7e27a538f87e71077f1/recipes/rcirc-color"; - sha256 = "1a8qqwdc0gw6m1xsnwrj3xldp05p7pabyj6l4bccpg3vf5wbgkn5"; - name = "rcirc-color"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/rcirc-color"; - license = lib.licenses.free; - }; - }) {}; rcirc-groups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rcirc-groups"; @@ -60495,12 +60662,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20170830.1306"; + version = "20170907.916"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "839954ac051f473deec27495111879864162c8cb"; - sha256 = "0vvb1c712ngl7cnxkxlqfg9abngvdwxfh64hx511zcy428q381m7"; + rev = "f41b7a7f8eac0be5c4d8780af1d461f9e51e9cad"; + sha256 = "1k3xsidc05dls9scsi7vvrrqlfgqk343crgh89amg066s5p55s6y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -61267,6 +61434,27 @@ license = lib.licenses.free; }; }) {}; + replace-with-inflections = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inflections, lib, melpaBuild, string-inflection }: + melpaBuild { + pname = "replace-with-inflections"; + version = "20170911.245"; + src = fetchFromGitHub { + owner = "knu"; + repo = "replace-with-inflections.el"; + rev = "e286036a5d1dbac06a72a1e831b2a8d9cad27238"; + sha256 = "1szbps1k3na3w9djkqxm3s1anm12505ajr7ay9j7pmd00qf75379"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7892eb506b8f4260bde4be2805bf3b2d594ab640/recipes/replace-with-inflections"; + sha256 = "1pqpin5ipm3g74zjh1kh6s1gh0aan6202p0y2q00d4ywbz9kn5s0"; + name = "replace-with-inflections"; + }; + packageRequires = [ cl-lib inflections string-inflection ]; + meta = { + homepage = "https://melpa.org/#/replace-with-inflections"; + license = lib.licenses.free; + }; + }) {}; repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "repo"; @@ -61644,12 +61832,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "20170809.1107"; + version = "20170908.2359"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "081685a8c624220ece68d6dca8d60016585b04ff"; - sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z"; + rev = "adfdf6230f02f469a1b508922b6837f95f6434d2"; + sha256 = "0bk0caadn3wq2ck2acyvdssllw45l455binpm5i3i63nzs73v8r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -61896,12 +62084,12 @@ robots-txt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "robots-txt-mode"; - version = "20160820.202"; + version = "20170908.642"; src = fetchFromGitHub { owner = "emacs-php"; repo = "robots-txt-mode"; - rev = "edf1f8082c88cb2ff5a784ba00f92c535aaa1c7d"; - sha256 = "11ig771ck610glb6f3322ka026ikq0b072rlq5z6ymr3rbxagn6j"; + rev = "4a77674ab2963b829d3b751741c4ce1169e87f6b"; + sha256 = "1ynmb9gpryfrml80kkv71k11j7r91mgyzh1q8xx52s0b4mkd33zc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/robots-txt-mode"; @@ -62089,8 +62277,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "b0e017ed66f0e1cbdc37a028b9e35860353ee86f"; - sha256 = "085ljih87dx4p4wrmqv9ck4h778vrfwiwscxj19i8rl9hcxhqr6f"; + rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; + sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -62151,7 +62339,7 @@ version = "20161115.2259"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59743"; + rev = "59866"; sha256 = "05rkz2wvyr00rr6g5sc2jgx1v2m81cbf24gjazxw4i9b3sf55ykr"; }; recipeFile = fetchurl { @@ -62275,8 +62463,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; - rev = "13288a29478a9e45ab4fd2188aea8d4894e08848"; - sha256 = "1zx70bdyqabx03g813h76ks9agy66yf08z9x83yw1rsf713d1pg2"; + rev = "f3270274a9d12537263d9ae0b8f4e60c542cf77f"; + sha256 = "1ck3xhavilq5qdcc9libd6dyzqz7b0cxd3q5nd7kaxicc28h9p80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; @@ -62544,12 +62732,12 @@ s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s"; - version = "20170428.1026"; + version = "20170906.1304"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "e61dee51474e61b777575b474459c582f3084f64"; - sha256 = "0yw23k8ix8v8sablqzn4802xxzf6b63q6hk3chypbx3y41363s8p"; + rev = "3a95064647d1f39b90e65a56f1fdfceb7c329f75"; + sha256 = "0n2c6islny418pfmaz1bjij1j2s1qailga0vha32qanx4fx7yf3v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; @@ -62863,8 +63051,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "959b9c4b712ed5db6938fc6ebdf2c1cb58df6c4f"; - sha256 = "1wjfxwd6xzc0yn1crrfw2a1j91sh9x6nxkm4rypkznj1qjwn7icq"; + rev = "5fbb1060ad967ac8af34687c7e7bcac69c7381e0"; + sha256 = "1gfpkqhqw9n0x325ar7ln9j2052r8hk65ilhz3dp7x865mqdm2wn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -63648,27 +63836,6 @@ license = lib.licenses.free; }; }) {}; - sentence-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "sentence-highlight"; - version = "20170405.2352"; - src = fetchFromGitHub { - owner = "sbelak"; - repo = "sentence-highlight"; - rev = "c7a501f38de5a9b52b1f30e21299fe1c374a27c7"; - sha256 = "13idmpw7nz75bpjbi85pv89annqqffc0gjizsazbzfdm21i8p7y6"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sentence-highlight"; - sha256 = "07pyyl74cvnz6dd85ghv3zdrir08317lvnzm5nf1n3p85aqjpcxm"; - name = "sentence-highlight"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/sentence-highlight"; - license = lib.licenses.free; - }; - }) {}; sentence-navigation = callPackage ({ ample-regexps, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sentence-navigation"; @@ -64930,8 +65097,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "skewer-less"; - rev = "4d4394418b70bd454efef1cb68129da05ab67891"; - sha256 = "0bf6w9wca8bkm23246cbf4dcb5y583xz8114a7xg0152hpfcg46q"; + rev = "927d6848a1ea9428d4cc995f76bd42f7b8da6bc8"; + sha256 = "11zaq1p04igg0hbmazsf5c0xz7aigx120rwg5iq7niaz2277j1k1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb63f7417f39bd718972f54e57360708eb48b977/recipes/skewer-less"; @@ -65262,12 +65429,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20170413.557"; + version = "20170912.445"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "95519c4ef41988205bb642e534bf2bd2463b6170"; - sha256 = "1bvmmpk4xd954i6dmxjcqayd6apzabg732yhcmjyg633d8hmmiwr"; + rev = "ac50082050df5274a5d71e182abca0d0b0fe71d1"; + sha256 = "14cknfz1nnk82svdp92sq6cdpndd5d25l7fgd5zi2l4j5i57rj0b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -65723,12 +65890,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170723.1205"; + version = "20170913.130"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "6db99046471460716fde0b450ab92b849cb23a3e"; - sha256 = "08blry9257jl301wg8hl79m78ngsnp0gq0vh5jr7cgg49a9ac45l"; + rev = "7d368051dec40e8e129d84bca5070bb7e83ad72a"; + sha256 = "1rbwjmp71wh234qrjss00xgcnh8jcha19lmz15nwrrwvpmmspg0c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -66126,8 +66293,8 @@ src = fetchFromGitHub { owner = "weijiangan"; repo = "emacs-snazzy"; - rev = "578d7ebc4ed91c0a630b652c4b6fdd54d9ae16cd"; - sha256 = "0gykymah4ap7zgjr7fkir21avcdhgy6n88nwxl1iynim3vkq441v"; + rev = "479351a34cd7f754375ee45f161f83a19d0fd29c"; + sha256 = "0lxxg6x5kb6ibwlywci9gw1bcdw2i23s07qd7k2lm86j5ixlpjgw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18c89a612418e0f49b7e6ae29a678d2fc1ffaf3d/recipes/snazzy-theme"; @@ -67405,12 +67572,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20170904.331"; + version = "20170907.305"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "d5315bfc0c46c53120c537b0aaa74189aff8bd9e"; - sha256 = "1rf94yj79ilq6300z5icqmy6iklb5jqpngccxd6wrbxm2y25y3g6"; + rev = "72a503394ee43023100a6f2624ad40a4325f5938"; + sha256 = "0ss1q3ywznkj180rndpi3zrcxz3bgm3a87wx194xyq5dzijaydw5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -68482,22 +68649,22 @@ license = lib.licenses.free; }; }) {}; - swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "20170716.2320"; + version = "20170909.430"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "98920962adaaf42698fc847fbe7d9edcd58e50e9"; - sha256 = "0npz0izw6dwiv1kmkbnf6hklmx4w2pqddzb2ijxasrrviyyyc83s"; + rev = "59dcd603848656c691f76cc5095ea354c307dbcf"; + sha256 = "127xx6qmxlh81pylrvx60d280ginms09qv24xv5g8lg08bi9zmkx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d"; name = "swift-mode"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs seq ]; meta = { homepage = "https://melpa.org/#/swift-mode"; license = lib.licenses.free; @@ -68527,12 +68694,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20170817.1000"; + version = "20170911.1036"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e9f7dcb0d26e02c2883774bae568c6eda7fe56ff"; - sha256 = "1wwngrf9fjq1dbl59lj14kihywz8gfkjz1dpy0n9i1nm7fd5w9my"; + rev = "0a1d361b926291874124f8c63a653d83ead64a36"; + sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -68861,12 +69028,12 @@ syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntactic-close"; - version = "20170903.130"; + version = "20170907.6"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "c2beff73f5054907ceaf76521493a9c8614a6c1e"; - sha256 = "0pj80dgnscn8hg5r0z86q4m45y77372dr57ly0jvbpf1g5ps730p"; + rev = "143faf5ecd6388f4ea76d668b4814415befcf883"; + sha256 = "0dwanswsyxhi7izah9qm6jzl5yvfany62f5m80r9kfkhcq68hyx9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; @@ -68965,12 +69132,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20170903.133"; + version = "20170911.625"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "995ebbe3d5e7e18fa54ee801596abd5656a81d63"; - sha256 = "04lr97m58lr5vjf35c86r99n3d0h0dknwi4dcl4w1912yvpq6ghg"; + rev = "a3d39214b70c3dde0be12a53260e3fa470530ad6"; + sha256 = "1wvf7m6j73y0aavz14f0xjmqs7hxbw0ifzxw5hdvhsw8bsvagbmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -69724,8 +69891,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326"; - sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng"; + rev = "cbbc2167cabc185c151fcfb32b2094b93b387422"; + sha256 = "02vwq91ra4yrx0davi6sri0hh7p3fbwwz8flqrk5kaxz1rwqgq20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -69745,8 +69912,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326"; - sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng"; + rev = "cbbc2167cabc185c151fcfb32b2094b93b387422"; + sha256 = "02vwq91ra4yrx0davi6sri0hh7p3fbwwz8flqrk5kaxz1rwqgq20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -70242,8 +70409,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "f454369198500a90388a4a6f73970e961949c186"; - sha256 = "1gwdnz57cv5lmmcvj2ipnvigzn1n561rnjibdg943hm26rp94zxl"; + rev = "1744cdcb674a20c554ae9f23cb95c0c8eff63b90"; + sha256 = "12zclwdqr1v2pbp0i4d5m2bgr7s20bm5yyjpakg61sx5nld2j9sg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -70300,12 +70467,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170831.2047"; + version = "20170911.521"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "f1daf10e931858ac8d6ff676cf02ca73d3c62558"; - sha256 = "1hj5mfpkfczy09ghmivkkzwmn6nawwv0ydm4ckz4mggps42hn0j1"; + rev = "af6adf6170e23a44ba773e07899ec602ae659663"; + sha256 = "0y8kfibip9saa9mh1bhgnqjzkx0yyss1z1ssxq1qvndnq8sp4rpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -70496,12 +70663,12 @@ tinkerer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "tinkerer"; - version = "20161102.531"; + version = "20170906.524"; src = fetchFromGitHub { owner = "yyr"; repo = "tinkerer.el"; - rev = "713769e5f5eb90a87d515b7ba2dca71f2f297218"; - sha256 = "1dpf6s1mv8mvcr84hzawhjgz3fjpbr8qrlcvdsw3r2c6b9pdi4hw"; + rev = "e34135555f3748b578c7f8706dfd0c888fb87581"; + sha256 = "0lzrarqh965ysd7w0z5rbisl45j11fbibyxmgivgy9parvhg59hk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a28e1dfe987287bac7c45f83ae6e754bc13e345/recipes/tinkerer"; @@ -71148,12 +71315,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20170902.1022"; + version = "20170906.1911"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "31b1d9486c30b69a1f86fc31876534dbf2e4aa89"; - sha256 = "1zzn0nmrf80n011n4byn6xd5sbglkzfzi9pah4fh5zxgbgzx8hdp"; + rev = "de23122e2c1d0c184e2439dd142ddedb0eb043b3"; + sha256 = "0wa89zppxvr6cbaxn8qjdcqvnfsgq3bdzb45rbab8hwc4p8fv76f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -71253,16 +71420,16 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20170901.659"; + version = "20170911.819"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "580cffbd6713ef1cabfe6b9253b09d8b0cdbbb48"; - sha256 = "0i1402xfk212c8x6xkw14bbwzn5j4rk5sigbyhis6zik56myf83v"; + rev = "b967e5ac38625992a19e42eb680892f4fa18e88f"; + sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs"; - sha256 = "1wcdifk6q1yjfhsndmkxx1d501zkls7nahkxavhmx6afgfslpppl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; + sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a"; name = "treemacs"; }; packageRequires = [ ace-window cl-lib dash emacs f pfuture s ]; @@ -71278,8 +71445,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "580cffbd6713ef1cabfe6b9253b09d8b0cdbbb48"; - sha256 = "0i1402xfk212c8x6xkw14bbwzn5j4rk5sigbyhis6zik56myf83v"; + rev = "b967e5ac38625992a19e42eb680892f4fa18e88f"; + sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -71299,8 +71466,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "580cffbd6713ef1cabfe6b9253b09d8b0cdbbb48"; - sha256 = "0i1402xfk212c8x6xkw14bbwzn5j4rk5sigbyhis6zik56myf83v"; + rev = "b967e5ac38625992a19e42eb680892f4fa18e88f"; + sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; @@ -71503,12 +71670,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20170903.2000"; + version = "20170912.206"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "f54f447613806f451bd1d4e57a085c30c6756000"; - sha256 = "1rv3kgj04myk79cg0nq819cb2mf67a3kfhk6kdnyh0bk8i7vmdw0"; + rev = "928ed2a5153094d772ad5a0831f4bd84e819755d"; + sha256 = "1844cqykzik3cn9wqas56h2mfh0wlxq53srdl6inx7j27mm1v7ga"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -71605,6 +71772,27 @@ license = lib.licenses.free; }; }) {}; + turkish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "turkish"; + version = "20170910.811"; + src = fetchFromGitHub { + owner = "emres"; + repo = "turkish-mode"; + rev = "9831a316c176bb21a1b91226323ea4133163e00c"; + sha256 = "0nrxi845gd24d5vymbmxz696jwld4rn6nw2dz1gzmdaks7bbv87m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/12cdbdf404fa859a48d1bb69f058321d7595d2a2/recipes/turkish"; + sha256 = "0pdapxjbpj3lg3hxvwjn9v51jqaiz7a8053z2bmk4485vzs34532"; + name = "turkish"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/turkish"; + license = lib.licenses.free; + }; + }) {}; turnip = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "turnip"; @@ -71961,12 +72149,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20170607.206"; + version = "20170905.1505"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "3f9938f24d053ad21fbbc4773fc786f78a55d522"; - sha256 = "1x1ay6qwgmj9294shi8l7xr6x7sjrpdwrxgdjynzf4wwgl2ydz4p"; + rev = "d08fe8e01db6df151b38c3001fba239a9a22369a"; + sha256 = "1a93pd7c2fgdy4vhhwy0lm7plyrwfqa9177m2x5kfblz0q51n6y8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -72151,8 +72339,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "unfill"; - rev = "d1056ec5ce7bb18abe8933c1e4d5932fb98fb78e"; - sha256 = "0qbcm7qf33xlbj7wx3164q8m6b8qzgv6w13pk8568nrmb1f8qna8"; + rev = "df0c4dee19a3874b11c7c7f04e8a2fba629fda9b"; + sha256 = "0bdlr8kqzwzi7aggcn7cwwih19585wi6dd9lvwj4i966zr4w84yx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill"; @@ -72849,12 +73037,12 @@ vc-darcs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-darcs"; - version = "20170409.623"; + version = "20170904.2020"; src = fetchFromGitHub { owner = "velkyel"; repo = "vc-darcs"; - rev = "9c5cbf6fd9b624a31e918dd1a516b24d8b7ffe9d"; - sha256 = "0g26hyjblxldqr5hhijqaclmk1p6a1kc5yh3hkflw6y7lgcrqxkx"; + rev = "390fb1ebdda1ffac45b9be02626dde3b6d95ac11"; + sha256 = "1fcqkavc7hlbhswx5nnaqhash42cjsbr72ijznx5cplr582g3mfq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/54f89c50ae45365e86bdadcf67b2411c0f4c5603/recipes/vc-darcs"; @@ -73603,12 +73791,12 @@ vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vue-html-mode"; - version = "20170831.1631"; + version = "20170904.1017"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "vue-html-mode"; - rev = "1e0aa0befd2fa958b70bdc88d9bab1a4eccf94fd"; - sha256 = "0axzdq5kss3ng9a17xr5i96x1rr4p61sil5lx783xq4zrbamh7fw"; + rev = "7358de66280435531dda4dd29dfbcef397edb628"; + sha256 = "0pqjlszacpwrkr41l27d8zlyjm25b38l94plqjy4qk4p5r2zivvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode"; @@ -74061,12 +74249,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170830.1210"; + version = "20170906.214"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "d29e48d66b7068ec933aa271320547d12cb37336"; - sha256 = "0sfy6f0rp91as42vb43m3q6553gj2n5cl2ip8wvylccilj8fzjs5"; + rev = "80e6de3b249c565506e29b2f1eca4104867f989d"; + sha256 = "127z1968znc6m1c5b819wjhiaxq6l6wkdhra5cwxfic4wzghdvbi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -74124,12 +74312,12 @@ web-search = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-search"; - version = "20170904.447"; + version = "20170911.1246"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "web-search.el"; - rev = "e0629a6a3c919ccf682e9d04dc8f4cbae8772450"; - sha256 = "09hsg58wg0k08pxnyg1icynlri7i3g81pinlsp75qw2gplfl5gnc"; + rev = "410c490ecf82a3693db3eb62003302233471ff84"; + sha256 = "0hib0ffwikdydkm5asmvzj6l49pd9694psnn2c010j3ixw6i8gsl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503ef2042cc14dbe53e7121b8d0b5ccbdf6c882b/recipes/web-search"; @@ -74527,8 +74715,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "whitespace-cleanup-mode"; - rev = "d375bfb61cb70947a93004cba8ea17a0bc76f5a9"; - sha256 = "0w6jwg1lyz0hwkhbx3kx6yddakff6azj2ipyxw26rv886gx8a226"; + rev = "6d0a35159ee04ef9f3b1a80c548f545643ddb397"; + sha256 = "0pqvrhws49aqyfp25kcrk9q7ib0ckx9gi6avzmymnpxy9aicnb3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b461cfe450d7ce6bd0c14be3460cacffc1a32e6f/recipes/whitespace-cleanup-mode"; @@ -74976,6 +75164,27 @@ license = lib.licenses.free; }; }) {}; + winnow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "winnow"; + version = "20170903.506"; + src = fetchFromGitHub { + owner = "dgtized"; + repo = "winnow.el"; + rev = "cbc06fb51883212a5169d33a689d14cd7b0a7c34"; + sha256 = "1hprii3da7y758ihlv308hg9sbcn42jn2f6g4dzb30ql5g2vxcnr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/58891c2057ec834f999e3bf82af15e0617a4d4cf/recipes/winnow"; + sha256 = "07kwjdmvzgvg7gc53dv10jfi212m0pimzrhiga38lrqrnrw631m0"; + name = "winnow"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/winnow"; + license = lib.licenses.free; + }; + }) {}; winpoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "winpoint"; @@ -75587,12 +75796,12 @@ x509-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x509-mode"; - version = "20170903.507"; + version = "20170909.632"; src = fetchFromGitHub { owner = "jobbflykt"; repo = "x509-mode"; - rev = "df6710c1e7ac38047a6e05f8e33c34ee9c263e6d"; - sha256 = "07blm2qvgb4kmwxkj47kv7lx0kkl4q6ylaxz8hkwx70lwd1jpj7l"; + rev = "a34584f310f3d8afe57dc1950db52b2d079242b8"; + sha256 = "07z0iyz7zgypqjv6izpdccllwrp7jgc86279rk0blf0vazj2927h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode"; @@ -75692,12 +75901,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170901.805"; + version = "20170905.840"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "77e82020cc0b667ccc7ab2e17452922f4774aa75"; - sha256 = "1yi9r6qs6xhl7akmbvpk6mbaxssmwwyv65kmpbnwcc50z4pwwjc4"; + rev = "0d0b3b96401af0d1e4ddea2713218bee08ab6a04"; + sha256 = "09iyf2xrp3scxr67jm3gl067kb8vsrnrqdwz2sv6la41n04s9lm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -75755,12 +75964,12 @@ xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-math-input"; - version = "20170821.406"; + version = "20170905.849"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "6cdde9e4721fd6d026872ca3e59c212a34913486"; - sha256 = "0qn2dv14cw8yq14wgbfcf474bvdlfacb3m6i1rfwwqzsmcarlbnm"; + rev = "fcdfbed46ff81c8da84422611e0009c6b267e359"; + sha256 = "01s4fhnp4zqh2cmqbp2sh1sbdcyq4i5hy1r8manqa26m041xk2z0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input"; @@ -76347,8 +76556,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "5c67557f1a5e51b67f68ebbb0eeb6ed3fdd4a82a"; - sha256 = "122ynx66v2zymh8s70ly0rwpn394d1x7farqrzh5ziw0kcwgsmxl"; + rev = "09b18f248c957f74d219a6d1127923e9c786d650"; + sha256 = "05hg6andy8wxrsxf939g77v6ml4rac239vkkfk0fh6723wgiz144"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -76656,12 +76865,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20170903.857"; + version = "20170908.435"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "a0bd5a05a749996e52f967b7f62cfe54cb212c7e"; - sha256 = "0nk6kdzms36f22lddnrn2nq1lc8dsgjcy1jaypl64xiw08kigi17"; + rev = "5c3bb7ad8f659cb6651cc9c90709528672dd2ad0"; + sha256 = "1nbkgmqgrih99jgpzvmy0h8vdjgkrml9ck9wi19vw80d62b8m9p8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -76681,8 +76890,8 @@ src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "3854836489ce06bb65cf9aecbdc06aa5fc6801c5"; - sha256 = "051wwf802f00xk5gq5js1l0dd1ax0ls2jvlybz7xfy58dl8fbijx"; + rev = "07da11de32feb6cbce0f8c140c0304e3ba1b42c0"; + sha256 = "10af3pa8rh3rs0vpm436vm5wlwvqkfa3zpqyhdf2i3q4gaqfb902"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -77000,12 +77209,12 @@ zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "zephir-mode"; - version = "20170904.145"; + version = "20170906.320"; src = fetchFromGitHub { owner = "sergeyklay"; repo = "zephir-mode"; - rev = "bebbbfbe6ea5e7180fa71932cbfa00acdec966ff"; - sha256 = "1a4sj302ycliqiwrphkzvzl1jixj3xinkclds44v9m8wkrgr8f88"; + rev = "6b54967c76244ba18040deffd52c03caa8fff49d"; + sha256 = "0a48p08m1kdz1wxmwdcvv8lbph0by3lmxz4ccr6jrfsw3gxnixff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 9e72f4b734211..0eeeb5f97fda0 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -2023,22 +2023,22 @@ license = lib.licenses.free; }; }) {}; - auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: + auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "emacscollective"; repo = "auto-compile"; - rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c"; - sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7"; + rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a"; + sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf"; name = "auto-compile"; }; - packageRequires = [ dash emacs packed ]; + packageRequires = [ emacs packed ]; meta = { homepage = "https://melpa.org/#/auto-compile"; license = lib.licenses.free; @@ -2809,12 +2809,12 @@ bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bifocal"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "riscy"; repo = "bifocal-mode"; - rev = "19b54d1de8938448c88afd495d749fc7b6f6d281"; - sha256 = "0mym4wqhfh58sr82z0w1z7kvj2p6s54b3j9davwpkj850j378x52"; + rev = "5e89ad1a9a47e890ce080a79fd32c71eb128d1c4"; + sha256 = "1rwxw1wniws31gbmpxgglxbc2g4jag19dvsjrym0f43yy4w2mbpw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal"; @@ -3124,12 +3124,12 @@ bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bshell"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "plandes"; repo = "bshell"; - rev = "b25907d531d18000f68534d2a97cf4c2ffa38e68"; - sha256 = "04j4gkiqbfmgqs18hwsbwdb3xrzk5laqpdxx6vsj5g3pc9k6d1cv"; + rev = "884a8b906617d305e9d5d2c3750618d2f86f9aed"; + sha256 = "16qh71yhpxs5cxjmkiqiia8xrxa0ym2n32znp4yc7xiv2xfw2ss4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell"; @@ -3226,6 +3226,27 @@ license = lib.licenses.free; }; }) {}; + 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"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8681776d467951d14d8247e6939bd9a6f2a80ec/recipes/buffer-watcher"; + sha256 = "0v096021xk7k821bxb5zddw6sljqa6fs8f7s8j0w3pv6lmhra1ln"; + name = "buffer-watcher"; + }; + packageRequires = [ f ]; + meta = { + homepage = "https://melpa.org/#/buffer-watcher"; + license = lib.licenses.free; + }; + }) {}; bufshow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bufshow"; @@ -4088,12 +4109,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "e503f5628ef98bd768f08c698863e8e33a7af3b4"; - sha256 = "1bb0l06af7k7zzsig8kmn71krbm9mwdj7dc0s17rbhnm84cdfc8b"; + rev = "8a9eab32646abcaaf31fe83b2d897c01971b98f1"; + sha256 = "0ddkm87l9ann05a6j57r0x59qqgfavwrvlzhkc5xhak1nmk5556h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -4562,12 +4583,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "fca4423786ba2c4a5ab0ec6c1a1cbac8cd8600b4"; - sha256 = "08x5mqhrsm3y28hiy32h336n9ggn2snb56k242hqhij1lsg7iga3"; + rev = "ffa164736ec78f27583ca4515ff3dfc7a82fc702"; + sha256 = "09m6hwlzdrd884h8wcq8pfac098smk1xqjpqm3003bqs4aynm49p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5042,22 +5063,22 @@ license = lib.licenses.free; }; }) {}; - company-go = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild }: + company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "company-go"; - version = "20150303"; + version = "20170907"; src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "eef10fdde96a12528a6da32f51bf638b2863a3b1"; - sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3"; + rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1"; + sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29"; name = "company-go"; }; - packageRequires = [ company ]; + packageRequires = [ company go-mode ]; meta = { homepage = "https://melpa.org/#/company-go"; license = lib.licenses.free; @@ -5066,12 +5087,12 @@ company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "company-irony"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "company-irony"; - rev = "cebd82506c59d21a9c436bd8e8a33dfa8be84955"; - sha256 = "09mzxyvp07qwdhxagyiggpccxsklkbhjg730q6wbqd13g1mlkryj"; + rev = "52aca45bcd0f2cb0648fcafa2bbb4f8ad4b2fee7"; + sha256 = "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony"; @@ -5573,6 +5594,27 @@ license = lib.licenses.free; }; }) {}; + contextual-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "contextual-menubar"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "aaronjensen"; + repo = "contextual-menubar"; + rev = "cc2e7c952b59401188b81d84be81dead9d0da3db"; + sha256 = "01mk5xzsg52vfqjri1my193y6jczg2dp3pa2d0v0vw11m1k433h3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cba21d98f3abbf1f45d1fdd9164d4660b7d3e368/recipes/contextual-menubar"; + sha256 = "0r9bsnvf45h7gsdfhsz7h02nskjvflfa2yjarjv9fcl7aipz8rr6"; + name = "contextual-menubar"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/contextual-menubar"; + license = lib.licenses.free; + }; + }) {}; copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; @@ -6248,12 +6290,12 @@ darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darcula-theme"; - version = "1.1"; + version = "1.2"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-darcula-theme"; - rev = "834202004507221c3bdf49457219a56760b13d22"; - sha256 = "1j2g94cz9b3ivv0w88gw1hcf236kc0c7hnrf13yyspxjm5jfdmd5"; + rev = "da9852867ac115a54ee350a750d4dae182706117"; + sha256 = "03059ydiw73a7kdvgn3namfqz87pqm2xfrnf87irkiv5pl9h482s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme"; @@ -7305,12 +7347,12 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "0.3.3"; + version = "0.3.5"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "a002d5f9fb2cb1b0cac2cf512a672b69e7fd6d14"; - sha256 = "0k7igf738wsgxiglafhby8rlqdhsm3vsgpq39frmrzgvrfs69lxs"; + rev = "372df2f0de34a4bd44d4a7274b9ab85117ac7392"; + sha256 = "14vgjhy2j60xhf38zm5nlkr4d3r455kw6paw0wff4mqmdjcg3pds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; @@ -8999,12 +9041,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d"; - sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq"; + rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5"; + sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -10063,12 +10105,12 @@ eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-git-prompt"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-git-prompt"; - rev = "fb56e851c1baac68249c34043bd5db9c9420141e"; - sha256 = "08mhjps17w3kfmmbdws1lqzphr2ayl160i0ckd4552jdyzd28vvs"; + rev = "b6bb2d7bd4e393b4170b29891cfefb72ae020aab"; + sha256 = "02i00an9wa8ns66xq900la68m7pd4hwv95g83cvf22bypivx7p2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt"; @@ -10693,12 +10735,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "dac58399e8b1144d74d92d0a70a2d11187d1e797"; - sha256 = "0sgm4kdjgik9snnjsycr34v17jxk8gpi8ygpddpf0zqp1v3hvjgc"; + rev = "92bee71aa6fbb36299a4e69e710da786f3694637"; + sha256 = "1sxwiar17jvqj7plf7jdpwx9kymabr0dsfl7mbkcxpzvrfdlmp12"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -11259,12 +11301,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "0.4.1"; + version = "0.4.4"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "df2ae56e1ee5cc41c335ca6fd7ead3b99b3c5edd"; - sha256 = "0nsch4zzqd64rq0y75knfp95nn5nq2hvvgcjhq0i075g2vwhf73w"; + rev = "63395a2367d1d48983a9363d2d0bf518177297bd"; + sha256 = "15vgv0z4vzdnc3vb98j2hy4bv5x83f4c1dzgx49r61vka7p5is0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -11427,12 +11469,12 @@ faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faust-mode"; - version = "0.1"; + version = "0.3"; src = fetchFromGitHub { owner = "magnetophon"; repo = "emacs-faust-mode"; - rev = "41379dd52a8be01cdfac06996ea1593877fdaf58"; - sha256 = "0q624nm9wfyg95wybi542bx8pdpqk9vibyb6b9fin4mw102nah9j"; + rev = "5e7390479d6f4c12186b39fd5c642050e1c62e40"; + sha256 = "1g3xzzcnswh03plmrhcn6ib68kcx5b37af3lqfbfa6s0rwwldxap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode"; @@ -11445,6 +11487,26 @@ license = lib.licenses.free; }; }) {}; + faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "faustine"; + version = "0.3"; + src = fetchgit { + url = "https://bitbucket.org/yassinphilip/faustine"; + rev = "43cf31284eabf0d831f8185a5ed217e56fdc2023"; + sha256 = "1v78raszh8scac5m04g10rrc9cdflhgmkpbbqpf28zxk3dxcjpxm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b298e399335efbbdbc6e9bb06ab915fc07909faa/recipes/faustine"; + sha256 = "0pkjxfzgdhkjjx38d1c2kw8m5cw5ryhfj7lykpym79wsa471hf9s"; + name = "faustine"; + }; + packageRequires = [ emacs faust-mode ]; + meta = { + homepage = "https://melpa.org/#/faustine"; + license = lib.licenses.free; + }; + }) {}; fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; @@ -11490,12 +11552,12 @@ fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fill-column-indicator"; - version = "1.88"; + version = "1.89"; src = fetchFromGitHub { owner = "alpaker"; repo = "Fill-Column-Indicator"; - rev = "0c6f8f692854712a0c86d57c331b1bd9e6269b4d"; - sha256 = "0l64r4id13lzrmnidq20hzjx0yip16lj47k3ajk01ycgqs4jpmzs"; + rev = "23ad25f2c2fddd32a1ea12a9e0f631e243e6a779"; + sha256 = "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator"; @@ -11553,12 +11615,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.4.1"; + version = "5.4.3"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "cb61762e50e85894febbbc82eeafa85d67707218"; - sha256 = "0zzjr7z2iayibqvl8rrbpmdbar6i8b6zda65az8ybrwzbsz8zhnb"; + rev = "dcc0801c4781d76efd9ac0d86bab4084b4b93663"; + sha256 = "0axk4a4b3s0x8wn4a4mj1i89kix88cv94iclhw4wigsscndpr03v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -14067,12 +14129,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "2.10.3"; + version = "2.11.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e"; - sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc"; + rev = "4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5"; + sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -14319,12 +14381,12 @@ gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitattributes-mode"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79"; - sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr"; + rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; + sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; @@ -14361,12 +14423,12 @@ gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitconfig-mode"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79"; - sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr"; + rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; + sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; @@ -14487,12 +14549,12 @@ gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitignore-mode"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79"; - sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr"; + rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; + sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; @@ -14781,12 +14843,12 @@ go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-autocomplete"; - version = "20150303"; + version = "20170907"; src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "eef10fdde96a12528a6da32f51bf638b2863a3b1"; - sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3"; + rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1"; + sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -18419,22 +18481,22 @@ license = lib.licenses.free; }; }) {}; - hy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "e5a4e5f64d14ca9eed06414fcdbad630c7c55ad5"; - sha256 = "1a2b1knlyw9yklybdik30qaskbjxsi1p9fdsmdmk4frgq4xkzs3c"; + rev = "267a3b163136d207d8d9ecd0d2aa14dc30fd0690"; + sha256 = "11n60zzhad68vff7fqzkvbj04i3xc3xp9yc2v26v8y6zpqizhib0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m"; name = "hy-mode"; }; - packageRequires = []; + packageRequires = [ dash dash-functional emacs s ]; meta = { homepage = "https://melpa.org/#/hy-mode"; license = lib.licenses.free; @@ -19262,12 +19324,12 @@ inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inflections"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; - rev = "fb3dd59f21f77016742de40028aee92176c0917a"; - sha256 = "1alncmx4q2szvlzg57332zmqm6rsgzf12kfg9l1vb5s9vgd1ki5p"; + rev = "40a7ffdf734ffe7d1968909663146255d7ba69c8"; + sha256 = "1ig1wdjg914p9ng1nir2fid4mb3xz2dbpmkdnfy1klq2zp0xw2s3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections"; @@ -19471,12 +19533,12 @@ intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "intellij-theme"; - version = "1.1"; + version = "1.2"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-intellij-theme"; - rev = "ad207c8c3d266d566fb1e4862df154096c059171"; - sha256 = "06slahp36mj39ri4v4k7sv3mly6cgk76m4zpc1why3h6dmd7hhyr"; + rev = "2bbabe3f2f87716b10ccdfcacbf51016ecc32d54"; + sha256 = "0b3615lbm8fv4svv3g72dz62h9rv18m68b656lwl2ba9sn465rsl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme"; @@ -19513,12 +19575,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "0.1.21"; + version = "0.1.23"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "4c8f3e7f4ad03179425c722d5072beae254da73b"; - sha256 = "0q377rpgszqixjbmwck6kcczfb3j8axx0pk6fqavzp8qyc3q121l"; + rev = "3865aad923559bee140eaede20c3510890979930"; + sha256 = "1q6q2hnqf78kxd61nic4zjx7crbv8p25p4aq0h4vihamm8r0v7vm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -19597,12 +19659,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "2424f57a3c0d320946c7ad32b44d296a91104201"; - sha256 = "13lg7ra4g3nbg96vbwk1giw2pjhqarpd72qi21x57w3lc44fwqld"; + rev = "72e1e73f3c9da2ad04286e13bfc8fc401626b7a9"; + sha256 = "155wvzsmhb8vz30jcd3xj91z74268pq7szax7jwd725ndx6x7ny8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -20411,22 +20473,22 @@ license = lib.licenses.free; }; }) {}; - jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }: + jump = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }: melpaBuild { pname = "jump"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; - rev = "fb3dd59f21f77016742de40028aee92176c0917a"; - sha256 = "1alncmx4q2szvlzg57332zmqm6rsgzf12kfg9l1vb5s9vgd1ki5p"; + rev = "40a7ffdf734ffe7d1968909663146255d7ba69c8"; + sha256 = "1ig1wdjg914p9ng1nir2fid4mb3xz2dbpmkdnfy1klq2zp0xw2s3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump"; sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364"; name = "jump"; }; - packageRequires = [ findr inflections ]; + packageRequires = [ cl-lib findr inflections ]; meta = { homepage = "https://melpa.org/#/jump"; license = lib.licenses.free; @@ -21911,12 +21973,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "2.10.3"; + version = "2.11.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e"; - sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc"; + rev = "4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5"; + sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -22086,12 +22148,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "2.10.3"; + version = "2.11.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e"; - sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc"; + rev = "4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5"; + sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -22107,12 +22169,12 @@ magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-rockstar"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "tarsius"; repo = "magit-rockstar"; - rev = "bccce1ac8e012f52e29470c1c7d815f9bb1a192b"; - sha256 = "0z411x2w6ldy3b8qbavfvfgvkbjd1rl0m1plr44ynp55awrhj0k2"; + rev = "a65042e3445008b55190f1258ae54bd78e12174b"; + sha256 = "1wbbg9jr9kl69sbq9b9dgwvnplmdzjyanwfcncamw3lfcjfnw1bn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar"; @@ -23457,12 +23519,12 @@ move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "move-text"; - version = "2.0.5"; + version = "2.0.8"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "move-text"; - rev = "58f66f9b62af776a6c3ebe1151b038b59b2c12d4"; - sha256 = "03rkqv8l98ximfw33972y2lsqzjvbdv9kvz38i9p8iva56cmkbki"; + rev = "bdaf3e3a0d33cd528cad1d10facbdf0635232e4d"; + sha256 = "06jxk5g23822gfmwrxhc34zand3dr8p2wjh1zs3j61ibz6n0nmz1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text"; @@ -24192,12 +24254,12 @@ ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ninja-mode"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "0c671527322d15016bb9ff5c3cf436f68e6ddbde"; - sha256 = "0gy85bzvg50s1pd5vpwidbc4pqzbyxw011g575wv6fib3r7inhw5"; + rev = "253e94c1fa511704baeb61cf69995bbf09ba435e"; + sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -24276,12 +24338,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.9"; + version = "0.5.10"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; - sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; + rev = "227c2d175e95dbed6a5c6e37b12bb9a3fcf2de94"; + sha256 = "1wgfcghzhsa0siz1vf3rq69h1ilyblj5rsmijnyymp9fhxgyyll6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -24378,11 +24440,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.25"; + version = "0.25.1"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "9f648dfbb8e253dab1bc4a0e761ad46cec405f4d"; - sha256 = "17b2rwvfq5zqm4cw8zqqzns8jjld3bpb25ca4133ckgkwach4v1d"; + rev = "949c27144e0b9294267511993a109c29d319a23d"; + sha256 = "088f6f5696v8zrgbipshns6gla4zmfpj8n4jm66slgip9fcrbpvb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -24416,6 +24478,27 @@ license = lib.licenses.free; }; }) {}; + nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nov"; + version = "0.1.7"; + src = fetchFromGitHub { + owner = "wasamasa"; + repo = "nov.el"; + rev = "91c4329f64ddc9a598fa6c58e1d9264aee073e72"; + sha256 = "0x3ijjhjg2q8gdqf4hgr2d8wy32qhxy48kbz0slibkn9yik3pvlz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; + sha256 = "0hlcncpdazi4rn5yxd0zq85v7gpjhw7a6dl2i99zf4ymsan97lhq"; + name = "nov"; + }; + packageRequires = [ dash emacs esxml ]; + meta = { + homepage = "https://melpa.org/#/nov"; + license = lib.licenses.free; + }; + }) {}; noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "noxml-fold"; @@ -25011,8 +25094,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "8aa56979fe85211b1e12c42e91b68a4ebee5176e"; - sha256 = "15bsmi5cm208iq8rw87gvkkqja2shldbc4287x1qxny3cplcvwqi"; + rev = "b425270bed93b427ff519d6f51ad1d97531a0a92"; + sha256 = "0l9dk9idfsr21q0icx9fpgqyi4qlhnqal6sypak5zh8dgchrqif9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -25351,6 +25434,27 @@ license = lib.licenses.free; }; }) {}; + org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: + melpaBuild { + pname = "org-clock-csv"; + version = "1.1"; + src = fetchFromGitHub { + owner = "atheriel"; + repo = "org-clock-csv"; + rev = "20ab6ee4395bedc0a7b8dfaf7b51f2c63dc8d2c6"; + sha256 = "00lcvmls7zlkqmsi0yfiihyxv49803jlc9khcbqawxlkijvr65pm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; + sha256 = "02spjrzdf1kmvyvqkzg7nnmq9kqv75zwxn5ifqmg0f7a1gw28f0l"; + name = "org-clock-csv"; + }; + packageRequires = [ org s ]; + meta = { + homepage = "https://melpa.org/#/org-clock-csv"; + license = lib.licenses.free; + }; + }) {}; org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-commentary"; @@ -26287,12 +26391,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "c91e662ace7e3ce992269cbf755f378bc6742511"; - sha256 = "0x7d8wjfg61gzi6ghq4cfkizzjcpiz56j797h6kmbri73yb7xf16"; + rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663"; + sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -26620,6 +26724,27 @@ license = lib.licenses.free; }; }) {}; + ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "ox-hugo"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "kaushalmodi"; + repo = "ox-hugo"; + rev = "a486141e4e2c3f9f67e799e20af150611d77f850"; + sha256 = "1srrkc0bajmhp614avk4yr51zsp0gnmn47r1wi7qxkr6ybxwx8k1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; + sha256 = "1niarxj2y4a14lrv2nqcc36msw7k61h8fbjpcdrfbaw3n0kchd40"; + name = "ox-hugo"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/ox-hugo"; + license = lib.licenses.free; + }; + }) {}; ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-ioslide"; @@ -26707,12 +26832,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "d70db33776cd52586e05e932915653ec54f41c9c"; - sha256 = "1hfbmh4gzgxdmv421bnpj8486fja7015sj7jrnp8bhvcxxxc3azd"; + rev = "940c991ccd0dab53bd7c120601b3db35669c5e73"; + sha256 = "18yr4qq3jyf9zhlwqrbfq616svsgn5spnj0s4gsni7kb2ijjh2bp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -26809,22 +26934,22 @@ license = lib.licenses.free; }; }) {}; - packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "emacscollective"; repo = "packed"; - rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1"; - sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi"; + rev = "94ea12b9d44bfa42c28d0548199f2fcd19e4aa6a"; + sha256 = "1n80y5pqaibix71fnw3cxmq66frmqfji2b2y170jszmrxi03kwxm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed"; sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd"; name = "packed"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/packed"; license = lib.licenses.free; @@ -27205,6 +27330,27 @@ license = lib.licenses.free; }; }) {}; + password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }: + melpaBuild { + pname = "password-store-otp"; + version = "0.1.3"; + src = fetchFromGitHub { + owner = "volrath"; + repo = "password-store-otp.el"; + rev = "2965da7d8edd32bd4ef62f487ea6bcd08c599c89"; + sha256 = "1svm6rlh4f0rjcl0fjy3x4bfakdn9npi8w7ak217ad2k08j44bzd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp"; + sha256 = "0m3n4gjf6hmcs2kg80h1whzbl74zsj79ihliyqfcdfc4v31m32sg"; + name = "password-store-otp"; + }; + packageRequires = [ emacs password-store s ]; + meta = { + homepage = "https://melpa.org/#/password-store-otp"; + license = lib.licenses.free; + }; + }) {}; pastehub = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pastehub"; @@ -27397,12 +27543,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "0.70"; + version = "0.80"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "0107f80dcf268d08ac075b01729820062c0fbd67"; - sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl"; + rev = "920e598c1ec6eb9a48dde32282d10adc9cc3b011"; + sha256 = "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -27518,6 +27664,27 @@ license = lib.licenses.free; }; }) {}; + persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }: + melpaBuild { + pname = "persp-fr"; + version = "0.0.3"; + src = fetchFromGitHub { + owner = "rocher"; + repo = "persp-fr"; + rev = "4d2d1a75019f520742da79f1aeed9c4a960677e0"; + sha256 = "1waakbmxwm0xdnl0iznyk61ccwdjvwv5g1naml31r7q0cnk0jfz8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr"; + sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2"; + name = "persp-fr"; + }; + packageRequires = [ emacs persp-mode ]; + meta = { + homepage = "https://melpa.org/#/persp-fr"; + license = lib.licenses.free; + }; + }) {}; persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; @@ -28631,12 +28798,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "19e3dc1236377de86147df8f3635fbbfe7558b2e"; - sha256 = "0n61npfg7hvybakn4nvsqyv2gmrwvf0jqwrh0nwzg9xg5hkbfmir"; + rev = "31c9f90d472e07cb8e49fa8992b187b67c9c9a71"; + sha256 = "0j38zbprkga3iq5wb77zvfa5r3sj3sqv8qh0ab62wm68qy60d6g3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -28901,22 +29068,22 @@ license = lib.licenses.free; }; }) {}; - pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "bff32a818ccc9e400210b942bd5e67fa21551148"; - sha256 = "1ad5n8v40acj17qficbzrnixbmg5wplmbd8h1z9hdxhbrkwy5323"; + rev = "2f22d9c2e3ebb0230cee8836c5f5186e05a038dd"; + sha256 = "1fvq1vx7sg3dqc9zcqbsp0iq1y7c2cjag0ng3snssyj0qh8q6ib1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85"; name = "pug-mode"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/pug-mode"; license = lib.licenses.free; @@ -30098,6 +30265,27 @@ license = lib.licenses.free; }; }) {}; + replace-with-inflections = callPackage ({ fetchFromGitHub, fetchurl, inflections, lib, melpaBuild, string-inflection }: + melpaBuild { + pname = "replace-with-inflections"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "knu"; + repo = "replace-with-inflections.el"; + rev = "e0486653abf7c248024800132df23993cd617892"; + sha256 = "1fygsr3vjpy0crxlyawwk6k21h1w3svgk79rm7fqg5xzilg6kf25"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7892eb506b8f4260bde4be2805bf3b2d594ab640/recipes/replace-with-inflections"; + sha256 = "1pqpin5ipm3g74zjh1kh6s1gh0aan6202p0y2q00d4ywbz9kn5s0"; + name = "replace-with-inflections"; + }; + packageRequires = [ inflections string-inflection ]; + meta = { + homepage = "https://melpa.org/#/replace-with-inflections"; + license = lib.licenses.free; + }; + }) {}; repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "repo"; @@ -31251,27 +31439,6 @@ license = lib.licenses.free; }; }) {}; - sentence-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "sentence-highlight"; - version = "0.1"; - src = fetchFromGitHub { - owner = "sbelak"; - repo = "sentence-highlight"; - rev = "6f2bc989207ec8cf641e44924ef530a2e436eedb"; - sha256 = "0740swhm3kzjx58a6nr9992p05q4kzvyham8g7kds4ydd7xsd9am"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sentence-highlight"; - sha256 = "07pyyl74cvnz6dd85ghv3zdrir08317lvnzm5nf1n3p85aqjpcxm"; - name = "sentence-highlight"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/sentence-highlight"; - license = lib.licenses.free; - }; - }) {}; servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }: melpaBuild { pname = "servant"; @@ -33542,12 +33709,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "98920962adaaf42698fc847fbe7d9edcd58e50e9"; - sha256 = "0npz0izw6dwiv1kmkbnf6hklmx4w2pqddzb2ijxasrrviyyyc83s"; + rev = "50394e4ffa80cb395ddd3c3128f995644820e2bc"; + sha256 = "1dwrfbdfgndvv2rv4vl4vr82lzbkvk46z5fxbngd66yrx21rav24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -34695,16 +34862,16 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "c0e9b9407d9b752319ca5be4a6a0f8b06740ecda"; - sha256 = "1993f06j1y5ch3v6gq3pp85r3bpv6cbnn19552jyl83lq0x5gi7c"; + rev = "19723297eefdc9d3afef546f1839c88acfbeef9c"; + sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs"; - sha256 = "1wcdifk6q1yjfhsndmkxx1d501zkls7nahkxavhmx6afgfslpppl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; + sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a"; name = "treemacs"; }; packageRequires = [ ace-window cl-lib dash emacs f pfuture s ]; @@ -34716,12 +34883,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "c0e9b9407d9b752319ca5be4a6a0f8b06740ecda"; - sha256 = "1993f06j1y5ch3v6gq3pp85r3bpv6cbnn19552jyl83lq0x5gi7c"; + rev = "19723297eefdc9d3afef546f1839c88acfbeef9c"; + sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -34734,6 +34901,27 @@ license = lib.licenses.free; }; }) {}; + treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: + melpaBuild { + pname = "treemacs-projectile"; + version = "1.10"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "19723297eefdc9d3afef546f1839c88acfbeef9c"; + sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; + sha256 = "0y7mq466c9cigyd6imzjnh54aq9kcsikhr7llga5gsclf35fc5ld"; + name = "treemacs-projectile"; + }; + packageRequires = [ projectile treemacs ]; + meta = { + homepage = "https://melpa.org/#/treemacs-projectile"; + license = lib.licenses.free; + }; + }) {}; trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "trr"; @@ -36042,22 +36230,22 @@ license = lib.licenses.free; }; }) {}; - web-search = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + web-search = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-search"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "web-search.el"; - rev = "3cb8610ced6b5a2eb2ef3f7cf3dcf90289ded3ff"; - sha256 = "05s12gx2yvr0djxck134bj6d0ws0s7izhjk6272zd7b8aknc8ml9"; + rev = "72fea0e7429ed3d6932a497b568335316d8ef283"; + sha256 = "1f2g6r24482k1dra1z92yahwvqiryc8p5p1v2naxv16ysa461a34"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503ef2042cc14dbe53e7121b8d0b5ccbdf6c882b/recipes/web-search"; sha256 = "08iflbp6rmsxsy2lahsdjj9ki70ixqhsas0vxzawz5pi5vk2x9gj"; name = "web-search"; }; - packageRequires = [ emacs seq ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/web-search"; license = lib.licenses.free; @@ -36587,22 +36775,22 @@ license = lib.licenses.free; }; }) {}; - with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.5.11"; + version = "2.6.0"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "3385ffdc6faed5a283e26a7ebf89825c700dd395"; - sha256 = "1kznr0zv1y6lwsllpksqjzq2f4bc5a99lg19fmifn7w0dhv6fn0m"; + rev = "241726118dee067a8d9880d53c6a781d580ba8a1"; + sha256 = "0q06qfir64nib604f23gdmbzl23mcsnysfd0x36cx9nwik95wl0x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb"; name = "with-editor"; }; - packageRequires = [ async dash emacs ]; + packageRequires = [ async emacs ]; meta = { homepage = "https://melpa.org/#/with-editor"; license = lib.licenses.free; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 58b59b5c4caaf..a1cb0b7d4edc2 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170904"; + version = "20170911"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20170904.tar"; - sha256 = "1d0w3mmxdsfiwvpbc2ip21jxqlag0gk05214h86w52y9ymj0jbll"; + url = "http://orgmode.org/elpa/org-20170911.tar"; + sha256 = "16d69g1qnfcj7d2q9ni5dz5wh9pid9mzhwyfg4z93s9xizzlnw64"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20170904"; + version = "20170911"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20170904.tar"; - sha256 = "1iz0xk5s5d6gpfxb3k2fz3xbrn5rhxnvkq69c5dbrfdk67rm7q4k"; + url = "http://orgmode.org/elpa/org-plus-contrib-20170911.tar"; + sha256 = "0bgrsccar4v9viq99w2h4rjavql14zgdwkwaa1bprga3af78jr82"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index c295313621e37..1ec24325460ae 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert gksuSupport -> gksu != null; let - build = "3126"; + build = "3143"; libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; @@ -20,13 +20,13 @@ in let fetchurl { name = "sublimetext-${build}.tar.bz2"; url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "0acff4wj1s61x3xszdd93lkhaqa26lb7ryqdxnbphxzhf2jfzzwj"; + sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i"; } else fetchurl { name = "sublimetext-${build}.tar.bz2"; url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "0ykj33fq86iv7f9zx76h90pl9y86iri0idhlj09a6prhk8p17nqq"; + sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; }; dontStrip = true; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 321e12877ebc6..a0955dceceddb 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { - version = "3.0"; # When updating to 3.1, make sure to remove the marked line in preCheck + version = "3.3.1"; name = "buku-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1a33x3197vi5s8rq5fvhy021jdlsc8ww8zc4kysss6r9mvdlk7ax"; + sha256 = "1byq8jgv1rb67ygibk0vzgz5ri1il4q4hpg23z5q0ml27fif9hw3"; }; nativeBuildInputs = [ @@ -16,6 +16,8 @@ with python3.pkgs; buildPythonApplication rec { pytest-catchlog hypothesis pytest + pylint + flake8 ]; propagatedBuildInputs = [ @@ -29,11 +31,6 @@ with python3.pkgs; buildPythonApplication rec { # Fixes two tests for wrong encoding export PYTHONIOENCODING=utf-8 - ### Remove this for 3.1 ### - # See https://github.com/jarun/Buku/pull/167 (merged) - substituteInPlace setup.py \ - --replace "hypothesis==3.7.0" "hypothesis>=3.7.0" - # Disables a test which requires internet substituteInPlace tests/test_bukuDb.py \ --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index fefa45760d5c4..0123e0c38d74a 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -1,17 +1,15 @@ -{ stdenv, cmake, fetchurl, ncurses }: +{ stdenv, cmake, fetchurl, ncurses, readline }: -let - version = "1.2"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ctodo-${version}"; + version = "1.3"; src = fetchurl { url = "https://github.com/Acolarh/ctodo/archive/v${version}.tar.gz"; - sha256 = "0kjd84q8aw238z09yz9n1p732fh08vijaf8bk1xqlx544cgyfcjm"; + sha256 = "1k3raigcgpwa0h8zkv5x9rycnn2iqkb9qim4q9ydqy9wbv3m32jb"; }; - buildInputs = [ stdenv cmake ncurses ]; + buildInputs = [ stdenv cmake ncurses readline ]; configurePhase = '' cmake -DCMAKE_INSTALL_PREFIX=$out . diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 872bfc72bd814..c69bb5bea3bd3 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.27"; + version = "0.27.1"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1r64pwk5g50gwriawmsgza6j8m4jymg8mwgwh1rplpsdfxqdfrbx"; + sha256 = "0vxzjwm9dsan314cz0gnj4spssg4w8y6ywsak8n9c6w0l45xf07p"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index 5206feb215c98..f627a3cda22f6 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.0.9"; + version = "1.0.10"; name = "mdp-${version}"; src = fetchFromGitHub { owner = "visit1985"; repo = "mdp"; rev = version; - sha256 = "183flp52zfady4f8f3vgapr5f5k6cvanmj2hw293v6pw71qnafmd"; + sha256 = "1swp1hqryai84c8dpzsvjpgg5rz2vnn2vrp0dhwy8r0qgpmby2nn"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index fbf9a9335675a..7e16da68f471c 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -2,16 +2,19 @@ with pythonPackages; buildPythonApplication rec { - version = "1.15.1"; + version = "1.18.0"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "037dhds1prxj7vsq15dr46wk3pfk3ixr0d60m3h796b6nbc1spya"; + sha256 = "00d2s29sp68hw8ljjmzn5dc5ly2s3c7qf0azwizgd3b40zlfgzcg"; }; + # Tests try to access network + doCheck = false; + checkPhase = '' py.test ''; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 0342722c7f7ca..d1b1daa26d6fd 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "0.13.0"; + version = "0.15.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "${version}"; - sha256 = "0gbsq43qv5qg4avx7czs57k40m8lzh8f1z5yizqqc7r02p2sacnc"; + sha256 = "08k913gw0ip2q686z9k63bcn1n5s4w6b7jj6jmmamm427xmibkph"; }; checkInputs = with pythonPackages; [ pytest ]; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index c20ce2cca306c..2bc8186953068 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "26.0.0.151"; + version = "27.0.0.130"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0l15k2ws3256zyvbfx66j8p1liqv4k2m8hhw2jz8nzza7q6il35p"; + sha256 = "005sxx3ll18c6idy1db2gb47chd9c5mf83qac0vyvljsrlc7430c"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 0452e7486e6f0..559c08ad4f38c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,25 +73,25 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "26.0.0.151"; + version = "27.0.0.130"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_npapi_linux_debug.${arch}.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_npapi_linux_debug.${arch}.tar.gz" else "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; sha256 = if debug then if arch == "x86_64" then - "0dlgardgrd8a18b48b0l6xk68dqi39yndv05phrypsxzr00p23q8" + "1sj06x4kfwxi9cnc8adjkxk6p81acl39l2idnyqb429l2s84d1d9" else - "0dbvsww4v6hlqn4yhdmzs335inim5iq0ym998x8zpavilqq51y0d" + "0f9vzdn523m408sw76r32zqf7d86l2mhcfsszbfh2bixg8p2cxzz" else if arch == "x86_64" then - "1yywffslh5px15w62wck1rnlp317jr6a334r409q7hxqc3x90z8l" + "0qkdabcnqfpbfsbs8ssms9xk2pqvps6fbasvcyvhnywclra25ggc" else - "1f1czbx14nvgr1qlzcp03nhj6c55wra8l6f4bsig691n3hfpb6hp"; + "0qkwkc6s4ganja4b2jsz4yff0bziirvbzxg0wyf648hqlb3bw5a6"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 9a805eb55e4f8..7c0125ea12344 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,19 +55,19 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "26.0.0.151"; + version = "27.0.0.130"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux_debug.x86_64.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux_debug.x86_64.tar.gz" else - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz"; + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0pfb217bg0v9hq0cbyndhmhkba16nhz2rasl7kk4ppxcfcjhr5pb" + "0gqm90j8czjnzar3ia65msd18kydjhgq5l9iv1difgm8lqji5ii0" else - "0a9ayylkpjprad1al7ddplxrpymd181a9gmw9hhk78s11v2zvwn8"; + "1agplangzlrp326dhz3xcvi6i325a644ggrh8g0cmgq9nfcpssnb"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 16ef657111fd1..0506f7c154d22 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -8,7 +8,6 @@ let mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; }; - soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; # `tar -z` requires gzip on $PATH, so wrap tar. # At some point, we should try to patch mesos so we add gzip to the PATH when # tar is invoked. I think that only needs to be done here: @@ -193,7 +192,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/java cp src/java/target/mesos-*.jar $out/share/java - MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos.${soext} + MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary} mkdir -p $out/nix-support touch $out/nix-support/setup-hook diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix new file mode 100644 index 0000000000000..0f1928fff2b29 --- /dev/null +++ b/pkgs/applications/networking/firehol/default.nix @@ -0,0 +1,79 @@ +{ stdenv, lib, fetchFromGitHub, pkgs +, autoconf, automake, curl, iprange, iproute, ipset, iptables, iputils +, kmod, nettools, procps, tcpdump, traceroute, utillinux, whois + +# Just install FireQOS without FireHOL +, onlyQOS ? true +}: + +stdenv.mkDerivation rec { + name = "firehol-${version}"; + version = "3.1.4"; + + src = fetchFromGitHub { + owner = "firehol"; + repo = "firehol"; + rev = "v${version}"; + sha256 = "121kjq5149r11k58lr9mkqns2k8jbdbjg2k93v8v7axhng6js7s9"; + }; + + patches = [ + # configure tries to determine if `ping6` or the newer, combined + # `ping` is installed by using `ping -6` which would fail. + (pkgs.writeText "firehol-ping6.patch" + '' + --- a/m4/ax_check_ping_ipv6.m4 + +++ b/m4/ax_check_ping_ipv6.m4 + @@ -42,16 +42,16 @@ AC_DEFUN([AX_CHECK_PING_IPV6], + + AC_CACHE_CHECK([whether ]PING[ has working -6 option], [ac_cv_ping_6_opt], + [ + - ac_cv_ping_6_opt=no + - if test -n "$PING"; then + - echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD + - $PING -6 -c 1 ::1 > conftest.out 2>&1 + - if test "$?" = 0; then + - ac_cv_ping_6_opt=yes + - fi + - cat conftest.out >&AS_MESSAGE_LOG_FD + - rm -f conftest.out + - fi + + ac_cv_ping_6_opt=yes + + #if test -n "$PING"; then + + # echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD + + # $PING -6 -c 1 ::1 > conftest.out 2>&1 + + # if test "$?" = 0; then + + # ac_cv_ping_6_opt=yes + + # fi + + # cat conftest.out >&AS_MESSAGE_LOG_FD + + # rm -f conftest.out + + #fi + ]) + + AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[ + '') + ]; + + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ + curl iprange iproute ipset iptables iputils kmod + nettools procps tcpdump traceroute utillinux whois + ]; + + preConfigure = "./autogen.sh"; + configureFlags = [ "--localstatedir=/var" + "--disable-doc" "--disable-man" ] ++ + lib.optional onlyQOS [ "--disable-firehol" ]; + + meta = with stdenv.lib; { + description = "A firewall for humans"; + longDescription = '' + FireHOL, an iptables stateful packet filtering firewall for humans! + FireQOS, a TC based bandwidth shaper for humans! + ''; + homepage = http://firehol.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ geistesk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix new file mode 100644 index 0000000000000..d1f3ad6968790 --- /dev/null +++ b/pkgs/applications/networking/firehol/iprange.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "iprange-${version}"; + version = "1.0.3"; + + src = fetchurl { + url = "https://github.com/firehol/iprange/releases/download/v${version}/iprange-${version}.tar.xz"; + sha256 = "0lwgl5ybrhsv43llq3kgdjpvgyfl43f3nxm0g8a8cd7zmn754bg2"; + }; + + meta = with stdenv.lib; { + description = "manage IP ranges"; + homepage = https://github.com/firehol/iprange; + license = licenses.gpl2; + maintainers = with maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix new file mode 100644 index 0000000000000..c71db351e9d2d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, perl, perlPackages, coreutils, +fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + name = "oysttyer-${version}"; + version = "2.9.1"; + + src = fetchFromGitHub { + owner = "oysttyer"; + repo = "oysttyer"; + rev = "${version}"; + sha256 = "05bfak4jr8ln4847rkj5qkazqnjym65k1phav3yicbyr3mxywhjw"; + }; + + buildInputs = [ + perl + makeWrapper + ]; + + propagatedBuildInputs = with perlPackages; [ + DateTimeFormatDateParse + TermReadLineTTYtter + TermReadKey + ]; + + installPhase = '' + ${coreutils}/bin/install -Dm755 \ + oysttyer.pl \ + $out/bin/oysttyer + + wrapProgram $out/bin/oysttyer \ + --prefix PERL5LIB : $PERL5LIB + ''; + + meta = with lib; { + inherit version; + description = "Perl Console Twitter Client"; + homepage = http://oysttyer.github.io/; + maintainers = with maintainers; [ woffs ]; + license = with licenses; [ ffsl ]; + }; +} diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 667c159838a0b..0a93efd3990d4 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation rec { - name = "bean-add-2017-04-06"; + name = "bean-add-2017-09-13"; src = fetchFromGitHub { owner = "simon-v"; repo = "bean-add"; - rev = "67c3cd345dc370f8cd967a31549c1d0b86b07024"; - sha256 = "0902lvwmf7k1h6gn3ilwzk20pxphbxsa3rn68jfhhfqpr6xpqf93"; + rev = "035f07a9e48a9dd23b49a27ba9c070ee9ddc4cc7"; + sha256 = "0lj8940bn2h8541am4x0sfqpfk5xfnyfdnf3jpajfgx6wyjm2frg"; }; propagatedBuildInputs = with python3Packages; [ python ]; diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix index 8726f5affea7c..6fe45e653dc5c 100644 --- a/pkgs/applications/science/logic/proverif/default.nix +++ b/pkgs/applications/science/logic/proverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "proverif-${version}"; - version = "1.95"; + version = "1.97pl1"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz"; - sha256 = "01viwi6sccdxk723ycy1shklz8g29j5i3wj2mcwb3j7advvqmws2"; + sha256 = "1b0ji68crdli40a4z62gdq6fnygj3z2j63iaq4jki7wfc3nn3vgq"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix new file mode 100644 index 0000000000000..40d9aa2f22824 --- /dev/null +++ b/pkgs/applications/video/bombono/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, scons, +mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg, +enca, pkgconfig }: + +stdenv.mkDerivation rec { + name = "bombono-${version}"; + version = "1.2.4"; + src = fetchFromGitHub { + owner = "muravjov"; + repo = "bombono-dvd"; + rev = version; + sha256 = "1lz1vik6abn1i1pvxhm55c9g47nxxv755wb2ijszwswwrwgvq5b9"; + }; + + nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ]; + + buildInputs = [ + gtk2 gnome2.gtkmm mjpegtools libdvdread dvdauthor boost dvdplusrwtools + libxmlxx ffmpeg enca + ]; + + buildPhase = '' + scons PREFIX=$out + ''; + + installPhase = '' + scons install + ''; + + meta = { + description = "a DVD authoring program for personal computers"; + homepage = "http://www.bombono.org/"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 98fb53e57dd47..2852eeef2ed73 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -10,11 +10,15 @@ let throw "Unsupported architecture"; version = (builtins.parseDrvName edk2.name).version; + + src = edk2.src; in stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { name = "OVMF-${version}"; + inherit src; + outputs = [ "out" "fd" ]; # TODO: properly include openssl for secureBoot @@ -27,22 +31,22 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { export OUTPUT_FD=$fd for file in \ - "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg,FatPkg,CryptoPkg,SourceLevelDebugPkg}; + "${src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg,FatPkg,CryptoPkg,SourceLevelDebugPkg}; do ln -sv "$file" . done ${if (seabios == false) then '' - ln -sv ${edk2.src}/OvmfPkg . + ln -sv ${src}/OvmfPkg . '' else '' - cp -r ${edk2.src}/OvmfPkg . + cp -r ${src}/OvmfPkg . chmod +w OvmfPkg/Csm/Csm16 cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin ''} ${if (secureBoot == true) then '' - ln -sv ${edk2.src}/SecurityPkg . - ln -sv ${edk2.src}/CryptoPkg . + ln -sv ${src}/SecurityPkg . + ln -sv ${src}/CryptoPkg . '' else '' ''} ''; diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index ba5fe4dcc1da1..6b40b1da3a0d9 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = http://www.seabios.org; license = licenses.lgpl3; maintainers = [ maintainers.tstrobel ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index b7155defb437e..432443e1a89a1 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -1,4 +1,7 @@ -{ newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }: +{ newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl +, overrideCC, wrapCC, ccWrapperFun, darwin +}: + let callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl version fetch; }); @@ -22,20 +25,35 @@ let inherit clang-tools-extra_src stdenv; }; - clang = wrapCC self.clang-unwrapped; + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + + libstdcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) libc nativeTools nativeLibc; + extraPackages = [ libstdcxxHook ]; + }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; - isClang = true; - inherit (self) stdenv; /* FIXME is this right? */ inherit (stdenv.cc) libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; - stdenv = overrideCC stdenv self.clang; + stdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.clang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); - libcxxStdenv = overrideCC stdenv self.libcxxClang; + libcxxStdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.libcxxClang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 04cd9f791e62c..453d2c1f04b47 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }: +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun, darwin }: let callPackage = newScope (self // { inherit stdenv isl version fetch; }); @@ -22,20 +22,35 @@ let inherit clang-tools-extra_src stdenv; }; - clang = wrapCC self.clang-unwrapped; + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + + libstdcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) libc nativeTools nativeLibc; + extraPackages = [ libstdcxxHook ]; + }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; - isClang = true; - inherit (self) stdenv; /* FIXME is this right? */ inherit (stdenv.cc) libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; - stdenv = overrideCC stdenv self.clang; - - libcxxStdenv = overrideCC stdenv self.libcxxClang; + stdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.clang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); + + libcxxStdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.libcxxClang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index a01e47efb7535..755b417c78d4d 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }: +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun, darwin }: let callPackage = newScope (self // { inherit stdenv isl version fetch; }); @@ -22,20 +22,35 @@ let inherit clang-tools-extra_src stdenv; }; - clang = wrapCC self.clang-unwrapped; + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + + libstdcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) libc nativeTools nativeLibc; + extraPackages = [ libstdcxxHook ]; + }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; - isClang = true; - inherit (self) stdenv; /* FIXME is this right? */ inherit (stdenv.cc) libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; }; - stdenv = overrideCC stdenv self.clang; - - libcxxStdenv = overrideCC stdenv self.libcxxClang; + stdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.clang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); + + libcxxStdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.libcxxClang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 654e1ce0023b8..2cdbef4b5b843 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -26,7 +26,6 @@ assert (hostPlatform != buildPlatform) -> !enableSharedLibraries; let src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"; - shlib = if stdenv.isDarwin then "dylib" else "so"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; @@ -124,7 +123,7 @@ in stdenv.mkDerivation rec { postInstall = "" + stdenv.lib.optionalString (enableSharedLibraries) '' moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM.${shlib}" "$lib" + moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" '' diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 11a9a46c15e56..c1d1ce055d76e 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -37,14 +37,17 @@ let llvm-manpages = lowPrio self.llvm.man; clang-manpages = lowPrio self.clang-unwrapped.man; - clang = wrapCC self.clang-unwrapped; + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - openmp = callPackage ./openmp.nix {}; + libstdcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) libc nativeTools nativeLibc; + extraPackages = [ libstdcxxHook ]; + }; libcxxClang = ccWrapperFun { cc = self.clang-unwrapped; - isClang = true; - inherit (self) stdenv; /* FIXME is this right? */ inherit (stdenv.cc) libc nativeTools nativeLibc; extraPackages = [ self.libcxx self.libcxxabi ]; @@ -53,11 +56,16 @@ let stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Use the gcc libstdc++ when targeting linux. - extraBuildInputs = if stdenv.cc.isGNU then [ libstdcxxHook ] else drv.extraBuildInputs; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); - libcxxStdenv = overrideCC stdenv self.libcxxClang; + libcxxStdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.libcxxClang; + # Don't include the libc++ and libc++abi from the original stdenv. + extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; + }); lld = callPackage ./lld.nix {}; @@ -66,6 +74,8 @@ let libcxx = callPackage ./libc++ {}; libcxxabi = callPackage ./libc++abi.nix {}; + + openmp = callPackage ./openmp.nix {}; }; in self diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 4978570334ea4..a5aa810fb80d3 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -23,7 +23,6 @@ let src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s"; - shlib = if stdenv.isDarwin then "dylib" else "so"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; @@ -115,7 +114,7 @@ in stdenv.mkDerivation rec { '' + stdenv.lib.optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM.${shlib}" "$lib" + moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" '' diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 3d0ea511e1017..4d7c4928283af 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -26,7 +26,7 @@ }; files = builtins.filter (n: n != "default") (pkgs.lib.mapAttrsToList (name: type: let - m = builtins.match "(.*)\.nix" name; + m = builtins.match "(.*)\\.nix" name; in if m == null then "default" else builtins.head m) (builtins.readDir ./.)); in (builtins.listToAttrs (map (name: { inherit name; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 07f622931faae..fbb07468e5cbf 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.10"; + version = "6.10.1"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "1mqnyj3bawad12dygsb11f2dbnkjp7q6d7ra714rqyw8mxix5ws0"; + sha256 = "0v3z6x277lq1y7wkqdf6mj3826z5vq0yadygspx9h4r0f1dnmafc"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 0b2f0e03cc19c..e07e1fc390877 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -28,7 +28,11 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gtk3 ]; mesonFlags = [ "-Denable-rpm=false" "-Denable-stemmer=false" "-Denable-dep11=false" ]; - postFixup = "patchelf --set-rpath ${rpath} $out/lib/libappstream-glib.so"; + postFixup = '' + for elf in "$out"/bin/* "$out"/lib/*.so; do + patchelf --set-rpath '${rpath}':"$out/lib" "$elf" + done + ''; meta = with stdenv.lib; { description = "Objects and helper methods to read and write AppStream metadata"; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 514c73f5e0fcf..7a3e0b2083cc8 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -12,10 +12,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openblasCompat superlu hdf5 ]; - cmakeFlags = let - libSuff = if stdenv.isDarwin then "dylib" else "so"; - in [ - "-DLAPACK_LIBRARY=${openblasCompat}/lib/libopenblas.${libSuff}" + cmakeFlags = [ + "-DLAPACK_LIBRARY=${openblasCompat}/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary}" "-DDETECT_HDF5=ON" ]; diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 273563b2a99ab..5dc1fb9383405 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -14,11 +14,9 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace "-arch i386" "" ''; - installPhase = let - libSuff = if stdenv.isDarwin then "dylib" else "so"; - in '' + installPhase = '' mkdir -p $out/{bin,lib,include/hdhomerun} - install -Dm444 libhdhomerun.${libSuff} $out/lib + install -Dm444 libhdhomerun${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib install -Dm555 hdhomerun_config $out/bin cp *.h $out/include/hdhomerun ''; diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index 8b716d055a0a0..a366baf27e336 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { ''; installPhase = let - libSuff = if stdenv.isDarwin then "dylib" else "so"; + libSuff = stdenv.hostPlatform.extensions.sharedLibrary; in '' mkdir -p $out/lib $out/bin $out/include; - cp libsvm.so.2 $out/lib/libsvm.2.${libSuff}; - ln -s $out/lib/libsvm.2.${libSuff} $out/lib/libsvm.${libSuff}; + cp libsvm.so.2 $out/lib/libsvm.2${libSuff}; + ln -s $out/lib/libsvm.2${libSuff} $out/lib/libsvm${libSuff}; cp svm-scale svm-train svm-predict $out/bin; cp svm.h $out/include; ''; diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index f38de08842449..1ce56d1e49f7f 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -7,7 +7,7 @@ let name = "suitesparse-${version}"; int_t = if openblas.blas64 then "int64_t" else "int32_t"; - SHLIB_EXT = if stdenv.isDarwin then "dylib" else "so"; + SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation { inherit name; @@ -64,10 +64,10 @@ stdenv.mkDerivation { for i in "$out"/lib/lib*.a; do ar -x $i done - ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse.${SHLIB_EXT}" -lopenblas ${stdenv.lib.optionalString enableCuda "-lcublas"} + ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lopenblas ${stdenv.lib.optionalString enableCuda "-lcublas"} ) for i in umfpack cholmod amd camd colamd spqr; do - ln -s libsuitesparse.${SHLIB_EXT} "$out"/lib/lib$i.${SHLIB_EXT} + ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT} done # Install documentation diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 8dd96cdd00380..a8a0d5dc2b3f0 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,8 +1,5 @@ { stdenv, fetchurl }: -let - SHLIB_EXT = if stdenv.isDarwin then "dylib" else "so"; -in stdenv.mkDerivation { name = "tbb-4.4-u2"; @@ -16,7 +13,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/{lib,share/doc} - cp "build/"*release*"/"*${SHLIB_EXT}* $out/lib/ + cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ mv include $out/ rm $out/include/index.html mv doc/html $out/share/doc/tbb diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index b208631eeaf88..cc374345c2eb4 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -2,7 +2,7 @@ let version = "2.6.2"; - SHLIB_EXT = if stdenv.isDarwin then "dylib" else "so"; + SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation { name = "tinyxml-${version}"; @@ -38,7 +38,7 @@ in stdenv.mkDerivation { # build the lib as a shared library ''${CXX} -Wall -O2 -shared -fpic tinyxml.cpp \ tinyxmlerror.cpp tinyxmlparser.cpp \ - tinystr.cpp -o libtinyxml.${SHLIB_EXT} + tinystr.cpp -o libtinyxml${SHLIB_EXT} ''; doCheck = true; @@ -55,7 +55,7 @@ in stdenv.mkDerivation { mkdir -pv $out/lib/pkgconfig/ mkdir -pv $out/share/doc/tinyxml/ - cp -v libtinyxml.${SHLIB_EXT} $out/lib/ + cp -v libtinyxml${SHLIB_EXT} $out/lib/ cp -v *.h $out/include/ substituteInPlace tinyxml.pc --replace "@out@" "$out" diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index f7b6aeae6157c..bc0472bc00533 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -7,12 +7,12 @@ , psutil , memory_profiler , pytest_xdist -, sharedLibraryExtension }: let - magick_wand_library = "${imagemagick}/lib/libMagickWand-6.Q16${sharedLibraryExtension}"; - imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${sharedLibraryExtension}"; + soext = stdenv.hostPlatform.extensions.sharedLibrary; + magick_wand_library = "${imagemagick}/lib/libMagickWand-6.Q16${soext}"; + imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${soext}"; in buildPythonPackage rec { pname = "Wand"; version = "0.4.4"; diff --git a/pkgs/development/python-modules/afew/default.nix b/pkgs/development/python-modules/afew/default.nix index 4a2d4a0f7224e..39c921eb7bcd4 100644 --- a/pkgs/development/python-modules/afew/default.nix +++ b/pkgs/development/python-modules/afew/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/teythoon/afew; + homepage = https://github.com/afewmail/afew; description = "An initial tagging script for notmuch mail"; maintainers = with maintainers; [ garbas ]; }; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 8b8b06f9a2cbf..48d4fa68f6573 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, geos, glibcLocales, pytest, cython, sharedLibraryExtension +, geos, glibcLocales, pytest, cython , numpy }: @@ -26,7 +26,7 @@ buildPythonPackage rec { patchPhase = let libc = if stdenv.isDarwin then "libc.dylib" else "libc.so.6"; in '' - sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${geos}/lib/libgeos_c${sharedLibraryExtension}'])|" shapely/geos.py + sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}'])|" shapely/geos.py sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${stdenv.cc.libc}']).free|" shapely/geos.py ''; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 19973c18bafd5..bf1f9d14b7768 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -194,7 +194,7 @@ in rbnacl = spec: { postInstall = '' sed -i $(cat $out/nix-support/gem-meta/install-path)/lib/rbnacl.rb -e "2a \ - RBNACL_LIBSODIUM_GEM_LIB_PATH = '${libsodium.out}/lib/libsodium.${if stdenv.isDarwin then "dylib" else "so"}' + RBNACL_LIBSODIUM_GEM_LIB_PATH = '${libsodium.out}/lib/libsodium${stdenv.hostPlatform.extensions.sharedLibrary}' " ''; }; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 1f38ad584532d..114913403577c 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.41.2"; + version = "0.42.1"; pname = "meson"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0p69hir68ar3nzrjn0zjsnyzq181b0kq6arrcmxqpzl7g5qhf5xd"; + sha256 = "1phf1xpwm8m85qiiirkqhrf5aigx7ajaw0l59d6lzadf1fmgfx5v"; }; postFixup = '' diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 6c40cd7891065..adeb377dccd07 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,14 +1,14 @@ { mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }: mkDerivation rec { - version = "3.9.1"; + version = "3.10.0"; name = "sqlitebrowser-${version}"; src = fetchFromGitHub { repo = "sqlitebrowser"; owner = "sqlitebrowser"; rev = "v${version}"; - sha256 = "1s7f2d7wx2i68x60z7wdws3il6m83k5n5w5wyjvr0mz0mih0s150"; + sha256 = "1fwr7p4b6glc3s0a06i7cg8l9p1mrcm4vyhyf2wi89cyg22rrf5c"; }; buildInputs = [ qtbase qttools sqlite ]; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 2dad1c596ab75..9702534b5ccbf 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.18"; + version = "4.19"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "026agy9nq238nx3ynhmi8h3vx96yra4xacfsm2ybs9k23ry8ibc9"; + sha256 = "10bjh2mrkvx41fk60b2iqv5b5k4r7a3qdsx04iyg904jqb3fp4vw"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index ace8e9888a760..0c59821bdd260 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -5,16 +5,11 @@ , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , nativeOnly ? false , runtimeOnly ? false -, newStdcpp ? false }: let commonTargetPkgs = pkgs: with pkgs; let - primus2 = if newStdcpp then primus else primus.override { - stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; - stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ]; - }; tzdir = "${pkgs.tzdata}/share/zoneinfo"; # I'm not sure if this is the best way to add things like this # to an FHSUserEnv @@ -38,7 +33,7 @@ let # Zoneinfo etc-zoneinfo ] ++ lib.optional withJava jdk - ++ lib.optional withPrimus primus2 + ++ lib.optional withPrimus primus ++ extraPkgs pkgs; in buildFHSUserEnv rec { @@ -68,7 +63,7 @@ in buildFHSUserEnv rec { xlibs.libpciaccess (steamPackages.steam-runtime-wrapped.override { - inherit nativeOnly runtimeOnly newStdcpp; + inherit nativeOnly runtimeOnly; }) ]; diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 6274a91625fab..3d614bda31e47 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -1,11 +1,9 @@ { stdenv, lib, perl, pkgs, steam-runtime , nativeOnly ? false , runtimeOnly ? false -, newStdcpp ? false }: assert !(nativeOnly && runtimeOnly); -assert newStdcpp -> !runtimeOnly; let runtimePkgs = with pkgs; [ @@ -79,7 +77,7 @@ let SDL2_mixer gstreamer gst-plugins-base - ] ++ lib.optional (!newStdcpp) gcc48.cc; + ]; overridePkgs = with pkgs; [ libgpgerror @@ -88,7 +86,8 @@ let openalSoft libva vulkan-loader - ] ++ lib.optional newStdcpp gcc.cc; + gcc.cc + ]; ourRuntime = if runtimeOnly then [] else if nativeOnly then runtimePkgs ++ overridePkgs diff --git a/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch b/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch new file mode 100644 index 0000000000000..2277a9afcccf8 --- /dev/null +++ b/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 0053441..9a6b855 100755 +--- a/configure ++++ b/configure +@@ -2833,7 +2833,7 @@ if test $have_cups_config = yes; then + CUPS_LIBS=`cups-config --libs` + CUPS_IMAGE_LIBS=`cups-config --image --libs` + CUPS_SERVER_DIR=`cups-config --serverbin` +- CUPS_DATA_DIR=`cups-config --datadir` ++ CUPS_DATA_DIR="${prefix}/share/cups" + else + { { echo "$as_me:$LINENO: error: *** 'cups-config' missing, please install CUPS or fix your \$PATH ***" >&5 + echo "$as_me: error: *** 'cups-config' missing, please install CUPS or fix your \$PATH ***" >&2;} diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix new file mode 100644 index 0000000000000..88b88f59afc84 --- /dev/null +++ b/pkgs/misc/drivers/epson-alc1100/default.nix @@ -0,0 +1,70 @@ +{ stdenv, stdenv_32bit, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }: + +let + version = "1.2-0"; + + libstdcpp5 = fetchurl { + url = "http://old-releases.ubuntu.com/ubuntu/pool/universe/g/gcc-3.3/libstdc++5_3.3.6-17ubuntu1_i386.deb"; + sha256 = "10f8zcmqaa7skvg2bz94mnlgqpan4iscvi8913r6iawjh7hiisjy"; + }; +in + stdenv.mkDerivation { + name = "epson-alc1100-${version}"; + + src = fetchurl { + url = "http://a1227.g.akamai.net/f/1227/40484/7d/download.ebz.epson.net/dsc/f/01/00/01/58/65/cd71929d2bf41ebf7e96f68fa9f1279556545ef1/Epson-ALC1100-filter-1.2.tar.gz"; + sha256 = "0q0bf4dfm4v69l7xg6sgkh7rwb0h77i8j9kplq1dfkd208g7y81p"; + }; + + patches = [ ./cups-data-dir.patch ./ppd.patch ]; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + buildInputs = [ cups pkgsi686Linux.glibc psutils ghostscript bash ]; + + postUnpack = '' + dpkg -x ${libstdcpp5} libstdcpp5_i386; + + mkdir -p $out/lib; + + mv libstdcpp5_i386/usr/lib/* $out/lib; + ''; + + postFixup = '' + patchelf --set-interpreter ${pkgsi686Linux.glibc}/lib/ld-linux.so.2 \ + --set-rpath "${stdenv.lib.makeLibraryPath [ + pkgsi686Linux.glibc + "$out" + ]}" $out/bin/alc1100 + + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ + pkgsi686Linux.glibc + ]}" $out/lib/libstdc++.so.5.0.7 + + wrapProgram $out/bin/alc1100_lprwrapper.sh \ + --suffix PATH : "\$PATH:${psutils}/bin:/var/lib/cups/path/bin" + + wrapProgram $out/bin/pstoalc1100.sh \ + --suffix PATH : "\$PATH:${psutils}/bin:${ghostscript}/bin:${bash}/bin:/var/lib/cups/path/bin" + ''; + + meta = with stdenv.lib; { + homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; + description = "Epson AcuLaser C1100 Driver"; + longDescription = '' + This package provides a print filter for printing to EPSON AL-C1100 + printers on Linux systems. + + To use the driver adjust your configuration.nix file: + services.printing = { + enable = true; + drivers = [ pkgs.epson-alc1100 ]; + }; + ''; + + license = with licenses; [ mit eapl ]; + maintainers = [ maintainers.eperuffo ]; + platforms = platforms.linux; + }; + + } diff --git a/pkgs/misc/drivers/epson-alc1100/ppd.patch b/pkgs/misc/drivers/epson-alc1100/ppd.patch new file mode 100644 index 0000000000000..71d86668f53d2 --- /dev/null +++ b/pkgs/misc/drivers/epson-alc1100/ppd.patch @@ -0,0 +1,13 @@ +diff --git a/ppd/Epson-AL-C1100-fm3.ppd b/ppd/Epson-AL-C1100-fm3.ppd +index 75c7fff..ecd04c8 100644 +--- a/ppd/Epson-AL-C1100-fm3.ppd ++++ b/ppd/Epson-AL-C1100-fm3.ppd +@@ -68,7 +68,7 @@ + *%*********** Foomatic Configulations ************ + *%pprRIP: foomatic-rip other + *FoomaticIDs: Epson-AL-C1100 alc1100 +-*FoomaticRIPCommandLine: "pstoalc1100.sh %C" ++*FoomaticRIPCommandLine: "/var/lib/cups/path/bin/pstoalc1100.sh %C" + + *%**************** Paper Handling ****************** + diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index d1cb7221615f3..9591d4ef4cca8 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://915resolution.mango-lang.org/; description = "A tool to modify Intel 800/900 video BIOS"; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index ef79b3f7fb761..b799e5d52854a 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -4,8 +4,8 @@ with stdenv.lib; let version = "4.13.1"; - revision = "a"; - sha256 = "19x3rg75r4xm67wbr54iypbjsrfka7mz2vp3yswp4x4x94g457bh"; + revision = "b"; + sha256 = "0l64r4978ynwpikw9fvhzzyrhvxhl7chwkbns1064c1dhr6j0zg6"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 9f911013f3b9e..9f71b4a1ed3df 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { homepage = http://linux.dell.com/libsmbios/main; description = "A library to obtain BIOS information"; license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1 - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index e017426aed0f8..779337e85f861 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = ["PREFIX=$(out)"]; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [raskin]; license = stdenv.lib.licenses.mit; description = ''A Linux tool to change controlling pty of a process''; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 37a237f57ac91..f1e5cc6e26251 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = http://www.syslinux.org/; description = "A lightweight bootloader"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index 54bd33cc92fd8..7911a2172ba08 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { registers (MSRs) via the msr kernel module. it will approximate processor frequency, and identify the cache sizes and layout. ''; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; homepage = http://codemonkey.org.uk/projects/x86info/; maintainers = with stdenv.lib.maintainers; [jcumming]; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 4668ac240961f..c99f939437b08 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mattermost-${version}"; - version = "3.8.2"; + version = "4.1.0"; src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz"; - sha256 = "1rrcasx8yzr48lwznqhkqk4qjfhxq5lnfcl9xiqkh6y2gmaqbk42"; + sha256 = "0bp56i108pxsqcswxy1hdz3d8wq83lc29wcq6npimwx566rx4xhf"; }; installPhase = '' diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 0b82f1deef62c..132f812bf4641 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -2,14 +2,14 @@ let bootstrap = fetchurl { - url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.4.2.3/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "1x5dp8y731qai882ghy3337844lc686r15a4dd9wjx2zvy7wmwhz"; + url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.5/meteor-bootstrap-os.linux.x86_64.tar.gz"; + sha256 = "0cwwqv88h1ji7g4zmfz34xsrxkn640wr11ddjq5c6b9ygcljci3p"; }; in stdenv.mkDerivation rec { name = "meteor-${version}"; - version = "1.4.2.3"; + version = "1.5"; dontStrip = true; diff --git a/pkgs/servers/meteor/main.patch b/pkgs/servers/meteor/main.patch index 4c21a29a05c46..3282c91abac89 100644 --- a/pkgs/servers/meteor/main.patch +++ b/pkgs/servers/meteor/main.patch @@ -2,9 +2,9 @@ diff --git a/tools/cli/main.js b/tools/cli/main.js index 84f94bc..4fbda17 100644 --- a/tools/cli/main.js +++ b/tools/cli/main.js -@@ -484,6 +484,45 @@ var springboard = function (rel, options) { - process.exit(ret.wait()); - } +@@ -554,6 +554,44 @@ + }).await()); + } // Now exec; we're not coming back. + // BEGIN HACK + // patch shebang: @@ -44,7 +44,13 @@ index 84f94bc..4fbda17 100644 + patchelf("mongodb", "bin", "mongo"); + patchelf("mongodb", "bin", "mongod"); + // END HACK -+ - // Now exec; we're not coming back. + require('kexec')(executable, newArgv); - throw Error('exec failed?'); + +@@ -1485,4 +1523,4 @@ + + process.exit(ret); + }).run(); +-//# sourceMappingURL=main.js.map +\ No newline at end of file ++//# sourceMappingURL=main.js.map diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 2d2fb26324c48..611543ee87e2a 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -14,6 +14,10 @@ buildGoPackage rec { sha256 = "0rm43jjqv7crfahl973swi4warqmqnmv740cg800yvzvnlp37kl4"; }; + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath $out/lib $bin/bin/node_exporter + ''; + # FIXME: megacli test fails doCheck = false; diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix index 22d87d670645f..3981a5eeb14ca 100644 --- a/pkgs/servers/web-apps/piwik/default.nix +++ b/pkgs/servers/web-apps/piwik/default.nix @@ -2,29 +2,20 @@ stdenv.mkDerivation rec { name = "piwik-${version}"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { url = "https://builds.piwik.org/${name}.tar.gz"; - sha512 = "2i0vydr073ynv7wcn078zxhvywdv85c648hympkzicdd746g995878py9006m96iwkmk4q664wn3f8jnfqsl1jd9f26alz1nssizbn9"; + sha512 = "175300ibf0lg4xnyn5v47czi3vd6i7yqf1im3br4975f6k7w8q22m2mk2mi006795js5q52x48g4sc7wb47wac7wbla8wp98al48gfb"; }; nativeBuildInputs = [ makeWrapper ]; - # regarding the PIWIK_USER_PATH substitutes: - # looks like this is just a bug / confusion of the directories, and nobody has tested this. - # PR at https://github.com/piwik/piwik/pull/11661 # regarding the 127.0.0.1 substitute: # This replaces the default value of the database server field. # unix socket authentication only works with localhost, # but password-based SQL authentication works with both. postPatch = '' - substituteInPlace core/AssetManager/UIAssetFetcher.php \ - --replace "return PIWIK_USER_PATH;" "return PIWIK_DOCUMENT_ROOT;" - substituteInPlace core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php \ - --replace "setImportDir(PIWIK_USER_PATH);" "setImportDir(PIWIK_DOCUMENT_ROOT);" - substituteInPlace core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php \ - --replace "\$absolutePath = PIWIK_USER_PATH" "\$absolutePath = PIWIK_DOCUMENT_ROOT" substituteInPlace plugins/Installation/FormDatabaseSetup.php \ --replace "=> '127.0.0.1'," "=> 'localhost'," cp ${./bootstrap.php} bootstrap.php diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index d8a5e13558152..41a7685ed2e01 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -1,9 +1,5 @@ { stdenv }: -let - shlib = if stdenv.isDarwin then "dylib" else "so"; -in - stdenv.mkDerivation { name = "cc-wrapper-test"; @@ -34,7 +30,12 @@ stdenv.mkDerivation { printf "checking whether compiler uses NIX_LDFLAGS... " >&2 mkdir -p foo/lib - $CC -shared ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} -DVALUE=42 -o foo/lib/libfoo.${shlib} ${./foo.c} + $CC -shared \ + ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ + -DVALUE=42 \ + -o foo/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ + ${./foo.c} + NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c} ./ldflags-check diff --git a/pkgs/test/stdenv-inputs/default.nix b/pkgs/test/stdenv-inputs/default.nix index d1eb8b9bfe249..13fa985839d75 100644 --- a/pkgs/test/stdenv-inputs/default.nix +++ b/pkgs/test/stdenv-inputs/default.nix @@ -1,8 +1,6 @@ { stdenv }: let - shlib = if stdenv.isDarwin then "dylib" else "so"; - foo = stdenv.mkDerivation { name = "foo-test"; @@ -13,7 +11,10 @@ let $CC -o $out/bin/foo ${./cc-main.c} chmod +x $out/bin/foo cp ${./foo.c} $out/include/foo.h - $CC -shared ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} -o $out/lib/libfoo.${shlib} ${./foo.c} + $CC -shared \ + ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} \ + -o $out/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ + ${./foo.c} ''; }; @@ -28,7 +29,10 @@ let $CC -o $out/bin/bar ${./cc-main.c} chmod +x $out/bin/bar cp ${./bar.c} $dev/include/bar.h - $CC -shared ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} -o $dev/lib/libbar.${shlib} ${./bar.c} + $CC -shared \ + ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} \ + -o $dev/lib/libbar${stdenv.hostPlatform.extensions.sharedLibrary} \ + ${./bar.c} ''; }; in diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 61066cec04df3..13d1b149d06c9 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,23 +1,22 @@ -{ lib, stdenv, fetchgit, fetchpatch, python3Packages, docutils -, acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc -, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, xxd, xz -, colordiff +{ lib, stdenv, fetchgit, python3Packages, docutils +, acl, binutils, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc, e2fsprogs +, file, findutils, fpc, gettext, ghc, gnupg1, gnutar, gzip, imagemagick, jdk, libarchive, libcaca, llvm +, mono, openssh, pdftk, poppler_utils, sng, sqlite, squashfsTools, tcpdump, unzip, xxd, xz , enableBloat ? false }: python3Packages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "85"; + version = "86"; src = fetchgit { url = "git://anonscm.debian.org/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "0kmcfhgva1fl6x5b07sc7k6ba9mqs3ma0lvspxm31w7nrrrqcvlr"; + sha256 = "0jj3gn7pw7him12bxf0wbs6wkz32ydv909v5gi681p0dyzajd0zr"; }; patches = [ - # Ignore different link counts - doesn't work with 85 - # ./ignore_links.patch + ./ignore_links.patch ]; postPatch = '' @@ -25,12 +24,13 @@ python3Packages.buildPythonApplication rec { sed -i setup.py -e "/'rpm-python',/d" ''; - # Still missing these tools: enjarify, otool & lipo (maybe macOS only), showttf + # Still missing these tools: apktool docx2txt enjarify gifbuild js-beautify odt2txt oggDump pgpdump ps2ascii Rscript showttf # Also these libraries: python3-guestfs - pythonPath = with python3Packages; - [ debian libarchive-c python_magic tlsh rpm cdrkit acl binutils bzip2 cbfstool cpio diffutils e2fsprogs file gettext - gzip libcaca poppler_utils sng sqlite squashfsTools unzip xxd xz colordiff - ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]; + pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ + acl binutils bzip2 cbfstool cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file + findutils gettext gnutar gzip libarchive libcaca poppler_utils sng sqlite squashfsTools unzip + xxd xz + ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 imagemagick llvm jdk mono openssh pdftk tcpdump ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root diff --git a/pkgs/tools/misc/diffoscope/ignore_links.patch b/pkgs/tools/misc/diffoscope/ignore_links.patch index ceea0dc94d4e1..b0841ce0bb579 100644 --- a/pkgs/tools/misc/diffoscope/ignore_links.patch +++ b/pkgs/tools/misc/diffoscope/ignore_links.patch @@ -1,19 +1,32 @@ -diff -ru -x '*~' diffoscope-orig/diffoscope/comparators/directory.py diffoscope/diffoscope/comparators/directory.py ---- diffoscope-orig/diffoscope/comparators/directory.py 1970-01-01 01:00:01.000000000 +0100 -+++ diffoscope/diffoscope/comparators/directory.py 2016-12-08 17:37:55.000315157 +0100 -@@ -49,6 +49,7 @@ - FILE_RE = re.compile(r'^\s*File:.*$') - DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d\s+') - INODE_RE = re.compile(r'Inode: [0-9]+\s+') -+ LINKS_RE = re.compile(r'Links: [0-9]+\s+') - ACCESS_TIME_RE = re.compile(r'^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') - CHANGE_TIME_RE = re.compile(r'^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') +From a33e8018092e4a91dbc45e15bbeff760b3418512 Mon Sep 17 00:00:00 2001 +From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> +Date: Wed, 13 Sep 2017 16:53:38 +0300 +Subject: [PATCH] Ignore hard link counts + +--- + diffoscope/comparators/directory.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py +index 3b195bc..9071bb3 100644 +--- a/diffoscope/comparators/directory.py ++++ b/diffoscope/comparators/directory.py +@@ -66,6 +66,7 @@ else: + FILE_RE = re.compile(r'^\s*File:.*$') + DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d\s+') + INODE_RE = re.compile(r'Inode: [0-9]+\s+') ++ LINKS_RE = re.compile(r'Links: [0-9]+\s+') + ACCESS_TIME_RE = re.compile(r'^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') + CHANGE_TIME_RE = re.compile(r'^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$') -@@ -57,6 +58,7 @@ - line = Stat.FILE_RE.sub('', line) - line = Stat.DEVICE_RE.sub('', line) - line = Stat.INODE_RE.sub('', line) -+ line = Stat.LINKS_RE.sub('', line) - line = Stat.ACCESS_TIME_RE.sub('', line) - line = Stat.CHANGE_TIME_RE.sub('', line) - return line.encode('utf-8') +@@ -74,6 +75,7 @@ else: + line = Stat.FILE_RE.sub('', line) + line = Stat.DEVICE_RE.sub('', line) + line = Stat.INODE_RE.sub('', line) ++ line = Stat.LINKS_RE.sub('', line) + line = Stat.ACCESS_TIME_RE.sub('', line) + line = Stat.CHANGE_TIME_RE.sub('', line) + return line.encode('utf-8') +-- +2.13.0 + diff --git a/pkgs/tools/misc/diffoscope/locale.patch b/pkgs/tools/misc/diffoscope/locale.patch deleted file mode 100644 index 408d3ba2ce047..0000000000000 --- a/pkgs/tools/misc/diffoscope/locale.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' diffoscope-orig/diffoscope/__init__.py diffoscope/diffoscope/__init__.py ---- diffoscope-orig/diffoscope/__init__.py 1970-01-01 01:00:01.000000000 +0100 -+++ diffoscope/diffoscope/__init__.py 2016-12-08 17:48:51.732122110 +0100 -@@ -81,8 +81,8 @@ - for var in ['LANG', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MONETARY', - 'LC_MESSAGES', 'LC_PAPER', 'LC_NAME', 'LC_ADDRESS', - 'LC_TELEPHONE', 'LC_MEASUREMENT', 'LC_IDENTIFICATION']: -- os.environ[var] = 'C' -- os.environ['LC_CTYPE'] = 'C.UTF-8' -+ os.environ[var] = 'en_US' -+ os.environ['LC_CTYPE'] = 'en_US.UTF-8' - os.environ['TZ'] = 'UTC' - - diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix index fda2b47a24432..12d9da87b39b3 100644 --- a/pkgs/tools/networking/eggdrop/default.nix +++ b/pkgs/tools/networking/eggdrop/default.nix @@ -1,9 +1,5 @@ { stdenv, fetchFromGitHub, tcl }: -let - shlib = if stdenv.isDarwin then "dylib" else "so"; -in - stdenv.mkDerivation rec { name = "eggdrop-${version}"; version = "1.6.21-nix1"; @@ -29,7 +25,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-tcllib=${tcl}/lib/lib${tcl.libPrefix}.${shlib}" + "--with-tcllib=${tcl}/lib/lib${tcl.libPrefix}${stdenv.hostPlatform.extensions.sharedLibrary}" "--with-tclinc=${tcl}/include/tcl.h" ]; diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 5b96e513fd496..ae80b5ec0b503 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "2.48b"; + version = "2.51b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "00x7p8lqrpx60hwynl5dqwn6isr8yhl263avcwfw3dqc7v9lwhrz"; + sha256 = "15xvjma2lpawg1wasnja9wmgrpss5mnm3f5xmh5yli5q6m5vjdfl"; }; # Note: libcgroup isn't needed for building, just for the afl-cgroup diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 21e5c3ffcef40..34eb5583c4558 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -17,20 +17,16 @@ stdenv.mkDerivation rec { # FIXME: this is probably not the right way to make it work # make[2]: *** No rule to make target 'libyara/.libs/libyara.a', needed by 'yara'. Stop. - dynamic_library_extension = "" - + stdenv.lib.optionalString stdenv.isLinux "so" - + stdenv.lib.optionalString stdenv.isDarwin "dylib" - ; prePatch = '' cat >staticlibrary.patch <<EOF --- a/Makefile.am 2015-11-01 11:39:12.000000000 +0100 +++ b/Makefile.am 2015-11-01 11:45:32.000000000 +0100 @@ -12 +12 @@ -yara_LDADD = libyara/.libs/libyara.a - +yara_LDADD = libyara/.libs/libyara.${dynamic_library_extension} + +yara_LDADD = libyara/.libs/libyara${stdenv.hostPlatform.extensions.sharedLibrary} @@ -15 +15 @@ -yarac_LDADD = libyara/.libs/libyara.a - +yarac_LDADD = libyara/.libs/libyara.${dynamic_library_extension} + +yarac_LDADD = libyara/.libs/libyara${stdenv.hostPlatform.extensions.sharedLibrary} EOF ''; patches = [ diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix new file mode 100644 index 0000000000000..6d6a3461f7719 --- /dev/null +++ b/pkgs/tools/system/s-tui/default.nix @@ -0,0 +1,24 @@ +{ stdenv, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "s-tui"; + version = "0.6.2"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0fijk26sm51bnxf7plzd1fn2k4f8mdqd7j9zqc3d8zri7228vik2"; + }; + + propagatedBuildInputs = with pythonPackages; [ + urwid + psutil + ]; + + meta = with stdenv.lib; { + homepage = https://amanusk.github.io/s-tui/; + descrption = "Stress-Terminal UI monitoring tool"; + license = licenses.gpl2; + maintainers = with maintainers; [ infinisil ]; + }; +} diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix index 0b95dcdb193d4..15a18a453f001 100644 --- a/pkgs/tools/system/socklog/default.nix +++ b/pkgs/tools/system/socklog/default.nix @@ -16,7 +16,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; postPatch = '' - sed -i src/TARGETS -e '/^chkshsgr/d' + # Fails to run as user without supplementary groups + echo "int main() { return 0; }" >src/chkshsgr.c + + # Fixup implicit function declarations + sed -i src/pathexec_run.c -e '1i#include <unistd.h>' + sed -i src/prot.c -e '1i#include <unistd.h>' -e '2i#include <grp.h>' + sed -i src/seek_set.c -e '1i#include <unistd.h>' ''; configurePhase = '' @@ -27,8 +33,6 @@ stdenv.mkDerivation rec { buildPhase = ''package/compile''; installPhase = '' - runHook preInstall - mkdir -p $out/bin mv command"/"* $out/bin @@ -39,8 +43,6 @@ stdenv.mkDerivation rec { mkdir -p $doc/share/doc/socklog/html mv doc/*.html $doc/share/doc/socklog/html/ - - runHook postInstall ''; checkPhase = ''package/check''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 345d12e13f6bf..40339435c35d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1984,6 +1984,10 @@ with pkgs; finger_bsd = callPackage ../tools/networking/bsd-finger { }; + iprange = callPackage ../applications/networking/firehol/iprange.nix {}; + + firehol = callPackage ../applications/networking/firehol {}; + fio = callPackage ../tools/system/fio { }; flamerobin = callPackage ../applications/misc/flamerobin { }; @@ -4195,6 +4199,8 @@ with pkgs; rzip = callPackage ../tools/compression/rzip { }; + s-tui = callPackage ../tools/system/s-tui { }; + s3backer = callPackage ../tools/filesystems/s3backer { }; s3fs = callPackage ../tools/filesystems/s3fs { }; @@ -4652,6 +4658,8 @@ with pkgs; turses = callPackage ../applications/networking/instant-messengers/turses { }; + oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/v3.nix {}; @@ -5310,7 +5318,7 @@ with pkgs; #Use this instead of stdenv to build with clang clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv; clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; - libcxxStdenv = lowPrio llvmPackages.libcxxStdenv; + libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; clean = callPackage ../development/compilers/clean { }; @@ -13457,6 +13465,7 @@ with pkgs; }; atom = callPackage ../applications/editors/atom { }; + atom-beta = callPackage ../applications/editors/atom/beta.nix { }; aseprite = callPackage ../applications/editors/aseprite { }; @@ -13607,6 +13616,8 @@ with pkgs; bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; + bombono = callPackage ../applications/video/bombono {}; + bomi = libsForQt5.callPackage ../applications/video/bomi { youtube-dl = pythonPackages.youtube-dl; pulseSupport = config.pulseaudio or true; @@ -18649,6 +18660,8 @@ with pkgs; e17gtk = callPackage ../misc/themes/e17gtk { }; + epson-alc1100 = callPackage ../misc/drivers/epson-alc1100 { }; + epson-escpr = callPackage ../misc/drivers/epson-escpr { }; epson_201207w = callPackage ../misc/drivers/epson_201207w { }; @@ -19382,8 +19395,10 @@ with pkgs; # `recurseIntoAttrs` for sake of hydra, not nix-env tests = recurseIntoAttrs { cc-wrapper = callPackage ../test/cc-wrapper { }; - cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = clangStdenv; }; - cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = libcxxStdenv; }; + cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = llvmPackages.stdenv; }; + cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; + cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; }; + cc-wrapper-libcxx-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; }; stdenv-inputs = callPackage ../test/stdenv-inputs { }; macOSSierraShared = callPackage ../test/macos-sierra-shared {}; diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index a4d313a1b9916..a9f21e45aed4d 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -50,7 +50,7 @@ in # it's a directory, so the set of overlays from the directory, ordered lexicographically let content = readDir path; in map (n: import (path + ("/" + n))) - (builtins.filter (n: builtins.match ".*\.nix" n != null || pathExists (path + ("/" + n + "/default.nix"))) + (builtins.filter (n: builtins.match ".*\\.nix" n != null || pathExists (path + ("/" + n + "/default.nix"))) (attrNames content)) else # it's a file, so the result is the contents of the file itself diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3d8f7622d030f..41920f7ccb5a9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13059,6 +13059,21 @@ let self = _self // overrides; _self = with self; { }; }; + TermReadLineTTYtter = buildPerlPackage rec { + name = "Term-ReadLine-TTYtter-1.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CK/CKAISER/Term-ReadLine-TTYtter-1.4.tar.gz"; + sha256 = "14xcqhg1vrwgv65nd2z8xzn0wgb18i17pzkkh8m15cp1rqrk2dxc"; + }; + + outputs = [ "out" ]; + + meta = { + description = "a modified version of T::RL::Perl with several new nonstandard features specific to TTYtter"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TermShellUI = buildPerlPackage rec { name = "Term-ShellUI-0.92"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe82dc9d1d054..9edf6571a527a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -80,14 +80,10 @@ let else throw "Unsupported kind ${kind}"); in fetcher (builtins.removeAttrs attrs ["format"]) ); - # This should become part of stdenv! - sharedLibraryExtension = if stdenv.isDarwin then ".dylib" else ".so"; - in { inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; inherit fetchPypi callPackage; - inherit sharedLibraryExtension; # helpers @@ -11647,7 +11643,7 @@ in { propagatedBuildInputs = with self; [ pkgs.file ]; patchPhase = '' - substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${pkgs.file}/lib/libmagic.${if stdenv.isDarwin then "dylib" else "so"}'" + substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${pkgs.file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; doCheck = false; @@ -11669,7 +11665,7 @@ in { src = pkgs.file.src; patchPhase = '' - substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic.${if stdenv.isDarwin then "dylib" else "so"}'" + substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; buildInputs = with self; [ pkgs.file ]; @@ -24184,11 +24180,8 @@ EOF # Fix the USB backend library lookup postPatch = - let - # This should really be in the stdenv somewhere - soext = if stdenv.isLinux then "so" else if stdenv.isDarwin then "dylib" else throw "Unsupported platform"; - in '' - libusb=${pkgs.libusb1.out}/lib/libusb-1.0.${soext} + '' + libusb=${pkgs.libusb1.out}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary} test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py ''; |