diff options
85 files changed, 2237 insertions, 965 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index c43096deb293..c38cdddeb7a6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -224,6 +224,7 @@ havvy = "Ryan Scheel <ryan.havvy@gmail.com>"; hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>"; hce = "Hans-Christian Esperer <hc@hcesperer.org>"; + hectorj = "Hector Jusforgues <hector.jusforgues+nixos@gmail.com>"; heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>"; henrytill = "Henry Till <henrytill@gmail.com>"; hinton = "Tom Hinton <t@larkery.com>"; @@ -262,6 +263,7 @@ joelmo = "Joel Moberg <joel.moberg@gmail.com>"; joelteon = "Joel Taylor <me@joelt.io>"; johbo = "Johannes Bornhold <johannes@bornhold.name>"; + johnramsden = "John Ramsden <johnramsden@riseup.net>"; joko = "Ioannis Koutras <ioannis.koutras@gmail.com>"; jonafato = "Jon Banafato <jon@jonafato.com>"; jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>"; @@ -563,6 +565,7 @@ tv = "Tomislav Viljetić <tv@shackspace.de>"; tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>"; tvorog = "Marsel Zaripov <marszaripov@gmail.com>"; + tweber = "Thorsten Weber <tw+nixpkgs@360vier.de>"; twey = "James ‘Twey’ Kay <twey@twey.co.uk>"; uralbash = "Svintsov Dmitry <root@uralbash.ru>"; utdemir = "Utku Demir <me@utdemir.com>"; diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 4b5e7b3230c8..9ede74a54cd7 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -250,7 +250,7 @@ trap cleanup EXIT # If --repair is given, don't try to use the Nix daemon, because the # flag can only be used directly. if [ -z "$repair" ] && systemctl show nix-daemon.socket nix-daemon.service | grep -q ActiveState=active; then - export NIX_REMOTE=${NIX_REMOTE:-daemon} + export NIX_REMOTE=${NIX_REMOTE-daemon} fi diff --git a/nixos/modules/programs/nylas-mail.nix b/nixos/modules/programs/nylas-mail.nix new file mode 100644 index 000000000000..9a6cf755f2a2 --- /dev/null +++ b/nixos/modules/programs/nylas-mail.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.nylas-mail; + defaultUser = "nylas-mail"; +in { + ###### interface + options = { + services.nylas-mail = { + + enable = mkEnableOption '' + nylas-mail - Open-source mail client built on the modern web with Electron, React, and Flux + ''; + + gnome3-keyring = mkOption { + type = types.bool; + default = true; + description = "Enable gnome3 keyring for nylas-mail."; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.nylas-mail-bin ]; + + services.gnome3.gnome-keyring = mkIf cfg.gnome3-keyring { + enable = true; + }; + + }; +} diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index fe0c452d0672..846efc8b5b9a 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -225,11 +225,7 @@ in { User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.home; - Environment = "PYTHONPATH=${cfg.package}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.www}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.waterfall-view}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.console-view}/lib/python2.7/site-packages:${pkgs.python27Packages.future}/lib/python2.7/site-packages:${pkgs.python27Packages.dateutil}/lib/python2.7/site-packages:${pkgs.python27Packages.six}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlalchemy}/lib/python2.7/site-packages:${pkgs.python27Packages.jinja2}/lib/python2.7/site-packages:${pkgs.python27Packages.markupsafe}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlalchemy_migrate}/lib/python2.7/site-packages:${pkgs.python27Packages.tempita}/lib/python2.7/site-packages:${pkgs.python27Packages.decorator}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlparse}/lib/python2.7/site-packages:${pkgs.python27Packages.txaio}/lib/python2.7/site-packages:${pkgs.python27Packages.autobahn}/lib/python2.7/site-packages:${pkgs.python27Packages.pyjwt}/lib/python2.7/site-packages:${pkgs.python27Packages.distro}/lib/python2.7/site-packages:${pkgs.python27Packages.pbr}/lib/python2.7/site-packages:${pkgs.python27Packages.urllib3}/lib/python2.7/site-packages"; - - # NOTE: call twistd directly with stdout logging for systemd - #ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}"; - ExecStart = "${pkgs.python27Packages.twisted}/bin/twistd -n -l - -y ${cfg.buildbotDir}/buildbot.tac"; + ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}"; }; }; diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix new file mode 100644 index 000000000000..e1dee71fddf2 --- /dev/null +++ b/nixos/tests/ammonite.nix @@ -0,0 +1,20 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "ammonite"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + amm = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.ammonite ]; + }; + }; + + testScript = '' + startAll; + + $amm->succeed("amm -c 'val foo = 21; println(foo * 2)' | grep 42") + ''; +}) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 1fcfd5f2b60c..22da4ed50b42 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -43,4 +43,10 @@ rec { primecoind = callPackage ./primecoin.nix { withGui = false; }; stellar-core = callPackage ./stellar-core.nix { }; + + zcash = callPackage ./zcash { + withGui = false; + openssl = pkgs.openssl_1_1_0; + boost = pkgs.boost163; + }; } diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 3beb38e0d2dd..7f7c3f304c22 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -1,31 +1,20 @@ -{ stdenv, lib, go, fetchgit }: +{ stdenv, lib, clang, buildGoPackage, fetchgit }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.4.7"; + version = "1.6.6"; rev = "refs/tags/v${version}"; goPackagePath = "github.com/ethereum/go-ethereum"; - buildInputs = [ go ]; + buildInputs = [ clang ]; + preBuild = "export CC=clang"; src = fetchgit { inherit rev; url = "https://${goPackagePath}"; - sha256 = "19q518kxkvrr44cvsph4wv3lr6ivqsckz1f22r62932s3sq6gyd8"; + sha256 = "066s7fp9pbyq670xwnib4p7zaxs941r9kpvj2hm6bkr28yrpvp1a"; }; - buildPhase = '' - export GOROOT=$(mktemp -d --suffix=-goroot) - ln -sv ${go}/share/go/* $GOROOT - ln -svf ${go}/bin $GOROOT - make all - ''; - - installPhase = '' - mkdir -p $out/bin - cp -v build/bin/* $out/bin - ''; - meta = { homepage = "https://ethereum.github.io/go-ethereum/"; description = "Official golang implementation of the Ethereum protocol"; diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix new file mode 100644 index 000000000000..0146bad6f86f --- /dev/null +++ b/pkgs/applications/altcoins/zcash/default.nix @@ -0,0 +1,49 @@ +{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost +, zlib, gtest, gmock, miniupnpc, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent +, withGui }: + +let libsnark = callPackage ./libsnark { inherit boost openssl; }; + librustzcash = callPackage ./librustzcash {}; +in +with stdenv.lib; +stdenv.mkDerivation rec{ + + name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version; + version = "1.0.8"; + + src = fetchFromGitHub { + owner = "zcash"; + repo = "zcash"; + rev = "f630519d865ce22a6cf72a29785f2a876902f8e1"; + sha256 = "1zjxg3dp0amjfs67469yp9b223v9hx29lkxid9wz2ivxj3paq7bv"; + }; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig gtest gmock gmp libsnark autoreconfHook openssl wget db62 boost zlib + miniupnpc protobuf libevent libsodium librustzcash ] + ++ optionals stdenv.isLinux [ utillinux ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ "LIBSNARK_INCDIR=${libsnark}/include/libsnark" + "--with-boost-libdir=${boost.out}/lib" + ] ++ optionals withGui [ "--with-gui=qt4" ]; + + patchPhase = '' + sed -i"" '/^\[LIBSNARK_INCDIR/d' configure.ac + sed -i"" 's,-lboost_system-mt,-lboost_system,' configure.ac + sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am + ''; + + postInstall = '' + cp zcutil/fetch-params.sh $out/bin/zcash-fetch-params + ''; + + meta = { + description = "Peer-to-peer, anonymous electronic cash system"; + homepage = "https://z.cash/"; + maintainers = with maintainers; [ rht ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/altcoins/zcash/librustzcash/default.nix new file mode 100644 index 000000000000..4ce9a279d919 --- /dev/null +++ b/pkgs/applications/altcoins/zcash/librustzcash/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "librustzcash-unstable-${version}"; + version = "2017-03-17"; + + src = fetchFromGitHub { + owner = "zcash"; + repo = "librustzcash"; + rev = "91348647a86201a9482ad4ad68398152dc3d635e"; + sha256 = "02l1f46frpvw1r6k1wfh77mrsnmsdvifqx0vnscxz4xgb9ia9d1c"; + }; + + depsSha256 = "02qx8zdhmj7rmhqqq5q9428x9mlrjxxcnn4yhnygz9gfgvada2hx"; + + installPhase = '' + mkdir -p $out/lib + cp target/release/librustzcash.a $out/lib/ + mkdir -p $out/include + cp include/librustzcash.h $out/include/ + ''; + + meta = with stdenv.lib; { + description = "Rust-language assets for Zcash"; + homepage = "https://github.com/zcash/librustzcash"; + maintainers = with maintainers; [ rht ]; + license = with licenses; [ mit asl20 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix new file mode 100644 index 000000000000..c5a824cd17d3 --- /dev/null +++ b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix @@ -0,0 +1,29 @@ +{ stdenv, xbyak, gmp, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "ate-pairing-unstable-${version}"; + version = "2016-05-03"; + + src = fetchFromGitHub { + owner = "herumi"; + repo = "ate-pairing"; + rev = "dcb9da999b1113f90b115bccb6f4b57ddf3a8452"; + sha256 = "0jr6r1cma414k8mhsyp7n8hqaqxi7zklsp6820a095sbb3zajckh"; + }; + + buildInputs = [ gmp xbyak ]; + + installPhase = '' + mkdir -p $out + cp -r lib $out + cp -r include $out + ''; + + meta = with stdenv.lib; { + description = "Optimal Ate Pairing over Barreto-Naehrig Curves"; + homepage = "https://github.com/herumi/ate-pairing"; + maintainers = with maintainers; [ rht ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/zcash/libsnark/default.nix b/pkgs/applications/altcoins/zcash/libsnark/default.nix new file mode 100644 index 000000000000..9dd3f6886c8f --- /dev/null +++ b/pkgs/applications/altcoins/zcash/libsnark/default.nix @@ -0,0 +1,45 @@ +{ stdenv, libsodium, callPackage, boost, zlib, openssl, gmp, procps, fetchFromGitHub }: + +let atePairing = callPackage ./ate-pairing.nix { inherit xbyak; }; + mie = callPackage ./mie.nix { }; + xbyak = callPackage ./xbyak.nix {}; +in +stdenv.mkDerivation rec{ + name = "libsnark-unstable-${version}"; + version = "2017-02-09"; + + src = fetchFromGitHub { + owner = "zcash"; + repo = "libsnark"; + rev = "9ada3f84ab484c57b2247c2f41091fd6a0916573"; + sha256 = "0vhslcb9rwqab9szavyn856z4h9w1syiamfcixqmj0s908zzlaaq"; + }; + + buildInputs = [ libsodium atePairing mie xbyak zlib openssl boost gmp ]; + + makeFlags = [ + "PREFIX=$(out)" + "CURVE=ALT_BN128" + "NO_SUPERCOP=1" + "STATIC=1" + ]; + + buildPhase = '' + CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" \ + make lib \ + CURVE=ALT_BN128 \ + MULTICORE=1 \ + STATIC=1 \ + NO_PROCPS=1 \ + NO_GTEST=1 \ + FEATUREFLAGS=-DMONTGOMERY_OUTPUT \ + ''; + + meta = with stdenv.lib; { + description = "a C++ library for zkSNARK proofs"; + homepage = "https://github.com/zcash/libsnark"; + maintainers = with maintainers; [ rht ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/zcash/libsnark/mie.nix b/pkgs/applications/altcoins/zcash/libsnark/mie.nix new file mode 100644 index 000000000000..c92c113a27a9 --- /dev/null +++ b/pkgs/applications/altcoins/zcash/libsnark/mie.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "mie-unstable-${version}"; + version = "2016-05-10"; + + src = fetchFromGitHub { + owner = "herumi"; + repo = "mie"; + rev = "704b625b7770a8e1eab26ac65d1fed14c2fcf090"; + sha256 = "144bpmgfs2m4qqv7a2mccgi1aq5jmlr25gnk78ryq09z8cyv88y2"; + }; + + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + mkdir -p $out + cp -r include $out + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/herumi/mie"; + maintainers = with maintainers; [ rht ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix new file mode 100644 index 000000000000..c0b36ab93443 --- /dev/null +++ b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "xbyak-unstable-${version}"; + version = "2016-05-03"; + + src = fetchFromGitHub { + owner = "herumi"; + repo = "xbyak"; + rev = "b6133a02dd6b7116bea31d0e6b7142bf97f071aa"; + sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn"; + }; + + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + mkdir -p $out/include + cp -r xbyak $out/include + ''; + + meta = with stdenv.lib; { + description = "JIT assembler for x86, x64"; + homepage = "https://github.com/herumi/xbyak"; + maintainers = with maintainers; [ rht ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index a7ac2325eaca..98b8282b999d 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -95,10 +95,10 @@ ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ahungry-theme"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ahungry-theme-1.3.0.tar"; - sha256 = "1p2zaq0s4bbl5cx6wyab24wamw7m0mysb0v47dqjmnvfc25z84rq"; + url = "https://elpa.gnu.org/packages/ahungry-theme-1.4.0.tar"; + sha256 = "1n8k12mfn01f20j0pyd7ycj77x0y3a008xc94frklaaqjc0v26s4"; }; packageRequires = [ emacs ]; meta = { @@ -821,10 +821,10 @@ gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gited"; - version = "0.2.5"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gited-0.2.5.tar"; - sha256 = "186cyay7nk2khnhilrwzjipb3syxl0s4n96b48j9plaba48azz11"; + url = "https://elpa.gnu.org/packages/gited-0.3.1.tar"; + sha256 = "14ng63hxd6l76r8m54gzqq9j66cqz48ad1zaamn100h4b2rzf2q8"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1445,10 +1445,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170622"; + version = "20170703"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20170622.tar"; - sha256 = "0922lcbr2r7bkswljqzbm5y3ny1n67qfrmf7h7z9hsw2wy0505dp"; + url = "https://elpa.gnu.org/packages/org-20170703.tar"; + sha256 = "04rg2fldbsxizq84xl6613s8xnwyp8iwmxm167v69bc85xaf7s9s"; }; packageRequires = []; meta = { @@ -1651,10 +1651,10 @@ }) {}; rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "rnc-mode"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rnc-mode-0.1.el"; - sha256 = "18hm9g05ld8i1apr28dmd9ccq6dc0w6rdqhi0k7ka95jxxdr9m6d"; + url = "https://elpa.gnu.org/packages/rnc-mode-0.2.el"; + sha256 = "0xhvcfqjkb010wc7r218xcjidv1c8597vayyv09vk97z4qxqkrbd"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 55a6f691041e..708713e81812 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -801,8 +801,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; - sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; + rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; + sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1174,12 +1174,12 @@ add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-hooks"; - version = "20170518.209"; + version = "20170705.2205"; src = fetchFromGitHub { owner = "nickmccurdy"; repo = "add-hooks"; - rev = "f7a94ef1762ad8eb58d24c0857751863ea93cd5b"; - sha256 = "1j524wvl9l9hzahq8by9bnh745kg2z7l808ad9b0y0wx5kf17xlz"; + rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7"; + sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; @@ -1403,12 +1403,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20160721.2122"; + version = "20170702.2226"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "3ce72cf77cf5958d91b65bc4867cbacff968da74"; - sha256 = "0wiwxh6k2s48gpklhd9abbsr0ll73jzggwgq1lvm7gha203ji5v4"; + rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf"; + sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1487,12 +1487,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20170611.1031"; + version = "20170629.2153"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "e32d3908e40287648b3e88014aa9c2c977a9b715"; - sha256 = "0993zm6dn2k85pkyvwf63ccqc90z1s8b3qaqpxm9qprinimxff6h"; + rev = "24f2495ab209f8f00b7883285637e207b6f07201"; + sha256 = "1rg3gvlqq4jjpmj5k0pd1796c4qii3l595kdg0jvkf6vgf1544rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1508,12 +1508,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20170202.6"; + version = "20170701.751"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "1812abbe0079d1075525d9fb2da6fcfec7db3766"; - sha256 = "0sl2njnhm37cya06y39ls8p3zwpjwyv1pd7w3yfk5frz24vaxlcq"; + rev = "d1d19c76393ffe80fb11c6837e8582c3cb087d40"; + sha256 = "1gyjswlgbx5p1pq74qncrcjypkrfqd3dxm39bnbaszc6rhb58k8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1592,12 +1592,12 @@ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "20170627.538"; + version = "20170703.112"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "c491f5fa2267e7f8df180d7d125d9faeccbdea46"; - sha256 = "080xdw3jz687dfpg2ad7j35axagbnlz7bbrxxj018gh9b5hy3i1k"; + rev = "f155ce7e6984d8fe11831cd8a9f89828f5c5be43"; + sha256 = "1860ia7ld566f2z2pskvyi0cnfl20frszi4w5281px6y2c8g4zxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -4023,12 +4023,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20170411.608"; + version = "20170702.237"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "f2bedeeb5804a4863bb53aca6f77195f7d530c38"; - sha256 = "1p2l6zqls2c8v1ahn9rkfj6vvcsx1ymd0rd590scj8kqhjjyq3n7"; + rev = "228ed97d07d51e369eb6ad27bf408c5b3218a23b"; + sha256 = "0qrqlinjp57sd9a2k77cxqll1d97zi1f328nv3ghs8r9jrds7sj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -5094,8 +5094,8 @@ src = fetchFromGitHub { owner = "riscy"; repo = "bifocal-mode"; - rev = "e33923fd9970a6d46c9366264818abcb9856d6e4"; - sha256 = "07vkqgz45di0ccjs21psywx74ji9k0bbgix15k0nnav66fzv1i47"; + rev = "05d1076069d0a19292a38e835c32137e43ee9708"; + sha256 = "1fvr8vvpdd2xawv1j58wpxakbia31rzy513dakd78mlfkih2ixvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal"; @@ -5157,8 +5157,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5bd87be2c99196c5342de7ffd56dd9e703a7e400"; - sha256 = "10q6zwhp6501sl92p4ag9bp0awagbkn7757iy0ysprxnpc2ajznf"; + rev = "fd462e8aeaf858fec0bc63a41bd10ff8d445490c"; + sha256 = "0qk57jap3vs5rvj8hgajzk74v8mj73l975g8zgylcx2kniy3dvwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5470,8 +5470,8 @@ src = fetchFromGitHub { owner = "CodeFalling"; repo = "blog-admin"; - rev = "a7d3fa9317e9aa0b492e61b0706c4d9ca2f7a4b5"; - sha256 = "0ry1n53y1jz0gmijhypp84kaxkxn8g1pma74dwqmsy7f5ayhwi3h"; + rev = "98e397c4014f7c81c42722028778726cbf9baf8c"; + sha256 = "0fj0yri8hayqb6fwgj5i6bw7yx4jsdq7jh9aqd5zdpmyfc6lshzr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin"; @@ -5633,7 +5633,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170626.844"; + version = "20170703.1431"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37"; @@ -6445,12 +6445,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20170520.147"; + version = "20170701.429"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "d8dc80da12cc1e71fcf54b0f4deb8d229bc97beb"; - sha256 = "0zsf2qk41i1ay6h85d1ppj5qnzdrb9n09bzj9s9hk7ysag1rlqj1"; + rev = "b6deeffe032527696e32623b69bdf07b538a315e"; + sha256 = "0ldc26wpgx01i1sfy9kc52dh3lmy53dr3pxxrn841rb37yc4h1rh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6718,12 +6718,12 @@ calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calfw"; - version = "20170410.1920"; + version = "20170703.1704"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; - sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + rev = "bcfc0c546c3c58e1f635a9a29efdf56c9421a3ce"; + sha256 = "0n7kn0g7mxylp28w5llrz22w12qjvypa1g82660qr2d9ga9mb0v9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw"; @@ -7014,8 +7014,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643"; - sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; + rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890"; + sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -7056,8 +7056,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643"; - sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; + rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890"; + sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -7305,7 +7305,7 @@ version = "20170201.347"; src = fetchsvn { url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12262"; + rev = "12267"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { @@ -7929,12 +7929,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170620.207"; + version = "20170705.951"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "55a579f56a05d945e6ce5764002d2cadafa581eb"; - sha256 = "1lni2a9gy44xna62w6kfv678j8zk1dawwaqrbyn3mdy1s7d3mcj9"; + rev = "4a7b5ffc245be2b4285bed07f66ca88c5b4420a8"; + sha256 = "1k5zdw3cag9918kv51ph0jlg0wa0m4fbzl7yf3cvsfb78xf4apmd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8205,7 +8205,7 @@ version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "306591"; + rev = "307254"; sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk"; }; recipeFile = fetchurl { @@ -8675,12 +8675,12 @@ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "clomacs"; - version = "20170128.850"; + version = "20170705.719"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "0c7793b52166730a563c3318cdcb9f2b423bc675"; - sha256 = "1sj4awcz6xdk1lq7yz69d8v0d97alipc3avzmnby6lpm2pw1n45a"; + rev = "7af6fa717f08fda930641a27f3a07743c2042514"; + sha256 = "1diavwmjgaz0jxjbkzhlca9klqd7kmpih98clp8wiavhms80ykds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8847,8 +8847,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "e40e8f5c4216ac1e176342887d1af95965528344"; - sha256 = "0l45qjyq8x64l96mikrpnbnw1919a8l8lrs40lzca35b429sbyqq"; + rev = "8bc93cdd797e6396040bd00eee877734af0d3759"; + sha256 = "1b92ba67dkihyixd1p2pkaqcgr39gf64vka1sbbx2fcwczyv3q32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -10053,8 +10053,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "beae6bdcc6fc300059038961b7a3e977e0fb7c61"; - sha256 = "0fhs17v2x24nhs0kd2yjzr56jni2767yrjxims6phsaxs9m5aih2"; + rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05"; + sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -10395,8 +10395,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; - sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; + rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; + sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10915,12 +10915,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170628.1034"; + version = "20170705.417"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74"; - sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5"; + rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896"; + sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11066,8 +11066,8 @@ src = fetchFromGitHub { owner = "AdamNiederer"; repo = "cov"; - rev = "158d6bacb0986a27aa90a5b6dce81ae820b62cef"; - sha256 = "1n510afmaprwlv6hck2kc9myvj9wsrspqyjzj5vql1y9c6w1xhsc"; + rev = "519239cc37d3ad0204fecac99f42e1694ce57d3d"; + sha256 = "1kb2rmxx91q4cwm1npzyiykwg5jxhhz7waykh5vqxr5y81hr5nza"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov"; @@ -11981,8 +11981,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "20256403e4d81b7eea1165bf78b8faf8502e8204"; - sha256 = "1njxnzss34w6wary9icj7vsazhmc9bz3ix1qf3bjacbi1n5q3k2c"; + rev = "749d07b9c1eee8751c690967dc48bdd11c0cfc06"; + sha256 = "0h51h7c19ncb3a6q4mgkq06fdc4q64s71z4a9rwwxk7kqs842hwg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12124,12 +12124,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20170628.811"; + version = "20170702.1007"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "7491ab2dfe5d0200f32cb3100671ea4db419dffe"; - sha256 = "1bnhybals3b6bfngsqyksdp8n3kdar9ihffc5ppc77rvvjcl7p3w"; + rev = "f4de0fa84bec756ea31419f8db0b900fd1603c83"; + sha256 = "1wzwiahab6r8y772mg6268sh7l3b1fw4hxl10d38qv2khy641vlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12334,12 +12334,12 @@ darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20170528.2201"; + version = "20170629.1848"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "e5e2433fccb225b347c84c3bba5e3ed9769c2922"; - sha256 = "0l3clqy9zrd8xbaacx7ck8kw1x6rl1b9vd5ss57wnqpsdz25nggi"; + rev = "475fd1b583958d40b1cba6cfaf4ccfd7d5ca8f18"; + sha256 = "1w2jsg5nyms6iz02digwj96dry926hs0d2c9pi7y252zifhldkdp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -12628,12 +12628,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20170610.1729"; + version = "20170705.533"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643"; - sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; + rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890"; + sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -12731,12 +12731,12 @@ decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decide"; - version = "20160314.1248"; + version = "20170702.1617"; src = fetchFromGitHub { owner = "lifelike"; repo = "decide-mode"; - rev = "f243afc7cff11d9696552695e2dfc0ca91e1c5b6"; - sha256 = "05n57djagbkm8im4168d5d2fr2ibfnckya7qzrca1f9rmm0ah15j"; + rev = "90133687118c236142b8110571c463304b3192f9"; + sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide"; @@ -12960,12 +12960,12 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20170126.739"; + version = "20170628.1503"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "f61f336c8c291208d9feef2ce495e8c659052f77"; - sha256 = "1wb7n4k2qwl3m7y22zag6rdzi1gqb8a5lj7crpkkn5ryycbxbbpi"; + rev = "1e8b42ff6479fa541eeec5699b4727af136d40da"; + sha256 = "1x9crsc8n5pqyp60h46gz6wz98qaj3bygk11vd39qpfh2hxdxxi6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; @@ -13731,10 +13731,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20170623.1621"; + version = "20170630.752"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "14lkdkk6z2zx0rvz8vnhz9a7i87irm1a5wc3q39wmf8q5vh32pkc"; + sha256 = "1jl14z15ilkwl45xv34akabnx4430siqkjv14sqi33g3qmnln90y"; name = "dired+.el"; }; recipeFile = fetchurl { @@ -14843,12 +14843,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170615.437"; + version = "20170630.922"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "55d2f8eb0b6ed6a1964741c61d898c97ed934b7a"; - sha256 = "0wbhjfiidl1fbxhdrpk9f7wc3kvb4nshwzfxd1vrgpx48kaiahgb"; + rev = "dc9c0b938ea0bc7a30a79fb74f2e66f1fb2128be"; + sha256 = "04wwv3pps4kwld590x5gwif69izcbapp0y4w3i4nsc88ld08sp96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15278,7 +15278,7 @@ version = "20130120.1257"; src = fetchsvn { url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1800204"; + rev = "1801041"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15903,12 +15903,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20170605.1440"; + version = "20170705.2343"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "4624e67ca26cb348063a97a8f59a3fbcbf8a5736"; - sha256 = "0ds11hphxp8jxsc50lvnr9n4macvzd82y7siqh8wvswk62l8vb4x"; + rev = "a6356007a58dc72636ab94c89536c621f089bb0c"; + sha256 = "00qcq1bs8wyxj9cf2jy691ddddz0v5czwn92x40nc43a7qi0a9h1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -16346,8 +16346,8 @@ src = fetchFromGitHub { owner = "stsquad"; repo = "emacs_chrome"; - rev = "0a50fbb524fe256560f481701c000309c627b9ca"; - sha256 = "0ssmhwg4wfh5cxgqv8bl55449204h4zi863m7jhvas4c9zq005kd"; + rev = "f7cf37c3f605812d429fd90699d6d33f6ac9db8d"; + sha256 = "1i4fvw7703pr505mzspkc7sphh3mbg4pvbpfcr847lrg66pdw419"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server"; @@ -16763,12 +16763,12 @@ el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-get"; - version = "20170112.2204"; + version = "20170701.1607"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "f7bb3855b2393f667f597d30775749faa5038cfc"; - sha256 = "0i89fmn8k3p3qciqq2vhbl86mn9s9l0hinn6kgs637v0fanyahsd"; + rev = "3925f0189d99c6cddbe19831c2020f97adcc4933"; + sha256 = "1lzmhfhwfnkpcbkvkl5vzfjv3h7wb85y9j98wrb3vlydbc9735dw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16847,12 +16847,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "20170513.2050"; + version = "20170705.1739"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "22682dd020ac93b621bf45e57c738e551e2cb14b"; - sha256 = "1hv9i78fchvmygmb7pfx1ybkq270aibdhjsidzskipfzw40p0dz2"; + rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c"; + sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -17013,12 +17013,12 @@ el2markdown = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el2markdown"; - version = "20160822.1135"; + version = "20170630.1158"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "el2markdown"; - rev = "712364b9f64d2f6501a069e1bfed207de0237881"; - sha256 = "12l50k56h1aiwmvvxrka3y1i82sv5xc7vn99z3y3kl31yl3g6382"; + rev = "368d99313683cd943c99feaffca356be60bdb636"; + sha256 = "1h0cr8qcvj9r3acb6bf5nyglvi5gdglwflkfl5jbzp0nm1p9iqcg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2markdown"; @@ -17221,12 +17221,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20170531.206"; + version = "20170703.1849"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f3eaa7421af79db3d4203b4b3afdf84c4796cd55"; - sha256 = "1sji0k8kal1h5nsdin54qbnxc2ahd6qghn4nwwq5f13gacy4wzpg"; + rev = "d02bdb074046ba07774e3ce74a7a22739f01c3a6"; + sha256 = "1ssf692hi3l5bq8fdsj1nm25ng3x0vqi87fpw34dzmvgbg2jk6ff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17295,8 +17295,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f3eaa7421af79db3d4203b4b3afdf84c4796cd55"; - sha256 = "1sji0k8kal1h5nsdin54qbnxc2ahd6qghn4nwwq5f13gacy4wzpg"; + rev = "d02bdb074046ba07774e3ce74a7a22739f01c3a6"; + sha256 = "1ssf692hi3l5bq8fdsj1nm25ng3x0vqi87fpw34dzmvgbg2jk6ff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17753,12 +17753,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20170613.1339"; + version = "20170701.1412"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "4970cbb55767e5f31913b21fb1ae733b6479ccd0"; - sha256 = "0v0gw8ba073k6n48vrksp1bkrsh0fyg7wmc0mpjf13qcbcwn3ydd"; + rev = "6b654b5fdc4e8f09cd842a0dde83ded284223c2f"; + sha256 = "02z965inkp3bxg9nyqscjs14dfzx7s18s3kx7ry50j2yi0iki6rg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18841,12 +18841,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170625.617"; + version = "20170703.505"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "e70a39d6e079dc1f818ad49d39c328fd3d9df1d9"; - sha256 = "08qm2vbdimbmwhz4zdhc2kypkk8c0vhw8ihl5z8l9yfq4nw2wrc7"; + rev = "4a253e1c24bfb993ca115dac7c9c03189fa0f7cc"; + sha256 = "1vkihm7m5zpcyyr418661gfpdwixqzyrbp2vlhf6vd7i26ik3i8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18954,12 +18954,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20170301.856"; + version = "20170702.59"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "deb9affaadce11c356df53b6b62ab376ef652d16"; - sha256 = "1515gv9bhjwbmkbz6sivq5zhpalvfb0ias4qia9anz9npqfx24y0"; + rev = "d9c43561d8d50066c1774e3cf3df12e168c9fc92"; + sha256 = "145zn11l9i0lmjr83zvn8snviqqn6kw24dm5ihlllgxycclsvcrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19482,8 +19482,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "e629ff20dce103b4c38ee3a654c9b4a83867d41a"; - sha256 = "1x34b7f4xkpa6w5gllvz7cmlnvvyy474gscbxvypszdf4ynxpcv1"; + rev = "9e9ad191ce49eb410c7a95a8410122eed8049755"; + sha256 = "06iyy74hpnc9aqrgbwndx1shvdq05z8hys9siv4ng13725cfpj0k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19645,12 +19645,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170608.1234"; + version = "20170705.1947"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "3752438d17c45553956cf775022b2358ff3d8731"; - sha256 = "0a2afjg0ygd88qp5pc39ghwck837f6sk57c8zbcsyxwrabxnchhd"; + rev = "61a8bf7d6cc6881e5555922eb36eecc6733a2b87"; + sha256 = "0anc7bdar2q5c41ilah3p04p4z3mxkqlv91nkky72i58sgrw6za6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; @@ -19750,12 +19750,12 @@ esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esh-help"; - version = "20140107.222"; + version = "20170702.1912"; src = fetchFromGitHub { owner = "tom-tan"; repo = "esh-help"; - rev = "3dc15f2f6086d4e4da977468fda67229a859c927"; - sha256 = "1yfvdx763xxhxf2r6kjjjyafaxrj1lpgrz1sgbhzkyj6nspmm9ms"; + rev = "03bf6fc7ef9ac46304e37524fdaf7ebfee317695"; + sha256 = "049nvd63jns3fawimwx9l7cbqw2gw84f8f9swpwd0a8z449mlj2m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help"; @@ -20439,12 +20439,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170624.1221"; + version = "20170704.1409"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "cecbcfbdda16653e3b5ddc7de2eab25537ec154b"; - sha256 = "0s6g822m19dq557ax42vwvgd017qff8hdajdjb03bfp2gd2zwb66"; + rev = "a375ac8aea43980dfa60525c7585be64896e42d1"; + sha256 = "1b3j29d4ppbgfg15vfyxz7rpjppqma9am3hk57qxq08n5y3skaxf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil"; @@ -21342,12 +21342,12 @@ evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20170623.1221"; + version = "20170702.302"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "dc62ac317fd29f018e9785c1b3b7dd7ad57b3938"; - sha256 = "18j33smlajj7ynigfgm64z3kfys5idbxin2gd93civ2564n85r33"; + rev = "c50372d152b123fbf7bc26b49504505a22e82635"; + sha256 = "1xvpjs91wr351gl0xb3fbbm4yhv2rcgbqcn8srw022a2snhrdw27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -21884,22 +21884,22 @@ license = lib.licenses.free; }; }) {}; - exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: + exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20170628.732"; + version = "20170706.408"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "3b9367779653635cf5e0ab1554b9709b109859ed"; - sha256 = "0802az9ywfjmainj1is335ni1dm8hfrj3rabhmhwjsa9h0crh5f5"; + rev = "c73155257a3248d30a9f602de8247ac3e32ba400"; + sha256 = "1bcmrmyx12g11laz9f994vhmqyv1g0qvmp0sbh07nl1q42xy86m6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3"; name = "exwm-x"; }; - packageRequires = [ cl-lib exwm swiper switch-window ]; + packageRequires = [ bind-key cl-lib exwm swiper switch-window ]; meta = { homepage = "https://melpa.org/#/exwm-x"; license = lib.licenses.free; @@ -23553,12 +23553,12 @@ flycheck-clang-analyzer = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-clang-analyzer"; - version = "20170623.446"; + version = "20170704.2333"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-clang-analyzer"; - rev = "4c7d24a6a20ef528ee4ac28e5f783af6732b639a"; - sha256 = "0ncp9jwxf1lqxzpxz6ivn4qhg6bn318ykmfrw4jp1iz73qxx0kh8"; + rev = "a33752224cb1da13b35d0d60b2017fe73d167781"; + sha256 = "1f6nb92fg1lgf4xz8x1i61njwnqrab94p88kliaa7g9r4hfhgv8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8de7b717a1b0caf30f8f29d3e764b4756b93aeff/recipes/flycheck-clang-analyzer"; @@ -23658,12 +23658,12 @@ flycheck-coverity = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-coverity"; - version = "20170520.825"; + version = "20170703.1759"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-coverity"; - rev = "fb8ef7b07ca17681b72272331d43578f30405bec"; - sha256 = "0068wzh2fyrbjn5gvfyf1kpfppfw49mnwkd0n046nhjgaz9y1lc7"; + rev = "cb211e3dd50413a5042eb20175be518214591c9d"; + sha256 = "17c5lppa5axw6wga3k8zqmn5f2syadlqbavrqgsi8k8nlcckxy1x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55e8df91adbcf8b059096e02aba2781424250381/recipes/flycheck-coverity"; @@ -24523,8 +24523,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; - sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; + rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; + sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -26355,11 +26355,11 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20170627.1447"; + version = "20170705.1534"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "7a9817aeb69f503cb8433510db59a2f110cd7f43"; - sha256 = "0y755v2bv9lq9sban6in49d6kz7cgz3hyg4mpns53ibiqc0jf0sy"; + rev = "1eff2b3dbcbe6d8518a5ec42207b5578dbe93530"; + sha256 = "1nr5s98xss68scmbzrfmdn1ri4hfny6317j6bhksxqnd6dr6za8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -26480,12 +26480,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20170623.756"; + version = "20170705.1240"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "9e2a79856fd07fdad91113c9eb10566193b74586"; - sha256 = "0a395l9kvx1flyzfp2npsz4izww4kqkj3sby3fv5knrhd4dz5jdi"; + rev = "8e3b72bcf26b992546d794b10b96d05ed01f0a73"; + sha256 = "1y2y701ks3fd6khls4i30b906akxqj3l1c15nbblp6xl07bznxw9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26810,12 +26810,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20170411.1021"; + version = "20170704.1044"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "41059d6295dbaa207b2203fb6b78003de4888714"; - sha256 = "19ri8q3wbpw3vsw2iq1ym60gk0j4f9bniipiddrjqqirhcns8zzq"; + rev = "49a9e902e404d030e4b4ad22f75548a1b855a8fd"; + sha256 = "0xf0y4qp2cf3zzx8azh8jz4qpqdgp67y445sk8v9g55ns118hv77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -27125,12 +27125,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20170614.840"; + version = "20170702.512"; src = fetchFromGitHub { owner = "tarsius"; repo = "ghub"; - rev = "efdc28e3d27dd0847ceece593ecd1e9ed3287c9f"; - sha256 = "0vh6y36b219vg2iwxbcdkdsnpnmb4kkvr9pz2kgiayyqrmz3ck37"; + rev = "16c3300bb5d82b141aefa94c47ad9f97a58b0011"; + sha256 = "1w1cqz32rx4i4hcjkz2znlchp5h4xg74znm9819k4anlf635lshd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub"; @@ -27339,8 +27339,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "524ee09dc4312c52bd8c23c13b18bee23f15bb53"; - sha256 = "12294qy1v7h0lcgmc8x53nzw0iadjifwn0lqzqmbpjny4yns9h2n"; + rev = "b8d558678821e35450c19e415656e366ebe44c38"; + sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27755,12 +27755,12 @@ github-modern-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-modern-theme"; - version = "20170624.2230"; + version = "20170628.2332"; src = fetchFromGitHub { owner = "philiparvidsson"; repo = "GitHub-Modern-Theme-For-Emacs"; - rev = "4bdcaf765d87995be99e15775fe313fe98c3ee57"; - sha256 = "1lkbx06dgwc19h9bxxwvqqwwdpy0dm8djazvzbsxw0x200cx2j2m"; + rev = "1890ab87ca8a046b3fc7b54220647d9ef43a6780"; + sha256 = "00jw2qf4x943sib0j6grcmm3lfr0ac23wa3vnzjzc509v4l7jzwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5506d93bd8cf59cd281091b377c1bb9a4243666/recipes/github-modern-theme"; @@ -27839,12 +27839,12 @@ github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-theme"; - version = "20170624.2223"; + version = "20170630.1501"; src = fetchFromGitHub { owner = "philiparvidsson"; repo = "emacs-github-theme"; - rev = "99dd601d7f80893d42531510204f8115ed27f32b"; - sha256 = "03gnwg482m8mhhfdi7jlinyjwwv4l3jf8s84spkl4jl4d97brk04"; + rev = "29f00a51d949a248a5f6355a97131e216747c797"; + sha256 = "16ldfz1k0hxc1b785gzrf70hg0q88ijjxp39hb62iax1k1aw9vlw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme"; @@ -28324,8 +28324,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "beae6bdcc6fc300059038961b7a3e977e0fb7c61"; - sha256 = "0fhs17v2x24nhs0kd2yjzr56jni2767yrjxims6phsaxs9m5aih2"; + rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05"; + sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -28870,8 +28870,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "85799e8cd3040b960e4dcc544cc9bb7c9cd716c3"; - sha256 = "16khvjfiv4x1rghac2d970875w6jyg2fl7pbj801q0ia5cm7cxz8"; + rev = "d75bd35c8fd1c32aab86ea47e7ef4d3c776faa0a"; + sha256 = "0s1q9qw6azzbzr7k4c58m6d83cbz3srn63mi73jlh5fmad1w8g4p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -29137,12 +29137,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20170316.1124"; + version = "20170629.1129"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "af03c6dfde43f6f6d39a1363267d591cf76aab66"; - sha256 = "1adgg08bsi8p03a6rpc1a23dxvrikc37zcljrdyc4j2z8ci839x4"; + rev = "eecdf6b7aaed40a71eff13c44456d63127e494bc"; + sha256 = "1y7dxd40w5zkp59m0n1ybf128zhpi2wkjbw5v5w0ps7nx782dnzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29267,8 +29267,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "525f899f69623828d75f0e744250316f27ed02a6"; - sha256 = "01711l9g64d6sxhappn8cpxl315cprc3a5dnbkgm0vsaas6kl4xa"; + rev = "2f63009220e9b13516696396a8bf1a5be4757e33"; + sha256 = "0vkfvpggdwp6xnz0c7kgfkrlv53v2h4hxdx75nsfnycm6wm9m3v7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29502,27 +29502,6 @@ license = lib.licenses.free; }; }) {}; - gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "gregorio-mode"; - version = "20151026.720"; - src = fetchFromGitHub { - owner = "cajetanus"; - repo = "gregorio-mode.el"; - rev = "5b618a8d05cc073bd8e6f1e4e56eceb4de60eab3"; - sha256 = "1670pxgmqflzw5d02mzsmqjf3gp0c4wf25z0crmaamyfmwdz9pag"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/81317d4ad793d8a58770844ec9a526a2c695f94a/recipes/gregorio-mode"; - sha256 = "0f226l67bqqc6m8wb97m7lkxvwrfbw74b1riasirca1anzjl8jfx"; - name = "gregorio-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/gregorio-mode"; - license = lib.licenses.free; - }; - }) {}; grep-a-lot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grep-a-lot"; @@ -29648,12 +29627,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170628.1209"; + version = "20170705.815"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "525f899f69623828d75f0e744250316f27ed02a6"; - sha256 = "01711l9g64d6sxhappn8cpxl315cprc3a5dnbkgm0vsaas6kl4xa"; + rev = "2f63009220e9b13516696396a8bf1a5be4757e33"; + sha256 = "0vkfvpggdwp6xnz0c7kgfkrlv53v2h4hxdx75nsfnycm6wm9m3v7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -29711,12 +29690,12 @@ gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20170627.215"; + version = "20170705.1636"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "1e41219fce47a8b5201de98f954e7040b4eea980"; - sha256 = "0yaw60pny5q63ljn4pwx316rix7385rycvyiakcn7zfd00nwnvdh"; + rev = "fff195715b537ac6f13b89034c232a8f33bca45e"; + sha256 = "0l5iwxj0ahn3r2sha4045lwlqi4s8070p1rbiw5fmad3v66i3m3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -29858,12 +29837,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170628.747"; + version = "20170702.724"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "f4b0d8d83bad30b99a919639b387189350c6fc62"; - sha256 = "0cif4d4n0l5apfksg67zsavh6wrv2pcpq2r0m8zjfg48hv6qmsad"; + rev = "8d07a89736b72021b1a4739a0811f716a61b0b8f"; + sha256 = "0mjcjzsbqnc83ca3wg1wxsz63a864gmhflvx47p97gdg1snnz5fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -30362,12 +30341,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170601.2103"; + version = "20170704.1445"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "7eb94b5a5d9478a0da869bd26ba51d08e574d843"; - sha256 = "1bj077gpg2xzzjcriv9zixjqalppv0ya5s3bpxn2w93jkzxa9xd5"; + rev = "00ca4d935e80707e18c17e40630ea9e36b39592c"; + sha256 = "049q8igjx4y9jancqv0bibd2jhz02llm1v6xfl9379v5p6nkfm3b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -30631,12 +30610,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170627.155"; + version = "20170705.2232"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "9d840649dd08f0c417add55c3b434d34f4b381a1"; - sha256 = "0az1a95drpcmzkqn0jw9kc9kjbz7wbgphzrwcag4rg8ljkn7q80r"; + rev = "f0bbfb828320c95992d6fc593be849f522cde0cc"; + sha256 = "0i5x4y2z3k40zm0brjjvzb4qkxncpx13xxx0f3pjl34h446b0m46"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31240,12 +31219,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170622.1355"; + version = "20170701.629"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "9d840649dd08f0c417add55c3b434d34f4b381a1"; - sha256 = "0az1a95drpcmzkqn0jw9kc9kjbz7wbgphzrwcag4rg8ljkn7q80r"; + rev = "f0bbfb828320c95992d6fc593be849f522cde0cc"; + sha256 = "0i5x4y2z3k40zm0brjjvzb4qkxncpx13xxx0f3pjl34h446b0m46"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -33049,8 +33028,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; - sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; + rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; + sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33343,8 +33322,8 @@ src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "89a7564edc6b23ffba52b02353528b9b6285c729"; - sha256 = "1fqyhx6cnigh40bgzm745cx47zc6mm8rwrz2ym0vpb5bnng6j4m1"; + rev = "a4c267aef5a3344bd4d76b6b6cf13e120cbe002e"; + sha256 = "13r4s6k0yxp3z68756sni27l7lmlfhdz3hx021w7lhn4np69i299"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -33610,8 +33589,8 @@ src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "792e340352b3ddc579e34d8d6ffb4219bac5cbeb"; - sha256 = "1af9xkzmn84374kr0czlivzxxfay35l2pw8rp7nkr0w0kjhmmxmr"; + rev = "da7d479c89090155996bf568bd89fa8a8859eac7"; + sha256 = "1vpfb6n1k7j8wmzsn3j2a8g2hf6lxc8jp77xgzi3kd0wwdyjmqg2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -33690,12 +33669,12 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20170627.22"; + version = "20170702.1915"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; - rev = "235264a99435552ebd57c0a7784ec0c500b7966a"; - sha256 = "0j3z1zabzc2mmlvzzp21pmfv03p5lf0cjf0xadiy5df2z2xnrmfa"; + rev = "201c795ded01d96690ceadc1dd068744aceaeda8"; + sha256 = "0rj5lcmlghxm4d1vx8jxdhw53famzjxzp1bx38zgrqlhwakyghab"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; @@ -33913,12 +33892,12 @@ hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; - version = "20170617.1126"; + version = "20170706.552"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "e71c2970dc4eb90e5473f7a038e7ccba4dac6c36"; - sha256 = "10mlbz3xlbvka5bw5cxymbha5vkkbb9sfziwxgfx5bwrhjp6n90z"; + rev = "3f5d0d932fb6d2152f4c269df10bcc435a5ac764"; + sha256 = "1qj2sf3x2bq54n0xqllis3abikjgbp18qn1i4vff5cs6n2an69cb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -33933,10 +33912,10 @@ }) {}; highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight"; - version = "20170223.743"; + version = "20170702.732"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=145"; - sha256 = "05dsa2sfciajwagm1gzl3v2r199nl1yjnb6l0v8ria3f9d72yj5j"; + url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=149"; + sha256 = "0kh72fmqsha25rz0g3ff983badh20clsig7blrhvl8c4bv3sqs56"; name = "highlight.el"; }; recipeFile = fetchurl { @@ -34470,12 +34449,12 @@ historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "historian"; - version = "20170416.2154"; + version = "20170630.1054"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "d5e4283d2fc06445d2cd14d9d2e86ca41b9f718d"; - sha256 = "0am0xjvk77bvppgx90knxicq3nw1ia68gplyqw9lqw62qj4028ip"; + rev = "99e282bdd8994cb4e23185d9004b2cb42a214927"; + sha256 = "1vscfy63nzzv68vpiqdpg5y9mip8hcxwbpsr5zbvcm9dz7r0vvkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian"; @@ -34737,12 +34716,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170623.1400"; + version = "20170705.1355"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "24fef866f5aaee475da845145a516b3c368fde81"; - sha256 = "0h3pn079i2vj9japba7wbsfap5s5qjglvvbmncmgjd26sl4q4hr0"; + rev = "67d52175fbc5a194367e421a33ff4359a0ee016d"; + sha256 = "11l13j9j3bh7p1hprlpvjc8ir8643d7px4a89rpwa2m70z9v0skp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -35572,7 +35551,7 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20170625.1911"; + version = "20170704.1507"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1087"; sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp"; @@ -35779,12 +35758,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20170601.559"; + version = "20170705.1656"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "595ca2ecb33a300640dc6a7b420a6f51c51a9d40"; - sha256 = "0wqag8kk4wg036sw2j5jiymadij066nz9blxm805lgzsndqg5gfm"; + rev = "e8c2716cb38067d23f35666be83323267e692618"; + sha256 = "02xyrfw219nfww0rf3qyn43sxk7c9hi9agq7l23dzq7rq25r6qjd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; @@ -36094,12 +36073,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20170530.1839"; + version = "20170705.1656"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "595ca2ecb33a300640dc6a7b420a6f51c51a9d40"; - sha256 = "0wqag8kk4wg036sw2j5jiymadij066nz9blxm805lgzsndqg5gfm"; + rev = "e8c2716cb38067d23f35666be83323267e692618"; + sha256 = "02xyrfw219nfww0rf3qyn43sxk7c9hi9agq7l23dzq7rq25r6qjd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; @@ -36178,12 +36157,12 @@ idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: melpaBuild { pname = "idris-mode"; - version = "20170628.1231"; + version = "20170703.2038"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "e4347cfb75e4efdb43b52b01bd759c84aba84804"; - sha256 = "0m26xwp0gysawf7dzx2k70hlxky0qbfpxqfs7clb17dv1i7ixa6y"; + rev = "7de2809515cfb413a7be5fab71d6814d2699e1e3"; + sha256 = "0v6as33dpqmggmprpimv5rrm7vpfakka5hszz5f5p2k5v212yvk8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -36675,12 +36654,12 @@ importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "importmagic"; - version = "20170601.1828"; + version = "20170702.1844"; src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "41f90782b7d5c58f53ad0187b816faeea408e4cf"; - sha256 = "1w73734n8qwhvina1y9m60b5jj5yy1csizbldyph4vcgi3x0ff6l"; + rev = "ab9e5c260a2044578597a467eff59e5598a7ef1c"; + sha256 = "1ifv6zfrknivjsgk0p8wh0n2bqqs1zfy8551216dfvigqs20wvq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; @@ -36801,12 +36780,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170620.808"; + version = "20170705.305"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "74e84231ec9565c4420019b913e3f16521dea542"; - sha256 = "1lmvdmcy47swgj1nqhq91w50fh9iz0zwn06ygns1z06s9gcqc6sm"; + rev = "9fa8f37a7be33337ab0e865b1718bbb81eea295a"; + sha256 = "1h6637sa83jckswp81682yis5srhaj02r6ycxzcc1ngfap3mkks7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -37302,12 +37281,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20170211.807"; + version = "20170630.22"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "822ae2d29aaf92bcf96324442126b551e4477d6a"; - sha256 = "0nq2f6pgq4vszy3hx84qdml4i9lbqlrh9knqgwgrl819vr15srqg"; + rev = "2c0458038bf0440f271f6e000039027be411eba7"; + sha256 = "0rpw1ms80hr01s76av8cvid4gvkd3sapx0c3g3a05za0bq1jqacw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -37884,12 +37863,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170623.1108"; + version = "20170703.2350"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74"; - sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5"; + rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896"; + sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37947,12 +37926,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20170605.2046"; + version = "20170704.1238"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "117369f882f81fb9cc88459a4072a2789138c136"; - sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f"; + rev = "b0407466a1e6dc23150663757f6b48e14cc5290a"; + sha256 = "0wapfnz7l32qc93xbx64bd42v4b4dav3288ij3pc7r03r4by02m4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -37993,8 +37972,8 @@ src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "d5e4283d2fc06445d2cd14d9d2e86ca41b9f718d"; - sha256 = "0am0xjvk77bvppgx90knxicq3nw1ia68gplyqw9lqw62qj4028ip"; + rev = "99e282bdd8994cb4e23185d9004b2cb42a214927"; + sha256 = "1vscfy63nzzv68vpiqdpg5y9mip8hcxwbpsr5zbvcm9dz7r0vvkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian"; @@ -38010,12 +37989,12 @@ ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "20170609.938"; + version = "20170703.2350"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74"; - sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5"; + rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896"; + sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38098,8 +38077,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; - sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; + rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; + sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -38764,12 +38743,12 @@ jemdoc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jemdoc-mode"; - version = "20170611.1536"; + version = "20170704.1327"; src = fetchFromGitHub { owner = "drdv"; repo = "jemdoc-mode"; - rev = "0b09b0368acf3b90c9b58274ff8c2a1e77d1d5e1"; - sha256 = "094smy6n30lwgldg958z387dc0nzjvghlai5xpxc5q2i1gjjqh78"; + rev = "529b4d4681e1198b9892f340fdd6c3f1592a047a"; + sha256 = "1f8nn8mv18q3x3k32i6kjis9f3g1ybdjcfaw8hywqwy6k8dr734m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49a8c0f885df0b91d758b4d7c92bd67368da8a56/recipes/jemdoc-mode"; @@ -39203,12 +39182,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20170525.544"; + version = "20170703.314"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "6ee315825b6f0424f15a8520733dc145c85ccd83"; - sha256 = "14ykvbj5f9w5pk8l73k8niwr62slfx956px35zn51563sjs55gnd"; + rev = "01a8d98958b8c546a6a9eb3b339a1dee864684fa"; + sha256 = "09pap1r9aiif8rmmzpw01154iravsmqw8msbdrxgbqlpndcaqnmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -40274,8 +40253,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "aaca07b200702a6b40e0016556f8d3683fce6bb0"; - sha256 = "1rg3n0bp8f2bz6rcf01656hvv7mn3a7wr3hc1c7j0830a1d7nn2w"; + rev = "ae8f3a2dfccdf4495c137163e5e68b9130fee34e"; + sha256 = "04nik71cd3cnx41rz0nhwkk41nx7r0x63ldf4rihz6q1h43zxpzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -41044,12 +41023,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20170616.2223"; + version = "20170702.200"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "0e577560f0c01f9e4bbd5280edf113020e65c3f3"; - sha256 = "01ndc6llqfdz8x64k5c1bjvvx47nd2dag4fn48xfsb8vrpnp78i2"; + rev = "9dca096255f7ca92ff887d70b6c4c67ce3374ff1"; + sha256 = "0k63sad7w1gym3l5p0hfnwjhj8a0ic59z6g1zf3j10752439bsx3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -41989,6 +41968,27 @@ license = lib.licenses.free; }; }) {}; + livereload = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, websocket }: + melpaBuild { + pname = "livereload"; + version = "20170628.2350"; + src = fetchFromGitHub { + owner = "joaotavora"; + repo = "emacs-livereload"; + rev = "1e501d7e46dbd476c2c7cc9d20b5ac9d41fb1955"; + sha256 = "1z1v2panxrqpam5ysnilx83y6b4dwxmxqhmbgjwfyd1bdmr4iya4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/330731804c442226fa2faaa3da408e9253a1c051/recipes/livereload"; + sha256 = "1z0dbg82l6znz1b03v19a8fnq6b1smikpvaplpxlgny82xrs9als"; + name = "livereload"; + }; + packageRequires = [ emacs websocket ]; + meta = { + homepage = "https://melpa.org/#/livereload"; + license = lib.licenses.free; + }; + }) {}; livescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "livescript-mode"; @@ -42037,8 +42037,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "a143b4a4f33d548f126e7d212e91b7742fe1af18"; - sha256 = "1nl9sq71dsny6hm4bd9bh1nzxx4iqd7a91x2lyyjlfnnf1f4602a"; + rev = "45bbe61cd4d8950d8f91e2c9efd6d36c7e4245e2"; + sha256 = "0dzpdjg7yrbvkmx0nfn3wgs0bi5j38k6js75axxfpgk1jp4l8x8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -42284,12 +42284,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20170518.428"; + version = "20170705.1217"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "c85f0527664538ac9d59bbac9bea40c207c8b9d5"; - sha256 = "1gnia7vkhdh116b7hyxnrnkjnqliqsy5zskn43wjhfw6swf0ipxn"; + rev = "134b41557ab539219d9e3a1b3c8939df93676726"; + sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -42494,12 +42494,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20170601.1101"; + version = "20170629.33"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "6fe3246e00995ca7ebe3b3c36ea58a69de521193"; - sha256 = "1ib4ld45wfwq5c48w56k8ca5qggjmxgpn2q0vvi556awk47anhqr"; + rev = "3e93b3fd754931cfd122855659afbd070d844bac"; + sha256 = "0g45zrch41041axpi5j6jbng1dbjqhpysr38cv2f1kqdmw9ybg9a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -42849,12 +42849,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170625.1144"; + version = "20170705.2113"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "524ee09dc4312c52bd8c23c13b18bee23f15bb53"; - sha256 = "12294qy1v7h0lcgmc8x53nzw0iadjifwn0lqzqmbpjny4yns9h2n"; + rev = "b8d558678821e35450c19e415656e366ebe44c38"; + sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -42877,12 +42877,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20170621.1328"; + version = "20170702.832"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "15eca25c59bef89da75f9a741d194698d0e708eb"; - sha256 = "184873b01b9dvwjjx6xsfz4v8rwhwsz9knjw7yjggmql20lxdpqq"; + rev = "85b860cb53d6f0088255013ef849af9a882110f9"; + sha256 = "1jj467kdvklb1sl0dyyb00jnl4xgz56mql1wnr4nmiqbxaqzqa46"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -43045,12 +43045,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170625.1144"; + version = "20170701.1313"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "524ee09dc4312c52bd8c23c13b18bee23f15bb53"; - sha256 = "12294qy1v7h0lcgmc8x53nzw0iadjifwn0lqzqmbpjny4yns9h2n"; + rev = "b8d558678821e35450c19e415656e366ebe44c38"; + sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -43066,12 +43066,12 @@ magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-rockstar"; - version = "20161013.544"; + version = "20170703.704"; 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"; @@ -43532,8 +43532,8 @@ src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "c832bd706293f394c9b2ed9b2da96cde7f4347f3"; - sha256 = "0n4iv1f7qp6n5hs28p30v9gg6qm8p25q1y301g0ljmsr2f55qjcf"; + rev = "4463a734a9377d6c17a0cdba0f1e7ced0db7bbdc"; + sha256 = "1h99cgpw28gg9lqh53pzpp7qh350dbcran90387jrh5plyicsq3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -43704,12 +43704,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20170627.900"; + version = "20170702.738"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "ae5eeecf1228d12b48f0d6bb22149ab2aaa9aba8"; - sha256 = "110z98kpfb7bw8r7xn1cr2hjbmm91gcvv6il2pzxmha24qwswxgy"; + rev = "2c8d0e537ea7a2e823b7768b603f7194beebe565"; + sha256 = "1w8vm5inmrzxp790ynpdbh6wavc9jq0f0jafc5a277hsxhbl9i7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -44275,12 +44275,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20170625.1942"; + version = "20170628.2045"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "77bc1c735b41acb6d43692dc3dcb60f323656cb5"; - sha256 = "0b33bbmj7c62zn882max569wyybb9b04plb47sg55amv3nv8c8fr"; + rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a"; + sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -45624,12 +45624,12 @@ monokai-alt-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-alt-theme"; - version = "20170529.1607"; + version = "20170630.1348"; src = fetchFromGitHub { owner = "dawidof"; repo = "emacs-monokai-theme"; - rev = "09370802ddf6010a9a83b6c38cfc055e31433a73"; - sha256 = "1dn8z2lj8kvgs0vxiiqm0wz73sgqykkbi32d6f7qa6i4ishyw341"; + rev = "f342b6afc31f929be0626eca2d696ee9fab78011"; + sha256 = "1lgsqrwf21b0rh4x8nmj08a46ld7dkq4jhwxi1fi7a9xhmi2yd4i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ff05515c2f3bd80cb8d7de9afc8fd983e62ad91/recipes/monokai-alt-theme"; @@ -45645,12 +45645,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20170314.1612"; + version = "20170705.1152"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36"; - sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r"; + rev = "71bcced6da1033822ea52e4ac9f312f9d6b5e062"; + sha256 = "1kwngvpih9q7wkdv6ayisi2c22xi9jh9jffd4qzc652p26yhmzq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -47332,12 +47332,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "20170628.611"; + version = "20170630.245"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "0666c4ca4ccf0c3b712115617a035413ca40df22"; - sha256 = "14kcp5yy306gj9clqlzrabdhq71q3p5wsbwc4gcy1r1kmia1mp4c"; + rev = "044040df9e83a015ddfe58940b503b6197fc29ce"; + sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -47584,11 +47584,11 @@ nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nikola"; - version = "20170301.1148"; + version = "20170703.1321"; src = fetchgit { url = "https://git.daemons.cf/drymer/nikola.el/"; - rev = "6752cc70b08889ff5184ac111616863f1881d357"; - sha256 = "0cwn05q0fj6xddfc5qimryvqi5l68sqyxvw638vzmrpnzl6dfc9h"; + rev = "964715ac30943c9d6976999cad208dc60d09def0"; + sha256 = "0b0bpw9r2xi1avzq76pl58bbk1shb57d3bmzd9d53d07gj5c9399"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89354d06dddc3be4b952e3f0b86d11824064dd97/recipes/nikola"; @@ -47692,8 +47692,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "c7346a275c4cdcb59b3961241ddc52b79452d716"; - sha256 = "17vyi7215pwffa1hfsgkmgc1xkxkqqmrmg06rsxdy747mi4vpvr0"; + rev = "a3dc1e65abe29f9d0528d3b5ea45812f4dcd63ed"; + sha256 = "0bliq5wnzp3n0pdf6c2271ngxxgphqimjm6qv8kxl83f1mpfpknc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -47835,12 +47835,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170621.1348"; + version = "20170702.457"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "1f10dbf40266c8e675e2e10f708f87ec61413ab5"; - sha256 = "03dndvbvb3f9ia1sk03zhbi43mq2irxbcxdaazvvyfk021bffbzs"; + rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; + sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -48021,11 +48021,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170625.557"; + version = "20170704.432"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "c9deb329331afbd16f42ef122aba92375ce6dad8"; - sha256 = "1zzbg0i76m6pqmy5mh5bdrfmfa9hzw5z0r6vyxgy344ry6fq9bl7"; + rev = "6a79229737198110c9ae1a3c3e9b86d09b78bd94"; + sha256 = "017cp7z9l97xszlz4v97943zn1k03hmwxx9hphjrl7015hr38zwc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -48435,22 +48435,22 @@ license = lib.licenses.free; }; }) {}; - ob-async = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + ob-async = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-async"; - version = "20170624.1810"; + version = "20170705.2131"; src = fetchFromGitHub { owner = "astahlman"; repo = "ob-async"; - rev = "fc0020e515fe156fdda7fbf47f12c4b00029d44b"; - sha256 = "1b2gpzml8hjcadb4sdhhwdj14h9hj1aawq9iic5sqffc8nsakfqc"; + rev = "079dbcbfa229407ae2f53689a4d045f827adabd5"; + sha256 = "0jinxwv72yypns22iv2v4ll1wkg2ca5vbx1v36pgxgmjvawfilvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async"; sha256 = "0k7kv71nnibp53lav774c61w9pzhq8qvch9rvpyyrwbyd67ninl8"; name = "ob-async"; }; - packageRequires = [ async org ]; + packageRequires = [ async emacs org ]; meta = { homepage = "https://melpa.org/#/ob-async"; license = lib.licenses.free; @@ -49589,15 +49589,15 @@ license = lib.licenses.free; }; }) {}; - omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: + 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 = "20170620.719"; + version = "20170705.1133"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "7070f2a64de65e0446536fb974c940399a4097a3"; - sha256 = "1hf93rm0vi37rmcgbf1w1a3gqvzszhs979fa8yhk905wl8zhz08a"; + rev = "d16b03158778fad4e3329e4f260f1604ddfa3c35"; + sha256 = "0ikf2dpbaflzvpnf9lvs4cya6l4pbbnc700j24zv3mxawjxk1nr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -49610,6 +49610,7 @@ csharp-mode dash emacs + f flycheck popup s @@ -49955,12 +49956,12 @@ org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "org-alert"; - version = "20160701.1900"; + version = "20170701.1855"; src = fetchFromGitHub { owner = "groksteve"; repo = "org-alert"; - rev = "685c18aa5ce994360c7f9e8bbf49590c412187ac"; - sha256 = "0gkv2sfl9nb64qqh5xhgq68r9kfmsny3vpcmnzk2mqjcb9nh657s"; + rev = "169acc082643b6b793aab17ab7e0de3694e74698"; + sha256 = "0khk1jyy4vxsfalf27f53d1g9w41qq6i6c9xm670pj6xrf38hxj9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert"; @@ -50102,12 +50103,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20170625.1444"; + version = "20170706.447"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "318d5a375b9d58e22ec8a80332ac8424916b9d7a"; - sha256 = "15gqw87qlxbbvbcyxqp3h5vi1f0pashd131181mqjq5w3x8jk534"; + rev = "497c18f517074629394c4c30de03d985e0c5ca8c"; + sha256 = "1p1920f99ma3m2h0if3h9inlb8xgbb54mav0jn3jy8nfa9w7pch8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -50773,12 +50774,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20170221.612"; + version = "20170705.217"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "c020fa3f58cdeff51701322334daa6253a144db6"; - sha256 = "0pcymhjaybaxpghixa2gnshzqy03hafmzjdas8q087dn7b19cr8h"; + rev = "d9b5512994c54ebcbc0dcccbf1c779fbb8a89d3d"; + sha256 = "0s1b6lgr841iifznbwqn8r0chbfd0vph5v8n6cc0grak8n6nqgxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -50860,8 +50861,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "379a22c9c6f785a4b250a5225ebe8dc958bc8f6f"; - sha256 = "1i6in0f56kxp8mn8wfz5rfx2vxf4br47vaswxwb3nyvcqnhx41wz"; + rev = "6a64c34863d35fbd53702d56547bec7aa5324b9a"; + sha256 = "00dk29jhr79jlamdlvqrw2mpjm1zx6m9r4kmfscqmv8w7qqp2mya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -50880,8 +50881,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "379a22c9c6f785a4b250a5225ebe8dc958bc8f6f"; - sha256 = "1i6in0f56kxp8mn8wfz5rfx2vxf4br47vaswxwb3nyvcqnhx41wz"; + rev = "6a64c34863d35fbd53702d56547bec7aa5324b9a"; + sha256 = "00dk29jhr79jlamdlvqrw2mpjm1zx6m9r4kmfscqmv8w7qqp2mya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -51074,11 +51075,11 @@ org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-parser"; - version = "20170528.1324"; + version = "20170703.1738"; src = fetchhg { url = "https://bitbucket.com/zck/org-parser.el"; - rev = "c4870192ea24"; - sha256 = "04s39zfa1gwn6zclgdhz3b9fbgyqlbysh6hsn7iqkwfzkpmc2n9c"; + rev = "e8c81e633595"; + sha256 = "1zwwn0xwpq8iscl0cznq3cxcr7kpwrxl6w9v2nrxjs3lffzyzl7a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser"; @@ -51091,21 +51092,21 @@ license = lib.licenses.free; }; }) {}; - org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }: + org-password-manager = callPackage ({ dash, fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-password-manager"; - version = "20170124.549"; + version = "20170701.919"; src = fetchgit { url = "https://git.leafac.com/org-password-manager"; - rev = "a982506652a2f5f4afeb338238e724d361cbc74d"; - sha256 = "0x9f0vlgawbvga56yj95pdcx1j9r51ax76xsbbyrir0iyawgh258"; + rev = "b2814d26287f2b6295a39098da9f5e2fbc5f2de2"; + sha256 = "1pzlmy5vry9q898r4chgn6qp6s1ajlkv946lhn6z7qpdspvy9kyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; sha256 = "0n07k2nng3zkrcif85f1r2g2l4vha78lmrdnj590axn7l5q5fidm"; name = "org-password-manager"; }; - packageRequires = [ org s ]; + packageRequires = [ dash org s ]; meta = { homepage = "https://melpa.org/#/org-password-manager"; license = lib.licenses.free; @@ -51288,12 +51289,12 @@ org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-recent-headings"; - version = "20170604.1353"; + version = "20170703.1625"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-recent-headings"; - rev = "9b373ddafe33283ed9a41bddc65f05d6e9bfcda6"; - sha256 = "0k92z02dyzax35wx7q5s9zasmkba9vzb2y7jf55jn8d7qjdw4lnn"; + rev = "b3d6e3514b57aba7be4de676d1aa92c19e08cd42"; + sha256 = "0367kkyxnkbgk3w0qvbl9xqxn5mbwpsj7qxf4s0c4jhdw2sk3k20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings"; @@ -52542,8 +52543,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "82375dba2d7c5fcc1ddce4579a3b44aaa1afa84e"; - sha256 = "007s3x4111zlinicxarsibkhcykdy71219417rwvdhdj29ick2jg"; + rev = "957fc496311e8c685a5299aeaeb0f1882caaa3af"; + sha256 = "0pzpy02rffgydgbdq6khk4y2hxwx744nvi84i95h98hb1ld1ydk2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -52580,12 +52581,12 @@ ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-gfm"; - version = "20170304.1504"; + version = "20170628.1402"; src = fetchFromGitHub { owner = "larstvei"; repo = "ox-gfm"; - rev = "47c466b660ec184af70589df1c3a26d90241cd1c"; - sha256 = "0jwk7nrdc09mrmwc6myyhlnqq4fap15s8spbzl78zsw3kf89n4vs"; + rev = "99f93011b069e02b37c9660b8fcb45dab086a07f"; + sha256 = "0drdypmgxk3238hmkqw9s3cw9wv94cyfqar5ar0bv0k69s92pxj8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm"; @@ -52766,22 +52767,22 @@ license = lib.licenses.free; }; }) {}; - ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: + ox-pandoc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: melpaBuild { pname = "ox-pandoc"; - version = "20161125.35"; + version = "20170706.431"; src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "d9cf410096fb27be8eb13b2207697f8530f62abf"; - sha256 = "0c8nfvh9vn850i3minfqvri2py48ycgz3sf5p1l0a3k98s4x4jl3"; + rev = "1dd4370f52b6db999f3b5edbb146c26034024ef4"; + sha256 = "0cm1a83jblrp76z5a9hmicsq2b3i5xwpyy1d08ahk0hffq0mbimq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc"; sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc"; name = "ox-pandoc"; }; - packageRequires = [ dash emacs ht org ]; + packageRequires = [ cl-lib dash emacs ht org ]; meta = { homepage = "https://melpa.org/#/ox-pandoc"; license = lib.licenses.free; @@ -53084,12 +53085,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170624.1712"; + version = "20170702.227"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "08affd2ae70f245f2697cdbf5c7a5f72fb325ce0"; - sha256 = "1rfi1qgwn7ngg3s6hpkqgaz2iygq0iv6y6vjzvbbmk1i9s8f51qz"; + rev = "416d1cba6664b0783722129d24f4a748bd71e057"; + sha256 = "1718raqkpzscrnih519dp7a7jnaymjgcaqppfgskbsw59r46p7sj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -55664,8 +55665,8 @@ src = fetchFromGitHub { owner = "brocode"; repo = "play-routes-mode"; - rev = "ec861ab171fc5513df082d26b96a2e9d545ad64c"; - sha256 = "1yn3270d0djsi7jwxw0arrylsyxkwbwawyw2ifpn6iwzcz55cnxh"; + rev = "22d7b87e0eaf0330f2b2283872f8dc08a3258771"; + sha256 = "0j61adh2lsh2zgz1v9i2jzh56ngnrpvsblipvc472k5dxa5qdxin"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/740cef8687232eb0e2186e8df956c2d4f39575cf/recipes/play-routes-mode"; @@ -56635,12 +56636,12 @@ prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prettier-js"; - version = "20170613.2323"; + version = "20170703.519"; src = fetchFromGitHub { owner = "prettier"; repo = "prettier-emacs"; - rev = "4bfc8b3f8e459235dca24796f18a3587d59f4aef"; - sha256 = "1nzb0gf6hac35nnz6scqkfcwgp8ahwzv8qql9g1gkd5vhiag21ac"; + rev = "22a333402aa9bbe00e2943f6aa6e25c402345241"; + sha256 = "0dsm4iz8d2qj72a7jpznjy4skiznsh5lpai95p612dlanafgfpyn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; @@ -57177,12 +57178,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20170626.653"; + version = "20170704.2358"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "28df7d105cbfde2d9fbf322325a15edd85ced77a"; - sha256 = "0v2x7psx7zgwpmxvqx7yq38vhsikrlnzlr798y8p1aqx6k4y9xfd"; + rev = "c917c6e188de27331815f39511ed45a408de22d0"; + sha256 = "11f52g8r5zb34nigm68gm8hwgkw184psknd7zqya0l1ipwkhhrif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -57475,8 +57476,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "12acbc2678073c3439b427be0b713b97e2074bfb"; - sha256 = "1rb2055zrv956z0sl1q2g88xnn82yns9vacjrg9ab2466amdcmjw"; + rev = "6bd51a59df41b99058ec8c2b03a177a218267ce5"; + sha256 = "1bgi9954xb70wjymxyzihjfqy29ps28x9h1brnd2krza15rwgrwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -59495,12 +59496,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20170603.1430"; + version = "20170630.1507"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "3d0fcb80eb017ee2277440d688bf366af3bcdf6f"; - sha256 = "1i71z36hk46w50c9p4b078rqlh4bvwb3dcylhfcwnp4b8j02f31p"; + rev = "b3719faa0207688db5db543e5420648c11928d4f"; + sha256 = "0hn9qcc6c5lgna57yjlwkfl5yahwwgvjnhgp1r0idzamfc631g5g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -59837,8 +59838,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "e136fe3e11d6cb46166c49999d57f6f50bac9d3d"; - sha256 = "1adwv5p8rk1b146vg76lpnfrkj19mdzn5l5ghsls197n2j9q00x4"; + rev = "7758d2a42a1a98199a9ed6af95bf70fe70f0c168"; + sha256 = "0q08yfrv6mfkhh5rm0wq6c8p6sb60rib5z42k98y9d92gsn96lzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -60417,12 +60418,12 @@ resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "20170624.1658"; + version = "20170704.2212"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "274a96e9754b606d85c9dd62cfed628ff4f736df"; - sha256 = "0ax18sflqh9wg938gaz9m5r1i45761qym7r1lyqqxp24jzp4wa6j"; + rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904"; + sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; @@ -60459,12 +60460,12 @@ restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restclient"; - version = "20170627.153"; + version = "20170703.33"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "8292fe68c73561413cebff88008509180768718d"; - sha256 = "16c2g8s64lxav5r5v8cqv5ihlskvz22kld5d1vzf3vzr2c9c4dwx"; + rev = "d8bb3fbfea7e59587bf746c45c655fdf94af3247"; + sha256 = "0zlxrvghccpzfc38pjk6sicmqlnc2h755f902y13110l7gr7ahhs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -60484,8 +60485,8 @@ src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "8292fe68c73561413cebff88008509180768718d"; - sha256 = "16c2g8s64lxav5r5v8cqv5ihlskvz22kld5d1vzf3vzr2c9c4dwx"; + rev = "d8bb3fbfea7e59587bf746c45c655fdf94af3247"; + sha256 = "0zlxrvghccpzfc38pjk6sicmqlnc2h755f902y13110l7gr7ahhs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; @@ -61085,12 +61086,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20170527.450"; + version = "20170705.144"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; - sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; + rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; + sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -61151,7 +61152,7 @@ version = "20161115.2259"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59201"; + rev = "59273"; sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; }; recipeFile = fetchurl { @@ -61232,7 +61233,7 @@ version = "20150424.752"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59201"; + rev = "59273"; sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; }; recipeFile = fetchurl { @@ -61669,12 +61670,12 @@ salt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: melpaBuild { pname = "salt-mode"; - version = "20170626.444"; + version = "20170702.246"; src = fetchFromGitHub { owner = "glynnforrest"; repo = "salt-mode"; - rev = "3a570369c9ed4e04a9bffa7e79ced0c8bd7f99b1"; - sha256 = "1d4fk1387xjch3a8xrij8knvrs18c7iq7m9jclzy2v6bp9ml2lnb"; + rev = "ea4980b9c9e8e7570086a2558fe7f66c62a528ad"; + sha256 = "0ygi9kzkfqzizygaqwqpymn8s7kr8ci38v61qmy4n58n9c19fdwx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; @@ -61858,11 +61859,11 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20170530.355"; + version = "20170629.2356"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "736da7f466aad2b64c846ece258082c6aac647ae"; + rev = "03834eb7fa0922efaa31d2157d9effa2b7e04810"; sha256 = "0idj4p3d36yp0irp1yfbihq8mf17jc7facz5qy6kx7zj0wdx4fjw"; }; recipeFile = fetchurl { @@ -62442,10 +62443,10 @@ }) {}; second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "second-sel"; - version = "20170307.946"; + version = "20170702.729"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=28"; - sha256 = "1sgwza2ka3iqsajnppq2vd150h1wbkzzi04rk7bzpqj32dyh7gbx"; + url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=29"; + sha256 = "1yq06a04j44r019cjv2jb3kfpfqhnxdf3b4hhz4d3fz7v1hsicwg"; name = "second-sel.el"; }; recipeFile = fetchurl { @@ -63527,12 +63528,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20170624.1454"; + version = "20170703.926"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "23d6d213a90e031dec8dbbaaeac5ddbe2cf050de"; - sha256 = "0y96l6m7lnw2wsi5zbla88xgxmw3zksblnk36bgr153bik14waxf"; + rev = "3adbfe7c03d509538a6e43bafda27ea290298a14"; + sha256 = "17r5gaxqn91iylg3llg13kqrxy12cvi34rvi26wyzlysdfrfxl9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -64051,12 +64052,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170612.900"; + version = "20170701.436"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "94f1a311de0c79c8245784543b05359714550d72"; - sha256 = "1ypsl1vin5h90sr4cc127f8gm23h4pkag6zwfwx53h2yrsj7vvrh"; + rev = "35b0ae538b2023c91b035b3f9c133b28f0afbaf8"; + sha256 = "12ks2d91bvsxkwwjjgs9ymcwf3w90x7r0krvb6nsgh970s35yv78"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -64114,12 +64115,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20170622.1604"; + version = "20170705.643"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "74c1a83711a0c2b96e9387f3fa03f387a6713193"; - sha256 = "05rs4da1dgwvcwvbq70angwqh3zjhsxnjvp5rpfvk5lzw9p8ng9r"; + rev = "d0fd5c50135c20f172a0d7c69250c2d80d2f51e6"; + sha256 = "0k5s75gmgvnpz07nab55k2fi8whgjqkjr08ym0s57dghhv1qrr5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -64303,12 +64304,12 @@ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slstats"; - version = "20170612.725"; + version = "20170629.235"; src = fetchFromGitHub { owner = "davep"; repo = "slstats.el"; - rev = "7488623cbe406eaafccc36d293e8c42bbd308085"; - sha256 = "1q3zm9qfivbd1k9kjilwvzhlcbzv6dwnd78bfzzkrppbjcpkxz3n"; + rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167"; + sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; @@ -64825,12 +64826,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170624.504"; + version = "20170705.1319"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "0f32a87ae7a70c4a39debe4aa4585029f35ea30a"; - sha256 = "0gdskz49lqm20prhanqcldfz6sbiqpdfpn6xl5p3yqskdz4b4pdp"; + rev = "34ca8a68b201879e88c3814a2dfe3a1b9609bac3"; + sha256 = "0ybij6m0h27q3q1pv1cny5bpg35q0m0yx071db40qd8pdvxn0b90"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -65185,8 +65186,8 @@ src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "22b3efd741e26f59e18c9fd28691d8b84c9130ab"; - sha256 = "0hjp5ci7miggw0gs2y8q867gi7p3dq2yyfkckkh52isrp0yvz0wf"; + rev = "8a4da1125dd284e55139084d62fb29af5bcbcc20"; + sha256 = "1c85ycaqyrncp7pbax6mdnz1v91hpi1pc9jspd6irwhhs8b9jxfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -65734,12 +65735,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20170621.45"; + version = "20170630.2327"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "b1c41ddd290153fcc1df8f1d0fb54062e9943894"; - sha256 = "1ga6h2jbnkjkf5f1hqg5jy5fw0cwlgzpn2f1mcrj04302i2vliv4"; + rev = "e6ccec6c80ee2bbddbad5a88cb9d2cd2db8a1a33"; + sha256 = "0ga99imh00h0bnc4m2q335y0x8zp6xs1n47rqqhxp6iwmw2fz20z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -65755,12 +65756,12 @@ spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }: melpaBuild { pname = "spaceline-all-the-icons"; - version = "20170605.838"; + version = "20170703.237"; src = fetchFromGitHub { owner = "domtronn"; repo = "spaceline-all-the-icons.el"; - rev = "bc611779a7a3c10b7367bc8c985923d26ee91443"; - sha256 = "1slnzb26fkmj01hakzbaarlmf2ng4d1zkimgb93axx0svxh03qc7"; + rev = "655ad80f6d63aa6bb2fcc8f73e5a2c65f807b02d"; + sha256 = "0b4l3afajkcgahzara666fhkxm6wbgim65r4yy73psadhwpfhp3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons"; @@ -65776,12 +65777,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170621.718"; + version = "20170705.1052"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "be01cae704dc73e6a4b53766e655fb0dfba1bbc1"; - sha256 = "0c8mx9ivalgvazhn51lbmskayhdhwnmvq5jp5wi7925p05i0kb3z"; + rev = "6f41a3321296c35c1b77660cf3956f07b3b68086"; + sha256 = "0n8gchqrm8nm687wpqm599622yhvylkf1vslw0akgq3r4vsyfini"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -67336,12 +67337,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20170525.1254"; + version = "20170703.1433"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "13611ca0e4dfb8e6e4a314142368bfa7f0de5b9b"; - sha256 = "0svlf2kgdbhwaygydvwvhinafiwv3qrgyn5wkfpcnz1km30g92hf"; + rev = "59e140248a667127771aa7aa49ee0511c55e8817"; + sha256 = "0j0lrphg97lvyxlchgws7l0n0c76hxh6sbm0c98dvsnki6jgfj72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -67714,8 +67715,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74"; - sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5"; + rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896"; + sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -67773,12 +67774,12 @@ switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; - version = "20170522.2042"; + version = "20170701.246"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "8d37f5660666516ab6c9e6ec1da748ea1669ed4b"; - sha256 = "19bszzslzz8rprch0z3h6xa6pjhrwik7j53i4kj33w306d58gi3f"; + rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d"; + sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; @@ -68487,8 +68488,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "c823729104873d0d1eeff4256eb15ee4c1dbfa36"; - sha256 = "1zkjyj3jm2q23yfjvrvikrm6c6lvcysnnhivfvvrh0qr7qlqvwfz"; + rev = "477a87418980cfba695b2507a268d632f4e7a220"; + sha256 = "1xgi33wi69v3lx62q8lk04njcjz8ny2lnjn7ll332bcgx7sbh292"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -69446,8 +69447,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "4aaa92ece8503a6da9bc6701604f69acf2b99d07"; - sha256 = "1my582c0ln1byxid5acdd6dk7lvi7lwd6gka10s4bp4w3xrd55x8"; + rev = "49e5103920e75a149d02c7d487496c8c79154a6c"; + sha256 = "1ywqyz27k1h87rz3vwyzchsajl52smp0ypwdmwggj2yn1mrcc9p6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -69805,12 +69806,12 @@ tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tldr"; - version = "20170621.2059"; + version = "20170702.1859"; src = fetchFromGitHub { owner = "kuanyui"; repo = "tldr.el"; - rev = "2d80571cbffc5c02aad771da4b00502d86242926"; - sha256 = "14gc1ihiyk7j4vf33r2kq3sbj37gw9s17p3gykj2sfviq295s006"; + rev = "ebdeb08950823765bf58dc2aba3559a5ad1103f1"; + sha256 = "1aigfmp4ra9qfwyk151y0cxmgd3n42rcjawklfm6ch2g49vx559q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr"; @@ -70478,12 +70479,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20170625.1509"; + version = "20170705.1153"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "53f0e0c562ba28b9738d05cd730728e983d2917f"; - sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw"; + rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0"; + sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -70503,8 +70504,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "53f0e0c562ba28b9738d05cd730728e983d2917f"; - sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw"; + rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0"; + sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -71310,11 +71311,11 @@ undo-tree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "undo-tree"; - version = "20161012.701"; + version = "20170706.246"; src = fetchgit { url = "http://www.dr-qubit.org/git/undo-tree.git"; - rev = "4cba00bb049cfaa2ee6821a9e347209a88a740b5"; - sha256 = "0qawh5cr0ahdg1rks96g9fbva2nfkz8mbl82jnps6axqdf57gm38"; + rev = "e9a9102f515acd7523158f20e83f300600374989"; + sha256 = "07y1pn0dzwh1avkd3dm96lcjisvnr7p02wbhxf1m3dgaxf059mcn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/undo-tree"; @@ -71780,12 +71781,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20170616.1454"; + version = "20170702.1322"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5bd87be2c99196c5342de7ffd56dd9e703a7e400"; - sha256 = "10q6zwhp6501sl92p4ag9bp0awagbkn7757iy0ysprxnpc2ajznf"; + rev = "fd462e8aeaf858fec0bc63a41bd10ff8d445490c"; + sha256 = "0qk57jap3vs5rvj8hgajzk74v8mj73l975g8zgylcx2kniy3dvwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -72347,12 +72348,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20170508.735"; + version = "20170701.1603"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "282274b319f2c3598ac6bbdd27a8b7ca40b0bb0e"; - sha256 = "0va5aqij3gan3j37jjhx8a8bv0zdpid5x18jfynzizlyk68fc196"; + rev = "c08343904835cbae12f48e0758b0a6a014d76a74"; + sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -73055,12 +73056,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20170325.357"; + version = "20170627.2306"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "0a324086eb9cf2d357d3c8a431e80cd45fce016a"; - sha256 = "0hcyy44xxg6f7c10db6xf8944wiaijxln3kgrl49kc0m3icilxyy"; + rev = "770d54fafb1a0a140b449e6132db22e70b4d6aa9"; + sha256 = "1f6h5n42fwwby880wikh8fdlk2zqimkl7wdb8wvr5kq1nqfqpz3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -73855,8 +73856,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "74daf284e32bf84d29377d1d7a638b640ebf8f76"; - sha256 = "0rx05is17g255gymyp6lvsskg5i6c4s28q89kbspdyfwx3rr42qa"; + rev = "2b3ba6dcc3e99cea75d4bf2b4e6cf0898d9a2615"; + sha256 = "0yga1vf54lf35my64ixw5ssq6jr6ph914afqv5r2gri007bi2zvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -74266,12 +74267,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20170517.1242"; + version = "20170706.349"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "3385ffdc6faed5a283e26a7ebf89825c700dd395"; - sha256 = "1kznr0zv1y6lwsllpksqjzq2f4bc5a99lg19fmifn7w0dhv6fn0m"; + rev = "e300dab6c4be06ae42bc2f1919ed37e8624c3605"; + sha256 = "07lz63yzjxj1y2524b7cd829srl3dvng7g67kf1377njgyrrgq0f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -74854,12 +74855,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170627.1123"; + version = "20170706.348"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "dba445db28d3c1d0e2d0a9924ab96061850bb00c"; - sha256 = "03wcifmmianrh0qp7p2pvhbpnzh0yjh5ys7x7qv3ywr62bnv4akh"; + rev = "ea43010b362f6b5dd214f2f81daf4c12f6433f40"; + sha256 = "0cwk3m1179ldb1qk6jx0g156vsqv14h3bqgfyb4yc5bg980ikm61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -74938,12 +74939,12 @@ xah-reformat-code = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-reformat-code"; - version = "20170111.812"; + version = "20170706.339"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-reformat-code"; - rev = "7e5bbd09be8035a482a76417d900cb5d3a70e1cd"; - sha256 = "04xwf9jxk4805bl7xj05kjfgl7m71zp94qdvw4g37s6q8v25j73d"; + rev = "655cc8820118737db7b758ab72ad107d7fff091a"; + sha256 = "12zrgp76nq18anp7vc7pj0w9a688i7xylplqh55jv9q24xgmpyhs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45e731ccee5ccbf97169e32a16300b5fb78e1155/recipes/xah-reformat-code"; @@ -75509,8 +75510,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "ebb1349c55dadd9aa1a87a80f3392023a1fbad43"; - sha256 = "0zijnhjjdppwmy69bdh1wvqfmkvijqpazvk71b3b3ns6w8cln582"; + rev = "40fc1d12a4f69cacf8b6b07d3372dee2969cb2e5"; + sha256 = "0ahkrgl1isd9bppclk8i72fkm9c0hmhf9i5zc1n9k96c4x9h831i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -76535,11 +76536,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }: melpaBuild { pname = "zpresent"; - version = "20170620.2134"; + version = "20170703.2041"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "d5aa3fb7d4cd"; - sha256 = "0154cij71gczwpc0rxpa669dx6ds6b383y9f3fi1hh6i6w5dw1dm"; + rev = "d8f7969db645"; + sha256 = "03xyal7r0gc6r4vx23sx44vcm4fk68dkxyd1x0jw47im4xfmfvzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 1ed81a16f4ac..6e1cc04a2f66 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -884,12 +884,12 @@ add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-hooks"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "nickmccurdy"; repo = "add-hooks"; - rev = "9b1bdb91c59ea9c2cc0aba48262c49069273d856"; - sha256 = "1jzgyfcr6m64q79qibnbqa41sbpivslwk2hygbk9yp46l5vgj1hc"; + rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7"; + sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; @@ -1052,12 +1052,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "3ce72cf77cf5958d91b65bc4867cbacff968da74"; - sha256 = "0wiwxh6k2s48gpklhd9abbsr0ll73jzggwgq1lvm7gha203ji5v4"; + rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf"; + sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -6141,15 +6141,16 @@ homepage = "https://melpa.org/#/darcula-theme"; license = lib.licenses.free; }; + }) {}; darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "0.3.5"; + version = "0.3.7"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "dde50661210d8610cd03526a6c9a922bb0e494a6"; - sha256 = "1mab28rm175ylg17ziha2kndcqb9a23f8wrpydypa8k7iirhadp6"; + rev = "fb66992286c009e594eb7bb9ee2f1cdc3bebb555"; + sha256 = "0n7qgnyl4rdvgwjb7gz6m1c22mxwg8bp08r7lz27z0b1bcyw94sc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -6162,7 +6163,6 @@ license = lib.licenses.free; }; }) {}; - }) {}; dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dart-mode"; @@ -6334,12 +6334,12 @@ decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decide"; - version = "0.5"; + version = "0.7"; src = fetchFromGitHub { owner = "lifelike"; repo = "decide-mode"; - rev = "ce0cd15e8e42d458d86cbf4c1effd03cefec33bd"; - sha256 = "0wm24ndiyhrayg1gz456s0s1ddlpcvg4vp555g4zzl3zcpsy94bg"; + rev = "90133687118c236142b8110571c463304b3192f9"; + sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide"; @@ -8310,12 +8310,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "0cbcbc0ddf2f65ce02a4b0b027990d7131828a9b"; - sha256 = "1nzzjb5q58f5p0jpa3rg9mmnkmnlbs19ws993sn5fcb1161hhg7r"; + rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c"; + sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -9634,12 +9634,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.0"; + version = "20.0.1"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "040bdce67f88d833bfb59adae130a4ffb4c180f0"; - sha256 = "12dbay254ivnakwknjn5h55wndb0a0wqx55p156h8hwjhykj2kn0"; + rev = "a01de6873844ba510084090abec734c4166d71fa"; + sha256 = "0bni9rchblp3n7lh07wq3rpf5xykh79jm6bl6f2dk2j24wwrhjqs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -11015,22 +11015,22 @@ license = lib.licenses.free; }; }) {}; - exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: + exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "1.5"; + version = "1.6.4"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "1ab5ce73fd9aca5267416b998084e1a8e96122a7"; - sha256 = "1ncnsqlnqikm1fv9ahv6jrmdp02czhcbmln346llwzwrpw31ly78"; + rev = "6e6c4c3ce5f65c71ba08565edbec2dfb0cf64e0c"; + sha256 = "1r6d6sb9ylfqidcbrr7f75m68s1cpm220pnb4hl0qv5n6hr8h5gi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3"; name = "exwm-x"; }; - packageRequires = [ cl-lib exwm swiper switch-window ]; + packageRequires = [ bind-key cl-lib exwm swiper switch-window ]; meta = { homepage = "https://melpa.org/#/exwm-x"; license = lib.licenses.free; @@ -15408,12 +15408,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "35c1506bec0cb43629d30cae8be6cd7f793fff8b"; - sha256 = "1dlh4ppnbliv2ipfysdrnpix5kg6nwjc0468whi3w758nwpkamzc"; + rev = "6d4ccb3f7376d6326b58b25f3c94ab546418a030"; + sha256 = "13n8k5ak3y1x6i27x47sji49kdbqhnc3ywqkn4xwmxcnrs28kr25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -21270,12 +21270,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.8"; + version = "0.8.1"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "b5cafd1145f22e7beff8ef8ed742bf10af1e6e1c"; - sha256 = "08is4fg94a6am7c2j0d5qd1nkrnik5vpzg3pqkimyxgy5czj764b"; + rev = "134b41557ab539219d9e3a1b3c8939df93676726"; + sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -22250,12 +22250,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "77bc1c735b41acb6d43692dc3dcb60f323656cb5"; - sha256 = "0b33bbmj7c62zn882max569wyybb9b04plb47sg55amv3nv8c8fr"; + rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a"; + sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -23614,12 +23614,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "d0f8f003840081b57d4f372d9ff41c057422b1a1"; - sha256 = "135b7h5vx0w7p6k2f5d8lcqxd5w199089wcar3kk0frb9vrk3xss"; + rev = "044040df9e83a015ddfe58940b503b6197fc29ce"; + sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -23782,12 +23782,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.7"; + version = "0.5.9"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "e041942cb0f4f02d00cf30afb956208496562ba4"; - sha256 = "00d6fz5kg2k6py5mj2h9rzbqa4gkiv02h9ba55psfgbnmak6ip0v"; + rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; + sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -24510,15 +24510,15 @@ license = lib.licenses.free; }; }) {}; - omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: + omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; version = "4.0"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "7070f2a64de65e0446536fb974c940399a4097a3"; - sha256 = "1hf93rm0vi37rmcgbf1w1a3gqvzszhs979fa8yhk905wl8zhz08a"; + rev = "d16b03158778fad4e3329e4f260f1604ddfa3c35"; + sha256 = "0ikf2dpbaflzvpnf9lvs4cya6l4pbbnc700j24zv3mxawjxk1nr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -24531,6 +24531,7 @@ csharp-mode dash emacs + f flycheck popup s @@ -25027,12 +25028,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "24313870fa682a53e7f3f916b0e853a731868886"; - sha256 = "0nc3jl7sgqc8swi89rdk1yapmqxp8vaxm7390iqxy7a1sng4jydh"; + rev = "d9b5512994c54ebcbc0dcccbf1c779fbb8a89d3d"; + sha256 = "0s1b6lgr841iifznbwqn8r0chbfd0vph5v8n6cc0grak8n6nqgxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -29502,12 +29503,12 @@ resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "274a96e9754b606d85c9dd62cfed628ff4f736df"; - sha256 = "0ax18sflqh9wg938gaz9m5r1i45761qym7r1lyqqxp24jzp4wa6j"; + rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904"; + sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; @@ -30991,12 +30992,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "23d6d213a90e031dec8dbbaaeac5ddbe2cf050de"; - sha256 = "0y96l6m7lnw2wsi5zbla88xgxmw3zksblnk36bgr153bik14waxf"; + rev = "3adbfe7c03d509538a6e43bafda27ea290298a14"; + sha256 = "17r5gaxqn91iylg3llg13kqrxy12cvi34rvi26wyzlysdfrfxl9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -31030,6 +31031,27 @@ license = lib.licenses.free; }; }) {}; + silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "silkworm-theme"; + version = "0.1"; + src = fetchFromGitHub { + owner = "mswift42"; + repo = "silkworm-theme"; + rev = "7951b53e5caf9daf6a5a15a57ae3a668cb78bd7b"; + sha256 = "1q21886qsam8y3s60zlfh48w0jl67q14qg9pzda7j2jcbj1q6r91"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme"; + sha256 = "1zbrjqmhf80qs3i910sixirrv42rxkqdrg2z03gnz1g885gpcn13"; + name = "silkworm-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/silkworm-theme"; + license = lib.licenses.free; + }; + }) {}; simple-bookmarks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-bookmarks"; @@ -31369,12 +31391,12 @@ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slstats"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "davep"; repo = "slstats.el"; - rev = "7488623cbe406eaafccc36d293e8c42bbd308085"; - sha256 = "1q3zm9qfivbd1k9kjilwvzhlcbzv6dwnd78bfzzkrppbjcpkxz3n"; + rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167"; + sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; @@ -32626,12 +32648,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "588ec8b9476c8d7f5f16018a7aaf90ee828fb4f5"; - sha256 = "1ckvsckqlbdcw6nbsrh9xizbpkr7r88ks39av8dhn5n412c5jm4g"; + rev = "26e8b0615def4f0531682b8a849f55d330616ac1"; + sha256 = "0ql9ab6wnpww033jnfa3iwvz73h4szbwyfjvfavjlllzwk0f38np"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -32878,12 +32900,12 @@ switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "8d37f5660666516ab6c9e6ec1da748ea1669ed4b"; - sha256 = "19bszzslzz8rprch0z3h6xa6pjhrwik7j53i4kj33w306d58gi3f"; + rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d"; + sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; @@ -34772,12 +34794,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "5.5"; + version = "5.6"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "af4ff24ae4489e0a3bfbbddf6bc934f66b0af527"; - sha256 = "1z88wy7m6rj028dqxzyyyf67gw4jqd72dgsvlr8inwimds2iplbv"; + rev = "c08343904835cbae12f48e0758b0a6a014d76a74"; + sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 7e8715f32a9e..82bd5ea0c528 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 = "20170622"; + version = "20170703"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20170622.tar"; - sha256 = "0z4ypv6q4nx4icir69xchzn58xzndnxlkg0v4pb62gqghdxng6vy"; + url = "http://orgmode.org/elpa/org-20170703.tar"; + sha256 = "0l590ygknlbz3r0w9zzljwqn8vasz5w82wsivi9bi60lf0d0hx58"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20170622"; + version = "20170703"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20170622.tar"; - sha256 = "0ix4gmr6y9nrna9sc9cy30533mxlnvlfnf25492ky6dkssbxb10s"; + url = "http://orgmode.org/elpa/org-plus-contrib-20170703.tar"; + sha256 = "0l7hsz6rbq1zw6wdlm3ryxb60md44rvx0waii98hww89zpdi0gmw"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 81f9ddd96d29..b05bbd053c1f 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/leo-editor mv * $out/share/leo-editor - makeWrapper ${python3Packages.python}/bin/python3.5m $out/bin/leo \ + makeWrapper ${python3Packages.python.interpreter} $out/bin/leo \ --set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \ --add-flags "-O $out/share/leo-editor/launchLeo.py" ''; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 19b6c030f2e1..dc7d2b8b2eab 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -4,11 +4,10 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "0vjkcilxzwvkgcczcbq58nl2j17ddqiysxm5yl13agnmxzvxw6r2" - else "1ga9gxzji48vhbaa0pkxd03h89zgjsbikbki9xla1qbvyvqjnw5g"; - + then "12dp2ggcjaqls4vrms21mvbphj8a8w156wmlqm19dppf6zsnxqxd" + else "1s3rhxfz663d255xc5ph6ndhb4x82baich8scyrgi84d7dxjx7mj"; pname = "helm"; - version = "2.4.1"; + version = "2.5.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index aaade82e31d9..e036fb2f38bd 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.6.0"; + version = "1.6.2"; goPackagePath = "k8s.io/kops"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "1z890kjgsdnghg71v4sp7lljvw14dhzr23m2qjmk6wndyssscykr"; + sha256 = "0bxknjhzj9xiws6sjw9knwqma3fjh496vnm90skl766bk4pafq9l"; }; buildInputs = [go-bindata]; diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix new file mode 100644 index 000000000000..4c768325fee9 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -0,0 +1,136 @@ +{ dpkg, fetchurl, lib, pkgs, stdenv, config +, alsaLib +, atk +, cairo +, coreutils +, cups +, dbus +, desktop_file_utils +, expat +, fontconfig +, freetype +, gcc-unwrapped +, gdk_pixbuf +, glib +, gnome2 +, libgcrypt +, libgnome_keyring +, libnotify +, makeWrapper +, nodejs +, nspr +, nss +, pango +, python2 +, udev +, wget +, xorg +}: + +stdenv.mkDerivation rec { + name = "${pkgname}-${version}"; + pkgname = "nylas-mail-bin"; + version = "2.0.32"; + subVersion = "fec7941"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://edgehill.s3-us-west-2.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb"; + sha256 = "40060aa1dc3b5187b8ed4a07b9de3427e3c5a291df98c2c82395647fa2aa4ada"; + } + else + throw "NylasMail is not supported on ${stdenv.system}"; + + propagatedBuildInputs = [ + alsaLib + atk + cairo + coreutils + cups + dbus + desktop_file_utils + expat + fontconfig + freetype + gcc-unwrapped + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + libgnome_keyring + libnotify + nodejs + nspr + nss + pango + python2 + udev + wget + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxkbfile + ]; + + + buildInputs = [ gnome2.gnome_keyring ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out + + ${dpkg}/bin/dpkg-deb -x $src unpacked + mv unpacked/usr/* $out/ + + # Fix path in desktop file + substituteInPlace $out/share/applications/nylas-mail.desktop \ + --replace /usr/bin/nylas-mail $out/bin/nylas-mail + + # Patch librariess + noderp=$(patchelf --print-rpath $out/share/nylas-mail/libnode.so) + patchelf --set-rpath $noderp:$out/lib:${stdenv.cc.cc.lib}/lib:${xorg.libxkbfile.out}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ + $out/share/nylas-mail/libnode.so + + ffrp=$(patchelf --print-rpath $out/share/nylas-mail/libffmpeg.so) + patchelf --set-rpath $ffrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ + $out/share/nylas-mail/libffmpeg.so + + # Patch binaries + binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas) + patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \ + --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ + $out/share/nylas-mail/nylas + + wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome_keyring}/lib"; + + # Fix path to bash so apm can install plugins. + substituteInPlace $out/share/nylas-mail/resources/apm/bin/apm \ + --replace /bin/bash ${stdenv.shell} + + wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \ + --set PATH "${coreutils}/bin" + patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \ + --set-rpath ${gcc-unwrapped.lib}/lib $out/share/nylas-mail/resources/apm/bin/node + ''; + + meta = with stdenv.lib; { + description = "Open-source mail client built on the modern web with Electron, React, and Flux"; + longDescription = '' + Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. Nylas Mail can be enabled with it's requirements by enabling 'services.nylas-mail.enable=true'. Alternatively, make sure to have services.gnome3.gnome-keyring.enable = true; in your configuration.nix before running nylas-mail. If you happen to miss this step, you should remove ~/.nylas-mail and "~/.config/Nylas Mail" for a blank setup". + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ johnramsden ]; + homepage = https://nylas.com; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 69c763acd836..cefdc1108bfc 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -2,15 +2,15 @@ , tcllib, withJson ? true}: stdenv.mkDerivation rec { - name = "fossil-1.36"; + name = "fossil-2.2"; src = fetchurl { urls = [ - https://fossil-scm.org/index.html/uv/download/fossil-src-1.36.tar.gz + https://www.fossil-scm.org/index.html/uv/fossil-src-2.2.tar.gz ]; name = "${name}.tar.gz"; - sha256 = "04px1mnq5dlc6gaihxj5nj6k7ac43wfryzifaairjh74qmgc6xi6"; + sha256 = "0wfgacfg29dkl0c3l1rp5ji0kraa64gcbg5lh8p4m7mqdqcq53wv"; }; buildInputs = [ zlib openssl readline sqlite which ed ] diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index a4eb850f9390..df7ba69c5c5f 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,85 +1,72 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb_run, symlinkJoin, configFile ? null }: +, xorgserver, xvfb_run }: -let +stdenv.mkDerivation rec { + name = "i3-${version}"; version = "4.13"; - i3 = stdenv.mkDerivation rec { - name = "i3-${version}"; - - src = fetchurl { - url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl"; - }; + src = fetchurl { + url = "http://i3wm.org/downloads/${name}.tar.bz2"; + sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl"; + }; - nativeBuildInputs = [ which pkgconfig makeWrapper ]; + nativeBuildInputs = [ which pkgconfig makeWrapper ]; - buildInputs = [ - libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon - libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango - perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun - perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC - xorgserver xvfb_run - ]; + buildInputs = [ + libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon + libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango + perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun + perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC + xorgserver xvfb_run + ]; - configureFlags = [ "--disable-builddir" ]; + configureFlags = [ "--disable-builddir" ]; - enableParallelBuilding = true; + enableParallelBuilding = true; - postPatch = '' - patchShebangs . - ''; + postPatch = '' + patchShebangs . + ''; - # Tests have been failing (at least for some people in some cases) - # and have been disabled until someone wants to fix them. Some - # initial digging uncovers that the tests call out to `git`, which - # they shouldn't, and then even once that's fixed have some - # perl-related errors later on. For more, see - # https://github.com/NixOS/nixpkgs/issues/7957 - doCheck = false; # stdenv.system == "x86_64-linux"; + # Tests have been failing (at least for some people in some cases) + # and have been disabled until someone wants to fix them. Some + # initial digging uncovers that the tests call out to `git`, which + # they shouldn't, and then even once that's fixed have some + # perl-related errors later on. For more, see + # https://github.com/NixOS/nixpkgs/issues/7957 + doCheck = false; # stdenv.system == "x86_64-linux"; + + checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + '' + (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output) + ! grep -q '^not ok' testcases/latest/complete-run.log + ''; - checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - '' - (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output) - ! grep -q '^not ok' testcases/latest/complete-run.log - ''; + postInstall = '' + wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" + for program in $out/bin/i3-sensible-*; do + sed -i 's/which/command -v/' $program + done + ''; - postInstall = '' - wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" - for program in $out/bin/i3-sensible-*; do - sed -i 's/which/command -v/' $program - done + separateDebugInfo = true; + + meta = with stdenv.lib; { + description = "A tiling window manager"; + homepage = "http://i3wm.org"; + maintainers = with maintainers; [ garbas modulistic fpletz ]; + license = licenses.bsd3; + platforms = platforms.all; + + longDescription = '' + A tiling window manager primarily targeted at advanced users and + developers. Based on a tree as data structure, supports tiling, + stacking, and tabbing layouts, handled dynamically, as well as + floating windows. Configured via plain text file. Multi-monitor. + UTF-8 clean. ''; - - separateDebugInfo = true; - - meta = with stdenv.lib; { - description = "A tiling window manager"; - homepage = "http://i3wm.org"; - maintainers = with maintainers; [ garbas modulistic fpletz ]; - license = licenses.bsd3; - platforms = platforms.all; - - longDescription = '' - A tiling window manager primarily targeted at advanced users and - developers. Based on a tree as data structure, supports tiling, - stacking, and tabbing layouts, handled dynamically, as well as - floating windows. Configured via plain text file. Multi-monitor. - UTF-8 clean. - ''; - }; - }; -in if configFile == null then i3 else symlinkJoin { - name = "i3-with-config-${version}"; - paths = [ i3 ]; - - buildInputs = [ makeWrapper ]; - postBuild = '' - wrapProgram $out/bin/i3 \ - --add-flags "-c ${configFile}" - ''; } diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 10bc5787e40d..053a3ae76c1d 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "iosevka-${version}"; - version = "1.13.0"; + version = "1.13.1"; buildInputs = [ unzip ]; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; - sha256 = "03jc8a10177wk35gyp0n317azakyy5qzc6vbh331552asawckswr"; + sha256 = "05nnzbhv0sidbzzamz10nlh3j974m95p3dmd66165y4wxyhs989i"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix new file mode 100644 index 000000000000..65fb20aa2603 --- /dev/null +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, autoconf, ... }: + +stdenv.mkDerivation rec { + name = "gambit-bootstrap-${version}"; + version = "4.8.8"; + tarball_version = "v4_8_8"; + + src = fetchurl { + url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-${tarball_version}-devel.tgz"; + sha256 = "075k2z04d6svxqf9paj3xvp0mm0xzy0vbma1y61s0lkywdim8xjz"; + }; + + buildInputs = [ autoconf ]; + + configurePhase = '' + ./configure --prefix=$out --enable-single-host + ''; + + buildPhase = '' + # Copy the (configured) sources now, not later, so we don't have to filter out + # all the intermediate build products. + mkdir -p $out ; cp -rp . $out/ + + # build the gsc-boot* compiler + make bootstrap + ''; + + installPhase = '' + cp -fa ./ $out/ + ''; + + forceShare = [ "info" ]; + + meta = { + description = "Optimizing Scheme to C compiler, bootstrap step"; + homepage = "http://gambitscheme.org"; + license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; + }; +} diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 7e17cee9abde..58b08ebd4fb7 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,31 +1,75 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs }: stdenv.mkDerivation rec { name = "gambit-${version}"; - version = "4.8.6"; - devver = "4_8_6"; + version = "4.8.8-f3ffeb6"; + bootstrap = import ./bootstrap.nix ( pkgs ); - src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${devver}-devel.tgz"; - sha256 = "0j3ka76cfb007rlcc3nv5p1s6vh31cwp87hwwabawf16vs1jb7bl"; +# devver = "4_8_8"; +# src = fetchurl { +# url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${version}-devel.tgz"; +# sha256 = "0j3ka76cfb007rlcc3nv5p1s6vh31cwp87hwwabawf16vs1jb7bl"; +# }; + src = fetchgit { + url = "https://github.com/feeley/gambit.git"; + rev = "f3ffeb695aeea80c18c1b9ef276b57898c780dca"; + sha256 = "1lqixsrgk9z2gj6z1nkys0pfd3m5zjxrp3gvqn2wpr9h7hjb8x06"; }; - configureFlags = [ - "--enable-single-host" - "--enable-shared" - "--enable-absolute-shared-libs" - "--enable-c-opt=-O6" "--enable-gcc-opts" "--enable-inline-jumps" - "--enable-thread-system=posix" "--enable-dynamic-tls" - "--enable-openssl" - ]; + buildInputs = [ openssl git autoconf bootstrap ]; - buildInputs = [ openssl ]; + configurePhase = '' + options=( + --prefix=$out + --enable-single-host + --enable-c-opt=-O2 + --enable-gcc-opts + --enable-shared + --enable-absolute-shared-libs # Yes, NixOS will want an absolute path, and fix it. + --enable-poll + --enable-openssl + + #--enable-multiple-versions # Nope, NixOS already does version multiplexing + #--enable-guide + #--enable-track-scheme + #--enable-high-res-timing + #--enable-max-processors=4 + #--enable-multiple-vms + #--enable-dynamic-tls + #--enable-multiple-vms + #--enable-multiple-threaded-vms ## when SMP branch is merged in + #--enable-thread-system=posix ## default when --enable-multiple-vms is on. + #--enable-profile + #--enable-coverage + #--enable-inline-jumps + #--enable-char-size=1" ; default is 4 + ) + ./configure ''${options[@]} + ''; + + buildPhase = '' + # Make bootstrap compiler, from release bootstrap + mkdir -p boot/wip-compiler && + cp -rp ${bootstrap}/. boot/wip-compiler/. && + chmod -R u+w boot && + cd boot/wip-compiler && \ + cp ../../gsc/makefile.in ../../gsc/*.scm gsc && \ + (cd gsc && make bootclean ) && + make bootstrap && + cd ../.. && + cp boot/wip-compiler/gsc/gsc gsc-boot && + + # Now use the bootstrap compiler to build the real thing! + make -j2 from-scratch + ''; + + doCheck = true; meta = { description = "Optimizing Scheme to C compiler"; homepage = "http://gambitscheme.org"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 7ea403715a53..22047b663d04 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,15 +1,22 @@ -{ stdenv, fetchurl, fetchgit, gambit, openssl, zlib, coreutils, rsync, bash }: +{ stdenv, fetchurl, fetchgit, gambit, + coreutils, rsync, bash, + openssl, zlib, sqlite, libxml2, libyaml, libmysql, lmdb, leveldb }: stdenv.mkDerivation rec { name = "gerbil-${version}"; - version = "0.11"; - src = fetchurl { - url = "https://github.com/vyzo/gerbil/archive/v${version}.tar.gz"; - sha256 = "0mqg6cqdcf5qr7vk79x5zkls7z2wm8i3lhwn0b7i0g1m6yyyyff7"; + version = "0.12-DEV"; + src = fetchgit { + url = "https://github.com/vyzo/gerbil.git"; + rev = "3657b6e940ea248e0b312f276590e38ff68997e7"; + sha256 = "11ys7082ghkm4yikz4qxmv3jpxcr42jfi0jhjw1mpzbqdg6004w2"; }; - buildInputs = [ gambit openssl zlib coreutils rsync bash ]; + buildInputs = [ + gambit openssl + coreutils rsync bash + zlib openssl zlib sqlite libxml2 libyaml libmysql lmdb leveldb + ]; postPatch = '' patchShebangs . @@ -21,7 +28,13 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild + + # Enable all optional libraries + substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' + + # Build, replacing make by build.sh ( cd src && sh build.sh ) + runHook postBuild ''; diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix index 6b0cdf4fbdc5..92014200c611 100644 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ b/pkgs/development/compilers/ghc/8.2.1.nix @@ -9,8 +9,8 @@ let inherit (bootPkgs) ghc; - version = "8.2.1-rc2"; - preReleaseName = "ghc-8.2.0.20170507"; + version = "8.2.1-rc3"; + preReleaseName = "ghc-8.2.0.20170704"; commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure @@ -27,7 +27,7 @@ in stdenv.mkDerivation (rec { src = fetchurl { url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz"; - sha256 = "1hy3l6nzkyhzwy9mii4zs51jv048zwvdqk1q3188jznz35392zrn"; + sha256 = "0ccfybbjrmd8yzqbfdqvb6clz2kd005wi8sx3mfjmbkmxv0l4jry"; }; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix index 1ee4dea51e3b..6e3790917039 100644 --- a/pkgs/development/compilers/julia/0.5.nix +++ b/pkgs/development/compilers/julia/0.5.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.isDarwin; checkTarget = "testall"; # Julia's tests require read/write access to $HOME preCheck = '' diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix new file mode 100644 index 000000000000..e51bbc0c3086 --- /dev/null +++ b/pkgs/development/compilers/mono/5.0.nix @@ -0,0 +1,7 @@ +{ stdenv, callPackage, Foundation, libobjc }: + +callPackage ./generic-cmake.nix (rec { + inherit Foundation libobjc; + version = "5.0.0.48"; + sha256 = "13n20wmijkhd7vm41lzz1n774rna67d94prl33bz1lly0idsciq0"; +}) diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix new file mode 100644 index 000000000000..ab232f07d1b2 --- /dev/null +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -0,0 +1,94 @@ +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which }: + +let + llvm = callPackage ./llvm.nix { }; +in +stdenv.mkDerivation rec { + name = "mono-${version}"; + + src = fetchurl { + inherit sha256; + url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; + }; + + buildInputs = + [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which + ] + ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); + + propagatedBuildInputs = [glib]; + + NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ; + + # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 + dontDisableStatic = true; + + # In fact I think this line does not help at all to what I + # wanted to achieve: have mono to find libgdiplus automatically + configureFlags = [ + "--x-includes=${libX11.dev}/include" + "--x-libraries=${libX11.out}/lib" + "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so" + ] + ++ stdenv.lib.optionals withLLVM [ + "--enable-llvm" + "--enable-llvmloaded" + "--with-llvm=${llvm}" + ]; + + configurePhase = '' + substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}" + ./autogen.sh --prefix $out + ''; + + # Attempt to fix this error when running "mcs --version": + # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image + dontStrip = true; + + # Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601 + enableParallelBuilding = false; + + # We want pkg-config to take priority over the dlls in the Mono framework and the GAC + # because we control pkg-config + patches = [ ./pkgconfig-before-gac.patch ]; + + # Patch all the necessary scripts. Also, if we're using LLVM, we fix the default + # LLVM path to point into the Mono LLVM build, since it's private anyway. + preBuild = '' + makeFlagsArray=(INSTALL=`type -tp install`) + patchShebangs ./ + substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share" + '' + stdenv.lib.optionalString withLLVM '' + substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")" + ''; + + # Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps + # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive + # http://www.mono-project.com/Config_DllMap + postBuild = '' + find . -name 'config' -type f | xargs \ + sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" \ + -e "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" \ + ''; + + # Without this, any Mono application attempting to open an SSL connection will throw with + # The authentication or decryption has failed. + # ---> Mono.Security.Protocol.Tls.TlsException: Invalid certificate received from server. + postInstall = '' + echo "Updating Mono key store" + $out/bin/cert-sync ${cacert}/etc/ssl/certs/ca-bundle.crt + '' + # According to [1], gmcs is just mcs + # [1] https://github.com/mono/mono/blob/master/scripts/gmcs.in + + '' + ln -s $out/bin/mcs $out/bin/gmcs + ''; + + meta = { + homepage = http://mono-project.com/; + description = "Cross platform, open source .NET development framework"; + platforms = with stdenv.lib.platforms; darwin ++ linux; + maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ]; + license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? + }; +} diff --git a/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch b/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch new file mode 100644 index 000000000000..1b9c59402bff --- /dev/null +++ b/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch @@ -0,0 +1,65 @@ +diff -Naur mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets +--- mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets.old 2017-04-24 23:45:18.348116305 +0200 ++++ mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets 2017-04-24 23:45:11.407051755 +0200 +@@ -167,8 +167,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets +--- mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets.old 2017-04-24 23:49:53.019616196 +0200 ++++ mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets 2017-04-24 23:50:05.709729585 +0200 +@@ -232,8 +232,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets +--- mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets.old 2017-04-24 23:52:33.200037047 +0200 ++++ mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets 2017-04-24 23:52:43.281125802 +0200 +@@ -139,8 +139,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets +--- mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets.old 2017-04-24 23:54:02.585821594 +0200 ++++ mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets 2017-04-24 23:54:09.313880438 +0200 +@@ -234,8 +234,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets +--- mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets.old 2017-04-24 23:55:46.244895155 +0200 ++++ mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets 2017-04-24 23:55:51.998961342 +0200 +@@ -232,8 +232,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 3ed5a2bef722..6ace7d96be8c 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchzip, fetchgit, boost, cmake }: -let jsoncpp = fetchzip { - url = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; - sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0"; -}; in - -let commit = "68ef5810593e7c8092ed41d5f474dd43141624eb"; in +let + version = "0.4.12"; + rev = "194ff033ae44944ac59aa7bd3da89ba94ec5893c"; + sha256 = "0gkg3nay0625qmhxxxax1d1c4dl554ri3pkwd12qfg6g1w6j04w7"; + jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; + jsoncpp = fetchzip { + url = jsoncppURL; + sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0"; + }; +in -stdenv.mkDerivation rec { - version = "0.4.11"; +stdenv.mkDerivation { name = "solc-${version}"; # Cannot use `fetchFromGitHub' because of submodules src = fetchgit { url = "https://github.com/ethereum/solidity"; - rev = commit; - sha256 = "13zycybf23yvf3hkf9zgw9gbc1y4ifzxaf7sll69bsn24fcyq961"; + inherit rev sha256; }; patchPhase = '' - echo >commit_hash.txt ${commit} + echo >commit_hash.txt '${rev}' echo >prerelease.txt substituteInPlace deps/jsoncpp.cmake \ - --replace https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz ${jsoncpp} + --replace '${jsoncppURL}' ${jsoncpp} substituteInPlace cmake/EthCompilerSettings.cmake \ --replace 'add_compile_options(-Werror)' "" ''; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index af123de56547..1f6a39b86510 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5462,6 +5462,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "FontyFruity_0_5_3_3" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , directory, filepath, text, vector, xml + }: + mkDerivation { + pname = "FontyFruity"; + version = "0.5.3.3"; + sha256 = "0p02w0v93y11f7rzsc1im2rvld6h0pgrhmd827ypzamibry6xl5h"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq directory filepath text + vector xml + ]; + description = "A true type file format loader"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ForSyDe" = callPackage ({ mkDerivation, array, base, containers, directory, filepath, mtl , old-time, parameterized-data, pretty, process, random @@ -37571,8 +37588,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.35.6"; - sha256 = "1pp4wyii4gb585nvy8zzylpaxbmhxw6r0v28qdsm825kqldhvy4f"; + version = "4.35.9"; + sha256 = "1d7xd9v8gc0ahyx557470dw01s3zs6vz594a4hy95bgx5d45s357"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42405,12 +42422,16 @@ self: { }) {}; "clash-multisignal" = callPackage - ({ mkDerivation, base, clash-prelude, QuickCheck }: + ({ mkDerivation, base, clash-prelude, deepseq + , ghc-typelits-knownnat, QuickCheck + }: mkDerivation { pname = "clash-multisignal"; - version = "0.1.0.0"; - sha256 = "0hb9pxggdw8sg5g4227sghf366b2psl7l83c9mcy5dcxlng3znl4"; - libraryHaskellDepends = [ base clash-prelude QuickCheck ]; + version = "0.2.0.0"; + sha256 = "0jqlz3h226ql641z4kzwf921f5sb0zf9zh2c9gli4bbw7csn93nd"; + libraryHaskellDepends = [ + base clash-prelude deepseq ghc-typelits-knownnat QuickCheck + ]; homepage = "https://github.com/ra1u/clash-multisignal"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -51835,8 +51856,8 @@ self: { }: mkDerivation { pname = "data-basic"; - version = "0.2.0.1"; - sha256 = "16j5jvry7hfgnyz4bsi1a2kja7q7a0sfafswa942pqby6dzcgxz1"; + version = "0.2.0.3"; + sha256 = "0xmc9cj22nw90c4l9ava7da14d2y3pvip81admgjx8cqgz93255k"; libraryHaskellDepends = [ aeson base binary bytestring cases containers hssqlppp lens lens-aeson mtl overload postgresql-simple simple-effects @@ -52225,8 +52246,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, hspec, lens, tagged }: mkDerivation { pname = "data-diverse"; - version = "0.4.0.0"; - sha256 = "0jqyn4jwdvzijqwrb5j0052h95vxdwgixfb5a7cgwa574yipks09"; + version = "0.5.0.0"; + sha256 = "0cr67dpfbzayw2hhg8zf4yqwgbkjn5dislh7r96fjz1mkif6m0zz"; libraryHaskellDepends = [ base containers ghc-prim lens tagged ]; testHaskellDepends = [ base hspec lens tagged ]; homepage = "https://github.com/louispan/data-diverse#readme"; @@ -58514,6 +58535,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dlist_0_8_0_3" = callPackage + ({ mkDerivation, base, Cabal, deepseq, QuickCheck + , quickcheck-instances + }: + mkDerivation { + pname = "dlist"; + version = "0.8.0.3"; + sha256 = "0brgai4vs7xz29p06kd6gzg5bpa8iy3k7yzgcc44izspd74q4rw7"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base Cabal QuickCheck quickcheck-instances + ]; + homepage = "https://github.com/spl/dlist"; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dlist-instances" = callPackage ({ mkDerivation, base, dlist, semigroups }: mkDerivation { @@ -64534,8 +64573,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.8.2.4"; - sha256 = "01zzvd751bxy1mbfimqxn5ck172cc54lp7ch7p0yxln9ss2ngzj2"; + version = "0.8.2.5"; + sha256 = "0vl9kc0grhp72rlx922khvf5833qshyx4danismf8n5r3i9f7qr0"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -66128,13 +66167,13 @@ self: { }: mkDerivation { pname = "fast-tagsoup"; - version = "1.0.13"; - sha256 = "11h9d9a3wk87vw1xwc309cxhind1xbwhbvrqx6648dxf3nj5h1i5"; + version = "1.0.14"; + sha256 = "08vxz22iilai542h4g5c8xdawib9b0r7jlfmiga8ys7aq7nvgcsj"; libraryHaskellDepends = [ base bytestring containers tagsoup text text-icu ]; homepage = "https://github.com/vshabanov/fast-tagsoup"; - description = "Fast parser for tagsoup package"; + description = "Fast parsing and extracting information from (possibly malformed) HTML/XML documents"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -69017,8 +69056,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.3.3"; - sha256 = "0rl6zwamkwdjnlmn2rr0mh16idci5xqgr70qsvqarj34h1ax2idb"; + version = "0.5.3.4"; + sha256 = "066czbpbjk893q3npghmz94w9pqd0k89p8xxrmgd4g8gqqr1fii6"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -92963,6 +93002,8 @@ self: { pname = "heap"; version = "1.0.3"; sha256 = "00plmd5b8dlgb8324h1dbd168apfcx3hkv65rhi463a8lff7xmcv"; + revision = "1"; + editedCabalFile = "0j1f0xl3y2vqiyh3m9w5vssxyi62s6qic3zmpkm429vawyh4yad5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; @@ -97567,8 +97608,8 @@ self: { }: mkDerivation { pname = "hnormalise"; - version = "0.4.1.1"; - sha256 = "0q25mds552c87f2xs7s82b749drg3r41qswy0k8jmyz5dsc9wcir"; + version = "0.4.2.0"; + sha256 = "1h38qr8d8dbn81bghh3imb7jink6b06wadbpyg4axfr39s21xvkg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119093,8 +119134,8 @@ self: { }: mkDerivation { pname = "ldap-client"; - version = "0.1.0"; - sha256 = "18c33jfgwa7vdickxshyhmrqdpndy7ayjd3z0zqkjqa7awd0zcf4"; + version = "0.2.0"; + sha256 = "0vs6n3q9svwhcp6853ipxmw1anmy8qfy3xajjsf7h4pjnqzy7g88"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring connection containers network semigroups stm text @@ -125511,21 +125552,21 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, composition, containers - , criterion, directory, file-embed, hspec, hspec-megaparsec - , megaparsec, microlens, MonadRandom, mtl, optparse-applicative - , random-shuffle, template-haskell, text + ({ mkDerivation, ansi-wl-pprint, base, composition + , composition-extra, containers, criterion, directory, file-embed + , hspec, hspec-megaparsec, megaparsec, microlens, MonadRandom, mtl + , optparse-applicative, random-shuffle, template-haskell, text }: mkDerivation { pname = "madlang"; - version = "2.3.1.1"; - sha256 = "1ybbf281kpmdwggjvmhpilip0pficsqqg1m1nizgwwlgg76kwnj3"; + version = "2.3.2.0"; + sha256 = "0cg38m9ji0l8kv3sqqhwbvn57all0h9652acjdhhcg3n98hxpam6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base composition containers directory file-embed - megaparsec microlens MonadRandom mtl optparse-applicative - random-shuffle template-haskell text + ansi-wl-pprint base composition composition-extra containers + directory file-embed megaparsec microlens MonadRandom mtl + optparse-applicative random-shuffle template-haskell text ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -127792,7 +127833,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "mediabus_0_4_0_0" = callPackage + "mediabus_0_4_0_1" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers , data-default, deepseq, hspec, lens, lifted-async, monad-control @@ -127803,8 +127844,8 @@ self: { }: mkDerivation { pname = "mediabus"; - version = "0.4.0.0"; - sha256 = "00aps3hlml830ws4czpabzndwh2dvmyih1hy6k841zj7kzpvmg73"; + version = "0.4.0.1"; + sha256 = "0f0ip2l87a7divqp580iziskx3fkvv6f6vny42vz7v4p77i05p20"; libraryHaskellDepends = [ array async base bytestring cereal conduit conduit-combinators conduit-extra containers data-default deepseq lens lifted-async @@ -127818,7 +127859,7 @@ self: { monad-control mtl QuickCheck singletons spool stm tagged template-haskell text time transformers type-spec vector ]; - homepage = "https://github.com/lindenbaum/mediabus"; + homepage = "https://github.com/sheyll/mediabus"; description = "Multimedia streaming on top of Conduit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -127892,7 +127933,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "mediabus-rtp_0_4_0_0" = callPackage + "mediabus-rtp_0_4_0_1" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers , data-default, deepseq, hspec, lens, lifted-async, mediabus @@ -127903,8 +127944,8 @@ self: { }: mkDerivation { pname = "mediabus-rtp"; - version = "0.4.0.0"; - sha256 = "0b8nhyb072nqcikq40la226da30vg343cjmp4qjpsr714i2sd3rk"; + version = "0.4.0.1"; + sha256 = "1yfy8aak1z9bbwy676qyfxa7hmk1n94f3dn1x070hvpbvgpgmijb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127925,7 +127966,7 @@ self: { monad-control monad-logger mtl QuickCheck singletons spool stm tagged template-haskell text time transformers type-spec vector ]; - homepage = "https://github.com/lindenbaum/mediabus-rtp"; + homepage = "https://github.com/sheyll/mediabus-rtp"; description = "Receive and Send RTP Packets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -129958,8 +129999,8 @@ self: { }: mkDerivation { pname = "miso"; - version = "0.1.1.0"; - sha256 = "16ww5nbjdkjlwsr3dapv3px12dvi9dxbmz9z62n3hfpz5c4v5864"; + version = "0.1.2.0"; + sha256 = "1f9gs5lmcg86gs35fsdjq7bdhxyawdfna5lp84chsxl5fqa44wjs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137490,8 +137531,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.4.0.0"; - sha256 = "1cp77flxddnxiln2x1iy9f0ijrim9ai7xry87h23y8xn1zgwvyh4"; + version = "0.4.1.0"; + sha256 = "0vlcvvgl6sncgw03ks20b115jlznlv4f1n9fnzwzignws09hyf6y"; libraryHaskellDepends = [ async base binary bytestring template-haskell unix ]; @@ -139951,6 +139992,18 @@ self: { license = "GPL"; }) {}; + "onpartitions" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "onpartitions"; + version = "0.1.0.0"; + sha256 = "0iy4hpibiz6v93kz8jv5phb96sh6ygcdakf9vqss5d5622s5pgf1"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/paolino/onpartitions"; + description = "partition lenses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "onu-course" = callPackage ({ mkDerivation, base, smallcheck }: mkDerivation { @@ -144667,8 +144720,8 @@ self: { }: mkDerivation { pname = "pcgen"; - version = "1.0.0"; - sha256 = "1nh05bf7xd0l9jrjzvvmng64q5wc6j7iz856g8z3d20mcv2q1lza"; + version = "2.0.1"; + sha256 = "15116krysjvp3if7rdqcfjgqappfybjzwmgrkd5v5x8w62izhnla"; libraryHaskellDepends = [ base random ]; testHaskellDepends = [ base hspec QuickCheck random ]; benchmarkHaskellDepends = [ base criterion deepseq random ]; @@ -146154,8 +146207,8 @@ self: { }: mkDerivation { pname = "pg-store"; - version = "0.4.2"; - sha256 = "1i1ma0m7qmn2v2qswv5kj1rbbfscqirkcvyr5nf07czbghwpx1v6"; + version = "0.4.3"; + sha256 = "1qqy79yqhwjw094p8i4qanmjwlvym7lndnqiw10mgp0xn63rznid"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring hashable haskell-src-meta mtl postgresql-libpq scientific tagged @@ -152683,8 +152736,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "4.0.6"; - sha256 = "0w8n7l4ws3awccqf6g12bk09l10s4scmdvr5vkxhhpm5cmawd0fq"; + version = "4.3.0"; + sha256 = "1walyz9x0rxa9n77kr0w7gpm2vnydxq70ii782ygzy0izymhnx39"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153017,6 +153070,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers_2_4_2" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, filepath, mtl, parsec, syb, utf8-string + }: + mkDerivation { + pname = "protocol-buffers"; + version = "2.4.2"; + sha256 = "13z1sh8z5b3nlscqnzw137k3979d4war3yzhxclljqq2z88rm1bv"; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath mtl + parsec syb utf8-string + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { @@ -163902,6 +163973,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "safe-exceptions_0_1_6_0" = callPackage + ({ mkDerivation, base, deepseq, exceptions, hspec, transformers + , void + }: + mkDerivation { + pname = "safe-exceptions"; + version = "0.1.6.0"; + sha256 = "074dy2f9fbhnh59clpz8c1ljplm1wwqjj7r3i4nv0rcl0khprm3i"; + libraryHaskellDepends = [ base deepseq exceptions transformers ]; + testHaskellDepends = [ base hspec void ]; + homepage = "https://github.com/fpco/safe-exceptions#readme"; + description = "Safe, consistent, and easy exception handling"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe-exceptions-checked" = callPackage ({ mkDerivation, base, deepseq, hspec, safe-exceptions , transformers @@ -163910,8 +163997,8 @@ self: { pname = "safe-exceptions-checked"; version = "0.1.0"; sha256 = "0gyaq2pf87dqn0l6n3mi0qamf99y3zj5xxh513c0iqwdh8mma1yq"; - revision = "1"; - editedCabalFile = "1nnnljp0l70zafgfl09kskf965p993plmk52pv2wqhjj94xdnwzb"; + revision = "2"; + editedCabalFile = "18fwk5yr8zm4y215vbsl149jkn9pxyv3m8mgq3979pvs1c4kqivz"; libraryHaskellDepends = [ base deepseq safe-exceptions transformers ]; @@ -171779,6 +171866,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simple-logging" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, iso8601-time + , lens, mtl, simple-effects, string-conv, text, time, vector + }: + mkDerivation { + pname = "simple-logging"; + version = "0.2.0.1"; + sha256 = "1x0vclb2an4mbwxqk44z0rpw1ai0pq2kc9ak0chyzijbk1vivwmx"; + libraryHaskellDepends = [ + aeson base bytestring exceptions iso8601-time lens mtl + simple-effects string-conv text time vector + ]; + testHaskellDepends = [ base simple-effects ]; + homepage = "https://gitlab.com/haskell-hr/logging"; + description = "Logging effect to plug into the simple-effects framework"; + license = stdenv.lib.licenses.mit; + }) {}; + "simple-money" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -172447,9 +172552,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "singnal"; - version = "0.1.0.0"; - sha256 = "099akvb0j6a7hh4g5pm8i8hy8pmsc6i33jg957zsbnbh72s0ck3d"; + version = "0.1.1.0"; + sha256 = "16f0grf63wgkaab64mmqhxwwk50pzzy354i3v23lzw7s5x0bk8sj"; libraryHaskellDepends = [ base ]; + homepage = "https://github.com/zaoqi/Signal.hs"; + description = "Singnal"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -179953,21 +180060,20 @@ self: { }) {}; "streaming-concurrency" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hspec, lifted-async + ({ mkDerivation, base, exceptions, hspec, lifted-async , monad-control, QuickCheck, quickcheck-instances, stm, streaming - , streaming-bytestring, streaming-with, transformers-base + , streaming-with, transformers-base }: mkDerivation { pname = "streaming-concurrency"; - version = "0.1.0.0"; - sha256 = "1g2p928mvkwwdy0xbm8c6ph2cdqswj1gpi0zq6ln1bl4f3xd98rz"; + version = "0.3.0.0"; + sha256 = "1dnlnm57rlk900n148xnfihx917rc9lggx6fdzhf7cjbi1n2ibn2"; libraryHaskellDepends = [ - base bytestring exceptions lifted-async monad-control stm streaming - streaming-bytestring streaming-with transformers-base + base exceptions lifted-async monad-control stm streaming + streaming-with transformers-base ]; testHaskellDepends = [ - base bytestring hspec QuickCheck quickcheck-instances streaming - streaming-bytestring + base hspec QuickCheck quickcheck-instances streaming ]; description = "Concurrency support for the streaming ecosystem"; license = stdenv.lib.licenses.mit; @@ -185136,16 +185242,16 @@ self: { }) {}; "teardown" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, criterion, doctest, Glob - , protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit + ({ mkDerivation, ansi-wl-pprint, base, criterion, deepseq, doctest + , Glob, protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit , tasty-rerun, tasty-smallcheck, text, time }: mkDerivation { pname = "teardown"; - version = "0.1.0.0"; - sha256 = "0sg113khwlb56x0rgb47lm0hf0cfsr9wc31w98nav9zcw5gndm33"; + version = "0.1.0.1"; + sha256 = "0jxhr73dq4gvbzrwhbqsrwg1v8qa2mj1nfygb44kj60diwa4cwj2"; libraryHaskellDepends = [ - ansi-wl-pprint base protolude text time + ansi-wl-pprint base deepseq protolude text time ]; testHaskellDepends = [ base doctest Glob protolude QuickCheck tasty tasty-hspec @@ -188788,19 +188894,16 @@ self: { }) {}; "throwable-exceptions" = callPackage - ({ mkDerivation, base, doctest, either, safe-exceptions, tasty - , tasty-discover, tasty-hunit, template-haskell, text + ({ mkDerivation, base, doctest, either, safe-exceptions, silently + , tasty, tasty-discover, tasty-hunit, template-haskell, text }: mkDerivation { pname = "throwable-exceptions"; - version = "0.1.0.7"; - sha256 = "1afxzk9xvxlvi13ysda9gcv6zzr7njcvi5p15lbn9bg68nrwqazj"; - isLibrary = true; - isExecutable = true; + version = "0.1.0.8"; + sha256 = "0d8dxrd922rxnn417yn2ij71v6vb9c5i37qvcmdixfh773p9sm8r"; libraryHaskellDepends = [ base safe-exceptions template-haskell ]; - executableHaskellDepends = [ base safe-exceptions ]; testHaskellDepends = [ - base doctest either safe-exceptions tasty tasty-discover + base doctest either safe-exceptions silently tasty tasty-discover tasty-hunit text ]; homepage = "https://github.com/aiya000/hs-throwable-exceptions#README.md"; @@ -192797,14 +192900,13 @@ self: { "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition, containers, criterion, data-default - , directory, extra, hspec, hspec-megaparsec, http-client - , http-client-tls, http-types, lens, megaparsec - , optparse-applicative, split, text + , directory, extra, hspec, http-client, http-client-tls, http-types + , lens, megaparsec, optparse-applicative, split, text }: mkDerivation { pname = "tweet-hs"; - version = "0.6.0.1"; - sha256 = "1rd1isvbia2cvxbfxx6sxk8vz3vjckpwa7ci0sgpbmb6qcm0ddyr"; + version = "0.6.1.2"; + sha256 = "17nvm7xnb5gvmq977bz812gd6s3dfvvkxd2zwcdayczdmnz06gyz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192813,10 +192915,8 @@ self: { http-types lens megaparsec optparse-applicative split text ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec - ]; - benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; + testHaskellDepends = [ base bytestring hspec ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Command-line tool for twitter"; license = stdenv.lib.licenses.bsd3; @@ -195799,8 +195899,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "0.4.3"; - sha256 = "17rrikfid54z8h95qns5q7bdxadnnggv1pl2d9ilz9pz9hi7a9g6"; + version = "0.5"; + sha256 = "0i444yzxn4g8khjj8m2n4507qwvdvsypsb4qkylkz23214c6qax4"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe stm text text-format transformers diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 1694e3e48509..59ddfde08aea 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,41 +1,72 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, hostPlatform }: +rec { -stdenv.mkDerivation rec { - name = "luajit-${version}"; - version = "2.1.0-beta3"; - luaversion = "5.1"; + luajit = + # Compatibility problems with lightuserdata pointers; see: + # https://github.com/LuaJIT/LuaJIT/blob/v2.1/doc/status.html#L101 + if hostPlatform.is64bit && (hostPlatform.isArm || hostPlatform.isSunOS) + then luajit_2_0 + else luajit_2_1; - src = fetchurl { - url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"; + luajit_2_0 = generic { + version = "2.0.5"; + isStable = true; + sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; }; - enableParallelBuilding = true; - - patchPhase = '' - substituteInPlace Makefile \ - --replace /usr/local $out - - substituteInPlace src/Makefile --replace gcc cc - '' + stdenv.lib.optionalString (stdenv.cc.libc != null) - '' - substituteInPlace Makefile \ - --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig - ''; - - configurePhase = false; - buildFlags = [ "amalg" ]; # Build highly optimized version - installPhase = '' - make install INSTALL_INC=$out/include PREFIX=$out - ln -s $out/bin/luajit* $out/bin/lua - ln -s $out/bin/luajit* $out/bin/luajit - ''; - - meta = with stdenv.lib; { - description = "High-performance JIT compiler for Lua 5.1"; - homepage = http://luajit.org; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers ; [ thoughtpolice smironov ]; + luajit_2_1 = generic { + version = "2.1.0-beta3"; + isStable = false; + sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"; }; + + + generic = + { version, sha256 ? null, isStable + , name ? "luajit-${version}" + , src ? + (fetchurl { + url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; + inherit sha256; + }) + }: + + stdenv.mkDerivation rec { + inherit name version src; + + luaversion = "5.1"; + + patchPhase = '' + substituteInPlace Makefile \ + --replace /usr/local "$out" + + substituteInPlace src/Makefile --replace gcc cc + '' + stdenv.lib.optionalString (stdenv.cc.libc != null) + '' + substituteInPlace Makefile \ + --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig + ''; + + configurePhase = false; + + buildFlags = [ "amalg" ]; # Build highly optimized version + enableParallelBuilding = true; + + installPhase = '' + make install INSTALL_INC="$out"/include PREFIX="$out" + ln -s "$out"/bin/luajit-* "$out"/bin/lua + '' + + stdenv.lib.optionalString (!isStable) + '' + ln -s "$out"/bin/luajit-* "$out"/bin/luajit + ''; + + meta = with stdenv.lib; { + description = "High-performance JIT compiler for Lua 5.1"; + homepage = http://luajit.org; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers ; [ thoughtpolice smironov vcunat ]; + }; + }; } diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index a977e0801a8f..17e545d95a74 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { rewriting logic computation. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix new file mode 100644 index 000000000000..f897e3744af1 --- /dev/null +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -0,0 +1,8 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "6.2.23"; + sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; + license = stdenv.lib.licenses.agpl3; + extraPatches = [ ./clang-6.0.patch ]; +}) diff --git a/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch b/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch new file mode 100644 index 000000000000..00f3d8baedf9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch @@ -0,0 +1,9 @@ +diff --git a/src/runtime/kwalletd/org.kde.kwalletd5.service.in b/src/runtime/kwalletd/org.kde.kwalletd5.service.in +index 76eb90e..7a78e83 100644 +--- a/src/runtime/kwalletd/org.kde.kwalletd5.service.in ++++ b/src/runtime/kwalletd/org.kde.kwalletd5.service.in +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=org.kde.kwalletd5 +-Exec=@CMAKE_INSTALL_PREFIX@/bin/kwalletd5 ++Exec=@CMAKE_INSTALL_BINDIR@/kwalletd5 diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index fca0dedd083e..ece915071ad0 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -15,4 +15,5 @@ mkDerivation { knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme ]; propagatedBuildInputs = [ qtbase ]; + patches = [ ./kwallet-dbus.patch ]; } diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 3d4fbab3e422..28d435fbb9ca 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -28,7 +28,7 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in let result = { libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f"; - libav_11 = libavFun "11.9" "36ed1329099676ff3c970576e03c6a21f2da2e15"; + libav_11 = libavFun "11.10" "38db6721ca8423682e4d614c170eccc33ba32e00"; libav_12 = libavFun "12" "4ecde7274621c82a6882b7614d907b28de25cc4e"; }; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index ef32575c8e36..f7fcf8a2206c 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,46 +1,51 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, gtk3, libXinerama, libSM, libXxf86vm , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile , withMesa ? true, mesa_glu ? null, mesa_noglu ? null , compat24 ? false, compat26 ? true, unicode ? true -, withWebKit ? false, webkitgtk24x-gtk2 ? null +, withGtk2 ? true +, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: assert withMesa -> mesa_glu != null && mesa_noglu != null; -assert withWebKit -> webkitgtk24x-gtk2 != null; +assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null; with stdenv.lib; let - version = "3.0.2"; + version = "3.0.3.1"; in stdenv.mkDerivation { name = "wxwidgets-${version}"; - src = fetchurl { - url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; - sha256 = "0paq27brw4lv8kspxh9iklpa415mxi8zc117vbbbhfjgapf7js1l"; + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "v${version}"; + sha256 = "1b90in65k1ij6kyk41knxs86i6hx5lkz30gpvzdvh0cbjagv5asq"; }; buildInputs = - [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] ++ optional withMesa mesa_glu - ++ optional withWebKit webkitgtk24x-gtk2 + ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; - patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/jessehager/MINGW-packages/af6ece963d8157dd3fbc710bcc190647c4924c63/mingw-w64-wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch"; - sha256 = "0100pg0z7i6cjyysf2k3330pmqmdaxgc9hz6kxnfvc31dynjcq3h"; - }) ]; + patches = + # "Add support for WebKit2GTK+ in wxWebView". Will be in 3.0.4 + optional (!withGtk2) (fetchpatch { + url = "https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7.patch"; + sha256 = "0gxd83xajm7gdv9rdzyvqwa2p5nz29nr23i0zx2dgfpsvz2qjp3q"; + }); configureFlags = - [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" + [ "--disable-precomp-headers" "--enable-mediactrl" (if compat24 then "--enable-compat24" else "--disable-compat24") (if compat26 then "--enable-compat26" else "--disable-compat26") ] ++ optional unicode "--enable-unicode" @@ -72,7 +77,7 @@ stdenv.mkDerivation { passthru = { inherit compat24 compat26 unicode; - gtk = gtk2; + gtk = if withGtk2 then gtk2 else gtk3; }; enableParallelBuilding = true; diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix new file mode 100644 index 000000000000..de2010275ef9 --- /dev/null +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }: + +let version = "1.4"; in + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-benchmark-${version}"; + + src = fetchzip { + url = "https://github.com/Chris00/ocaml-benchmark/releases/download/${version}/benchmark-${version}.tar.gz"; + sha256 = "16wi8ld7c3mq77ylpgbnj8qqqqimyzwxs47v06vyrwpma5pab5xa"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ocaml_pcre ]; + + createFindlibDestdir = true; + + meta = { + homepage = http://ocaml-benchmark.forge.ocamlcore.org/; + platforms = ocaml.meta.platforms or []; + description = "Benchmark running times of code"; + license = stdenv.lib.licenses.lgpl21; + maintainers = with stdenv.lib.maintainers; [ volth ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix new file mode 100644 index 000000000000..aa44fe3d009b --- /dev/null +++ b/pkgs/development/ocaml-modules/ptmap/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchzip, ocaml, findlib, obuild }: + +let version = "2.0.1"; in + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-ptmap-${version}"; + + src = fetchzip { + url = "https://github.com/UnixJunkie/ptmap/archive/v${version}.tar.gz"; + sha256 = "09ib4q5amkac2yy0hr7yn1n1j6y10v08chh82qc70wl7s473if15"; + }; + + buildInputs = [ ocaml findlib obuild ]; + + createFindlibDestdir = true; + + buildPhase = '' + substituteInPlace ptmap.obuild --replace 'build-deps: qcheck' "" + obuild configure + obuild build lib-ptmap + ''; + + installPhase = '' + obuild install --destdir $out/lib/ocaml/${ocaml.version}/site-lib + ''; + + meta = { + homepage = https://www.lri.fr/~filliatr/software.en.html; + platforms = ocaml.meta.platforms or []; + description = "Maps over integers implemented as Patricia trees"; + license = stdenv.lib.licenses.lgpl21; + maintainers = with stdenv.lib.maintainers; [ volth ]; + }; +} diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix new file mode 100644 index 000000000000..a62c321a4e83 --- /dev/null +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, benchmark }: + +let version = "0.5"; in + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-rope-${version}"; + + src = fetchzip { + url = "https://forge.ocamlcore.org/frs/download.php/1156/rope-${version}.tar.gz"; + sha256 = "1i8kzg19jrapl30mq8m91vy09z0r0dl4bnpw24ga96w8pxqf9qhd"; + }; + + buildInputs = [ ocaml findlib ocamlbuild benchmark ]; + + createFindlibDestdir = true; + + meta = { + homepage = http://rope.forge.ocamlcore.org/; + platforms = ocaml.meta.platforms or []; + description = ''Ropes ("heavyweight strings") in OCaml''; + license = stdenv.lib.licenses.lgpl21; + maintainers = with stdenv.lib.maintainers; [ volth ]; + }; +} diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix new file mode 100644 index 000000000000..f6d3a747ee48 --- /dev/null +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, fetchPypi +, lib +, recursivePthLoader +}: + +buildPythonPackage rec { + pname = "virtualenv"; + version = "15.0.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d"; + }; + + # Doubt this is needed - FRidh 2017-07-07 + pythonPath = [ recursivePthLoader ]; + + patches = [ ./virtualenv-change-prefix.patch ]; + + # Tarball doesn't contain tests + doCheck = false; + + meta = { + description = "A tool to create isolated Python environments"; + homepage = http://www.virtualenv.org; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ goibhniu ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch index 958187f982fe..958187f982fe 100644 --- a/pkgs/development/python-modules/virtualenv-change-prefix.patch +++ b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 8ccc6dbf306f..0caa8b226f08 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -1,35 +1,30 @@ -{ buildRubyGem, fetchFromGitHub, lib, bundler, ruby, nix, nix-prefetch-git }: +{ buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, ruby, nix, + nix-prefetch-git }: buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "manveru"; repo = "bundix"; rev = version; - sha256 = "1gh90yxm4k27jdjdl3r31fcg4sk7k54jlbw1zfm1p9q3i7k8x4i7"; + sha256 = "0ap23abv6chiv7v97ic6b1qf5by6b26as5yrpxg5q7p2giyiv33v"; }; - buildInputs = [bundler]; + buildInputs = [ ruby bundler ]; + nativeBuildInputs = [ makeWrapper ]; - postInstall = '' - substituteInPlace $GEM_HOME/gems/${gemName}-${version}/lib/bundix.rb \ - --replace \ - "'nix-instantiate'" \ - "'${nix.out}/bin/nix-instantiate'" \ - --replace \ - "'nix-hash'" \ - "'${nix.out}/bin/nix-hash'" \ - --replace \ - "'nix-prefetch-url'" \ - "'${nix.out}/bin/nix-prefetch-url'" \ - --replace \ - "'nix-prefetch-git'" \ - "'${nix-prefetch-git}/bin/nix-prefetch-git'" + preFixup = '' + wrapProgram $out/bin/bundix \ + --prefix PATH : "${nix.out}/bin" \ + --prefix PATH : "${nix-prefetch-git.out}/bin" \ + --prefix PATH : "${bundler.out}/bin" \ + --set GEM_HOME "${bundler}/${bundler.ruby.gemPath}" \ + --set GEM_PATH "${bundler}/${bundler.ruby.gemPath}" ''; meta = { diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 12551ed741c1..feb6865566f0 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "0.9.9"; + version = "1.0.0"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0qiqy681y1w21gjxw30kn44vxh9615j3825v06aq690p56w3rc63"; + sha256 = "0d74b3aasgg4ap5ishzzm4jbf1k4dxv7gzd88d69miyapsaa4p0c"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 64ab960c88b1..2ed436981e00 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -13,11 +13,11 @@ let package = pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.7"; + version = "0.9.9.post2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0cwy39ap2v9kni3zm92633cnqf7qsnb4zlargx060pbfagkg1jwg"; + sha256 = "0g932pvkxqq3ijwkwwa29jd9sp5895gv40c3k7m2acc5dp8ygb9w"; }; buildInputs = with pythonPackages; [ @@ -83,7 +83,7 @@ let meta = with stdenv.lib; { homepage = http://buildbot.net/; - description = "Continuous integration system that automates the build/test cycle"; + description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes"; maintainers = with maintainers; [ nand0p ryansydnor ]; license = licenses.gpl2; }; diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 3c15e256a3f6..63fc61cd1b8d 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -4,11 +4,11 @@ let buildbot-pkg = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "0.9.7"; + version = "0.9.9.post2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0p351r10y42gwgxb2qg7xlsbhmnzdmqp6h4922l0yfii3pzmrdzv"; + sha256 = "1h24fzyr4kfm1nb2627hgg9nl5mwv1gihc3f2wb5000gxmjdasg8"; }; propagatedBuildInputs = with pythonPackages; [ setuptools ]; @@ -25,14 +25,14 @@ in { www = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot_www"; - version = "0.9.7"; + version = "0.9.9.post2"; # NOTE: wheel is used due to buildbot circular dependency format = "wheel"; src = pythonPackages.fetchPypi { inherit pname version format; - sha256 = "1wf2spnilm0dkyw95vf57lca453sbly4r6ak3lxa8bpwhxb6lkdn"; + sha256 = "1yzk3sy9i8g8wz9vvghhxnafs5dzsd3sybmm8lg043129rh116b9"; }; meta = with stdenv.lib; { @@ -46,11 +46,11 @@ in { console-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-console-view"; - version = "0.9.7"; + version = "0.9.9.post2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1iv77886rbbn0wlzl5qiqc08rgbymxirqh3vmimqwsabbh7fhzkm"; + sha256 = "0mmlxzlzl0r97jf0g98m7k1b13mzzy80445i0biazkj0vzkpwxza"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -66,11 +66,11 @@ in { waterfall-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-waterfall-view"; - version = "0.9.7"; + version = "0.9.9.post2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1q42l25cryx0yp6lbbl0mxnxkb9h24wawhzhi1wkc3kj8zs5sifn"; + sha256 = "0pq45gddwjd61nxmr48cl8s533i4gy3wg9wzbj3g1yb30yrz8qf4"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -82,4 +82,25 @@ in { license = licenses.gpl2; }; }; + + grid-view = pythonPackages.buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "buildbot-grid-view"; + version = "0.9.9.post2"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "16y7br1yniby8yp932ildn14cxvbw5ywx36d703c4d98dmnlrpaw"; + }; + + propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; + + meta = with stdenv.lib; { + homepage = http://buildbot.net/; + description = "Buildbot Grid View Plugin"; + maintainers = with maintainers; [ nand0p ]; + license = licenses.gpl2; + }; + }; + } diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 28fb719d84a0..f87e8db85554 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "0.9.7"; + version = "0.9.9.post2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0s62i808l13a8dprmrb2dikh7d1xvvdnw3pfhl6im0i9fc64w6x4"; + sha256 = "1wb2fw0djamhn1sb7rwnf12i4ijdq9y4k33ri7dcwxxcavxsvqa0"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix new file mode 100644 index 000000000000..dc2d545a7654 --- /dev/null +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -0,0 +1,41 @@ +{ stdenv, qt5, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "qbs-${version}"; + + version = "1.8"; + + src = fetchFromGitHub { + owner = "qt-labs"; + repo = "qbs"; + rev = "fa9c21d6908e0dad805113f570ac883c1dc5067a"; + sha256 = "1manriz75rav1vldkk829yk1la9md4m872l5ykl9m982i9801d9g"; + }; + + enableParallelBuilding = true; + + buildInputs = with qt5; [ + qtbase + qtscript + ]; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + buildPhase = '' + # From http://doc.qt.io/qbs/building.html + qmake -r qbs.pro + make + ''; + + postInstall = '' + mv $out/usr/local/* "$out" + ''; + + meta = with stdenv.lib; { + description = "A tool that helps simplify the build process for developing projects across multiple platforms"; + license = licenses.lgpl21; + maintainers = with maintainers; [ expipiplus1 ]; + inherit version; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix new file mode 100644 index 000000000000..b4bc680a19aa --- /dev/null +++ b/pkgs/development/tools/git-ftp/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, pandoc, man }: +stdenv.mkDerivation rec { + name = "git-ftp-${version}"; + version = "1.4.0"; + src = fetchFromGitHub { + owner = "git-ftp"; + repo = "git-ftp"; + rev = version; + sha256 = "0n8q1azamf10qql8f8c4ppbd3iisy460gwxx09v5d9hji5md27s3"; + }; + + dontBuild = true; + + installPhase = '' + make install-all prefix=$out + ''; + + buildInputs = [pandoc man]; + + meta = with stdenv.lib; { + description = "Git powered FTP client written as shell script."; + homepage = https://git-ftp.github.io/; + license = licenses.gpl3; + maintainers = with maintainers; [ tweber ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix new file mode 100644 index 000000000000..ab84cb37656e --- /dev/null +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -0,0 +1,59 @@ +{ stdenv, lib, fetchFromGitHub +, gcc-arm-embedded, bash, libftdi +, python, pythonPackages +}: + +with lib; + +stdenv.mkDerivation rec { + name = "blackmagic-${version}"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "blacksphere"; + repo = "blackmagic"; + rev = "d3a8f27fdbf952194e8fc5ce9b2fc9bcef7c545c"; + sha256 = "0c3l7cfqag3g7zrfn4mmikkx7076hb1r856ybhhdh0f6zji2j6jx"; + fetchSubmodules = true; + }; + + buildInputs = [ + gcc-arm-embedded + libftdi + python + pythonPackages.intelhex + ]; + + postPatch = '' + # Prevent calling out to `git' to generate a version number: + substituteInPlace src/Makefile \ + --replace '`git describe --always --dirty`' '${version}' + + # Fix scripts that generate headers: + for f in $(find scripts libopencm3/scripts -type f); do + patchShebangs "$f" + done + ''; + + buildPhase = "${stdenv.shell} ${./helper.sh}"; + installPhase = ":"; # buildPhase does this. + + meta = { + description = "In-application debugger for ARM Cortex microcontrollers"; + longDescription = '' + The Black Magic Probe is a modern, in-application debugging tool + for embedded microprocessors. It allows you to see what is going + on "inside" an application running on an embedded microprocessor + while it executes. + + This package builds the firmware for all supported platforms, + placing them in separate directories under the firmware + directory. It also places the FTDI version of the blackmagic + executable in the bin directory. + ''; + homepage = https://github.com/blacksphere/blackmagic; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pjones ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/misc/blackmagic/helper.sh b/pkgs/development/tools/misc/blackmagic/helper.sh new file mode 100755 index 000000000000..b4c7558885bb --- /dev/null +++ b/pkgs/development/tools/misc/blackmagic/helper.sh @@ -0,0 +1,49 @@ +################################################################################ +# Build all of the platforms manually since the `all_platforms' target +# doesn't preserve all of the build outputs and overrides CFLAGS. +set -e +set -u + +################################################################################ +# Prevent a warning from shellcheck: +out=${out:-/tmp} + +################################################################################ +export CFLAGS=$NIX_CFLAGS_COMPILE + +################################################################################ +PRODUCTS="blackmagic.bin blackmagic.hex blackmagic_dfu.bin blackmagic_dfu.hex" + +################################################################################ +make_platform() { + echo "Building for hardware platform $1" + + make clean + make PROBE_HOST="$1" + + if [ "$1" = libftdi ]; then + mkdir -p "$out/bin" + install -m 0555 blackmagic "$out/bin" + fi + + for f in $PRODUCTS; do + if [ -r "$f" ]; then + mkdir -p "$out/firmware/$1" + install -m 0444 "$f" "$out/firmware/$1" + fi + done + +} + +################################################################################ +# Start by building libopencm3: +make -C libopencm3 + +################################################################################ +# And now all of the platforms: +cd src + +for platform in platforms/*/Makefile.inc; do + probe=$(basename "$(dirname "$platform")") + make_platform "$probe" +done diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix new file mode 100644 index 000000000000..0b5295654d39 --- /dev/null +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchzip, ocaml }: + +let version = "0.1.8"; in + +stdenv.mkDerivation { + name = "obuild-${version}"; + + src = fetchzip { + url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz"; + sha256 = "1q1k2qqd08j1zakvydgvwgwpyn0ll7rs65gap0pvg3amnh5cp3wd"; + }; + + buildInputs = [ ocaml ]; + + buildPhase = '' + ./bootstrap + ''; + + installPhase = '' + mkdir -p $out/bin + cp dist/build/obuild/obuild dist/build/obuild-from-oasis/obuild-from-oasis dist/build/obuild-simple/obuild-simple $out/bin/ + ''; + + meta = { + homepage = https://github.com/ocaml-obuild/obuild; + platforms = ocaml.meta.platforms or []; + description = "Simple package build system for OCaml"; + license = stdenv.lib.licenses.lgpl21; + maintainers = with stdenv.lib.maintainers; [ volth ]; + }; +} diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 6ac192e63756..8fb668df5b92 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -4,13 +4,13 @@ rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; - version = "0.25.5"; + version = "0.26.1"; src = fetchFromGitHub { owner = "servo"; repo = "rust-bindgen"; rev = "v${version}"; - sha256 = "0hv90h279frbxjay5g5vphds6wj3fiid9f2vmg1nr8887y4nif0k"; + sha256 = "1w1vbfhmcrcl0vacxkivmavjp51cvpyq5lk75n9zs80q5x38ypna"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib" ''; - depsSha256 = "0ylm1wzf9aqcyfmmgpb18bdp5c5d73pnnjw13cv373511mkj1y0m"; + depsSha256 = "0s1x4ygjwc14fbl2amz5g6n7lq07zy8b00mvwfw6vi6k4bq1g59i"; doCheck = false; # A test fails because it can't find standard headers in NixOS diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 790ab51c80df..ea4f44f52bbb 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { sed -e "/touch.*LOGPATH/s@touch@echo should have created @" -i Makefile sed -e 's/chown/true/g' -i Makefile sed -e '/chkconfig/d' -i Makefile + sed -e 's/chmod 04711/chmod 0711/g' -i Makefile ''; preInstall = '' diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index b81c8f257b89..2f4689beea49 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2017-04-16"; + version = "2017-07-05"; # This repo is built by merging the latest versions of # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "fpletz"; repo = "linux-firmware"; rev = version; - sha256 = "0ar29vjjpsw7r7pqqa8b0jxx03k230cn7x8fkqi23bj68bd9x5pc"; + sha256 = "0vlk043y7c32g4d9hz93j64x372qqrwsq65mh8s5s5xrvamja2if"; }; preInstall = '' diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 912fb8dcee49..f9cb9e73e776 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -39,7 +39,7 @@ with stdenv.lib; SCHEDSTATS n DETECT_HUNG_TASK y - ${optionalString (versionOlder version "4.10") '' + ${optionalString (versionOlder version "4.4") '' CPU_NOTIFIER_ERROR_INJECT? n ''} @@ -92,6 +92,14 @@ with stdenv.lib; # module, so that the initrd gets a good I/O scheduler. IOSCHED_CFQ y BLK_CGROUP y # required by CFQ + IOSCHED_DEADLINE y + ${optionalString (versionAtLeast version "4.11") '' + MQ_IOSCHED_DEADLINE y + ''} + ${optionalString (versionAtLeast version "4.12") '' + MQ_IOSCHED_KYBER y + IOSCHED_BFQ m + ''} # Enable NUMA. NUMA? y @@ -593,7 +601,7 @@ with stdenv.lib; FW_LOADER_USER_HELPER_FALLBACK? n # Disable various self-test modules that have no use in a production system - ${optionalString (versionOlder version "4.9") '' + ${optionalString (versionOlder version "4.4") '' ARM_KPROBES_TEST? n ''} @@ -602,8 +610,6 @@ with stdenv.lib; BACKTRACE_SELF_TEST? n CRC32_SELFTEST? n CRYPTO_TEST? n - DRM_DEBUG_MM_SELFTEST? n - EFI_TEST? n GLOB_SELFTEST? n INTERVAL_TREE_TEST? n LNET_SELFTEST? n @@ -612,29 +618,37 @@ with stdenv.lib; NOTIFIER_ERROR_INJECTION? n PERCPU_TEST? n RBTREE_TEST? n - RCU_PERF_TEST? n RCU_TORTURE_TEST? n - TEST_ASYNC_DRIVER_PROBE? n - TEST_BITMAP? n TEST_BPF? n TEST_FIRMWARE? n - TEST_HASH? n TEST_HEXDUMP? n TEST_KSTRTOX? n TEST_LIST_SORT? n TEST_LKM? n - TEST_PARMAN? n TEST_PRINTF? n TEST_RHASHTABLE? n - TEST_SORT? n TEST_STATIC_KEYS? n TEST_STRING_HELPERS? n TEST_UDELAY? n TEST_USER_COPY? n - TEST_UUID? n - WW_MUTEX_SELFTEST? n XZ_DEC_TEST? n + ${optionalString (versionOlder version "4.4") '' + EFI_TEST? n + RCU_PERF_TEST? n + TEST_ASYNC_DRIVER_PROBE? n + TEST_BITMAP? n + TEST_HASH? n + TEST_UUID? n + ''} + + ${optionalString (versionAtLeast version "4.11") '' + DRM_DEBUG_MM_SELFTEST? n + TEST_PARMAN? n + TEST_SORT? n + WW_MUTEX_SELFTEST? n + ''} + # ChromiumOS support ${optionalString (features.chromiumos or false) '' CHROME_PLATFORMS y diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix index afdb1427e85e..51151b449a4a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.11.8"; + version = "4.11.9"; extraMeta.branch = "4.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1f4x4wym6kr57zhjpmvj9p7z2j43zcvpyvkh2nnhsb4yxg5qszcf"; + sha256 = "0q60690hmqhz2x3v6qyjq7lhp2j99dcldvd46myc9ggp78d93j1z"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 8c05fdc711bf..5ac5a52c0a5e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.75"; + version = "4.4.76"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0l3rklx1957czsddg3jb5xw5rvw8bf58s4yrkswikphv7j5crzjg"; + sha256 = "180mngyar7ky2aiaszmgfqpfvwi0kxcym8j3ifflzggwqjkgrrki"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index f1bdb3c2cb99..dcd5694ebbce 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.35"; + version = "4.9.36"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0dklbr686ygvpbjs6chra9vycfvp8xjgkvapai14lglzsx72749l"; + sha256 = "1x615q5fl17fqr8h0552l7lzrpmn1n9azmsrnq9xhf980imfj0d0"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index b779e8298c0a..b1448b02c6eb 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -1,15 +1,15 @@ { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: let - version = "4.11.8"; - revision = "a"; - sha256 = "02wy5gpgl2hz06dlqcgg9i3ydnxkyw0m1350vc5xyh6ld5r7jnn5"; + version = "4.12"; + revision = "b"; + sha256 = "117n42sw2g40p68plr7b77mq18vibqjv0i4130f1bj6gk0sqn5i6"; in import ./generic.nix (args // { version = "${version}-${revision}"; - extraMeta.branch = "4.11"; - modDirVersion = version; + extraMeta.branch = "4.12"; + modDirVersion = "${version}.0"; src = fetchFromGitHub { inherit sha256; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 0db6c4ec67ef..2e410fec561d 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -39,6 +39,9 @@ in stdenv.mkDerivation rec { sed -i "s,^PATH=.*,PATH=$out/bin:${statdPath}," utils/statd/start-statd configureFlags="--with-start-statd=$out/bin/start-statd $configureFlags" + + substituteInPlace systemd/nfs-utils.service \ + --replace "/bin/true" "${coreutils}/bin/true" substituteInPlace utils/mount/Makefile.in \ --replace "chmod 4511" "chmod 0511" diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index f70d6266e8d7..568b0ee6c045 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.25"; + version = "2.4.26"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "1cl0bkqg6srb1sypga0cn8dcmdyxldavij73zmmkxvlz3kgw4zpq"; + sha1 = "b10b0f569a0e5adfef61d8c7f0813d42046e399a"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index a24eedce7c79..959e9d4ebf82 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.1"; - sha256 = "0xk7gcsgwhz047h54adn8crnkrkr7g1z79w8ik34v6k0lrr6r1d5"; + version = "1.13.2"; + sha256 = "0w4vj6hl23z9kdw09v7jzq3c1593i4fhwmrz6qx2g7cq2i6j6zyp"; }) diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix new file mode 100644 index 000000000000..47abcb33ee79 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "consul_exporter-${version}"; + version = "0.3.0"; + + goPackagePath = "github.com/prometheus/consul_exporter"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "consul_exporter"; + rev = "v${version}"; + sha256 = "1zffbxyfmqpbdqkx5rb5vjgd9j4p4zcrh6jvn1zhbdzrcs7khnd9"; + }; + + meta = with stdenv.lib; { + description = "Prometheus exporter for Consul metrics"; + homepage = https://github.com/prometheus/consul_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ hectorj ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 7dc6029acb42..1d1dddd0c2a0 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "elvish-${version}"; - version = "0.5"; + version = "0.9"; goPackagePath = "github.com/elves/elvish"; @@ -10,13 +10,11 @@ buildGoPackage rec { repo = "elvish"; owner = "elves"; rev = version; - sha256 = "1dk5f8a2wpgd5cw45ippvx46fxk0yap64skfpzpiqz8bkbnrwbz6"; + sha256 = "0alsv04iihrk1nffp6fmyzxid26dqhg1k45957c2ymyzyq9cglxj"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { - description = "A Novel unix shell in go language"; + description = "A friendly and expressive Unix shell"; homepage = https://github.com/elves/elvish; license = licenses.bsd2; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/shells/elvish/deps.nix b/pkgs/shells/elvish/deps.nix deleted file mode 100644 index cff60bad0a9b..000000000000 --- a/pkgs/shells/elvish/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/elves/getopt"; - fetch = { - type = "git"; - url = "https://github.com/elves/getopt"; - rev = "f91a7bf920995832d55a1182f26657bc975b9c24"; - sha256 = "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; - sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; - }; - } -] diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix index b1b17bef29da..8e2a0950d194 100644 --- a/pkgs/shells/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "lambda-mod-zsh-theme-unstable-2017-05-21"; + name = "lambda-mod-zsh-theme-unstable-2017-07-05"; src = fetchFromGitHub { owner = "halfo"; repo = "lambda-mod-zsh-theme"; - sha256 = "1410ryc22i20na5ypa1q6f106lkjj8n1qfjmb77q4rspi0ydaiy4"; - rev = "6fa277361ec2c84e612b5b6d876797ebe72102a5"; + sha256 = "03kdhifxsnfbly6hqpr1h6kf52kyhdbh82nvwkkyrz1lw2cxl89n"; + rev = "ba7d5fea16db91fc8de887e69250f4e501b1e36d"; }; buildPhases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 0259af7a63ec..929c6690a269 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mergerfs-${version}"; - version = "2.22.1"; + version = "2.23.0"; # not using fetchFromGitHub because of changelog being built with git log src = fetchgit { url = "https://github.com/trapexit/mergerfs"; rev = "refs/tags/${version}"; - sha256 = "12dm64l74wyagbwxsz57p8j3dwl9hgi0j3b6i0pn9m5ar7qrnv00"; + sha256 = "0k4nn0f4c355q7hnni7iia8qi9m0khvyd04hx1hmlrnf0zsi9mfw"; deepClone = true; leaveDotGit = true; }; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 4dd49e02e0ec..110125727bf0 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -21,15 +21,15 @@ let ''; in buildRustPackage rec { name = "exa-${version}"; - version = "0.6.0"; + version = "0.7.0"; - depsSha256 = "0c1vyl1c67xq18ss0xs5cjdfn892jpwj6ml51dfppzfyns3namm4"; + depsSha256 = "0j320hhf2vqaha137pjj4pyiw6d3p5h3nhy3pl9vna1g5mnl1sn7"; src = fetchFromGitHub { owner = "ogham"; repo = "exa"; rev = "v${version}"; - sha256 = "0065gj4pbbppbnwp23s6bb7zlz428nrir00d0kz7axydxk6swhyv"; + sha256 = "0i9psgna2wwv9qyw9cif4qznqiyi16vl763hpm2yr195aj700339"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 7a70f2bdbff3..2bbeea8133e7 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -3,6 +3,7 @@ , zfs ? null , efiSupport ? false , zfsSupport ? true +, xenSupport ? false }: with stdenv.lib; @@ -46,6 +47,7 @@ in ( assert efiSupport -> canEfi; assert zfsSupport -> zfs != null; +assert !(efiSupport && xenSupport); stdenv.mkDerivation rec { name = "grub-${version}"; @@ -98,7 +100,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-bash-completion.patch ]; configureFlags = optional zfsSupport "--enable-libzfs" - ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.system}.target}" "--program-prefix=" ]; + ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.system}.target}" "--program-prefix=" ] + ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.system}.target}"]; # save target that grub is compiled for grubTarget = if efiSupport diff --git a/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg b/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg new file mode 100644 index 000000000000..e9883149ab5d --- /dev/null +++ b/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg @@ -0,0 +1 @@ +normal (memdisk)/grub.cfg diff --git a/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg b/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg new file mode 100644 index 000000000000..69115b7101c9 --- /dev/null +++ b/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg @@ -0,0 +1,10 @@ +# The parentheses around ${root} here to match Grub's config file syntax +if search -s -f /boot/grub/grub.cfg ; then + echo "Reading (${root})/boot/grub/grub.cfg" + configfile /boot/grub/grub.cfg +fi + +if search -s -f /grub/grub.cfg ; then + echo "Reading (${root})/grub/grub.cfg" + configfile /grub/grub.cfg +fi diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix new file mode 100644 index 000000000000..ee6e5065f40b --- /dev/null +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -0,0 +1,42 @@ +{ stdenv, grub2_xen }: + +with stdenv.lib; +let + efiSystemsBuild = { + "i686-linux".target = "i386"; + "x86_64-linux".target = "x86_64"; + "aarch64-linux".target = "aarch64"; + }; + +in ( + +stdenv.mkDerivation rec { + name = "pvgrub-image"; + + configs = ./configs; + + buildInputs = [ grub2_xen ]; + + buildCommand = '' + cp "${configs}"/* . + tar -cf memdisk.tar grub.cfg + # We include all modules except all_video.mod as otherwise grub will fail printing "no symbol table" + # if we include it. + grub-mkimage -O "${efiSystemsBuild.${stdenv.system}.target}-xen" -c grub-bootstrap.cfg \ + -m memdisk.tar -o "grub-${efiSystemsBuild.${stdenv.system}.target}-xen.bin" \ + $(ls "${grub2_xen}/lib/grub/${efiSystemsBuild.${stdenv.system}.target}-xen/" |grep 'mod''$'|grep -v '^all_video\.mod''$') + mkdir -p "$out/lib/grub-xen" + cp "grub-${efiSystemsBuild.${stdenv.system}.target}-xen.bin" $out/lib/grub-xen/ + ''; + + meta = with stdenv.lib; { + description = "PvGrub image for use for booting PV Xen guests"; + + longDescription = + '' This package provides a PvGrub image for booting Para-Virtualized (PV) + Xen guests + ''; + + platforms = platforms.gnu; + }; +}) diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index a227030f0bc4..bc8ea769e8be 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -2,8 +2,8 @@ , fetchurl , cmake , libjpeg -, szip , zlib +, szip ? null }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { zlib ]; - preConfigure = "export SZIP_INSTALL=${szip}"; + preConfigure = stdenv.lib.optionalString (szip != null) "export SZIP_INSTALL=${szip}"; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" @@ -31,11 +31,12 @@ stdenv.mkDerivation rec { "-DHDF4_BUILD_WITH_INSTALL_NAME=OFF" "-DHDF4_ENABLE_JPEG_LIB_SUPPORT=ON" "-DHDF4_ENABLE_NETCDF=OFF" - "-DHDF4_ENABLE_SZIP_ENCODING=ON" - "-DHDF4_ENABLE_SZIP_SUPPORT=ON" "-DHDF4_ENABLE_Z_LIB_SUPPORT=ON" "-DHDF4_BUILD_FORTRAN=OFF" "-DJPEG_DIR=${libjpeg}" + ] ++ stdenv.lib.optionals (szip != null) [ + "-DHDF4_ENABLE_SZIP_ENCODING=ON" + "-DHDF4_ENABLE_SZIP_SUPPORT=ON" ]; doCheck = true; diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix new file mode 100644 index 000000000000..77c06ea1911d --- /dev/null +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -0,0 +1,24 @@ +{ fetchFromGitHub, lib, python2Packages }: +let + pythonPackages = python2Packages; + +in pythonPackages.buildPythonApplication rec { + name = "zabbix-cli-${version}"; + version = "1.6.1"; + + propagatedBuildInputs = with pythonPackages; [ argparse requests ]; + + src = fetchFromGitHub { + owner = "usit-gd"; + repo = "zabbix-cli"; + rev = version; + sha256 = "17ip3s8ifgj264zwxrr857wk02xmzmlsjrr613mdhkgdwizqbcs3"; + }; + + meta = with lib; { + description = "Command-line interface for Zabbix"; + homepage = src.meta.homepage; + license = [ licenses.gpl3 ]; + maintainers = [ maintainers.womfoo ]; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 45dfd52dba19..a90f38ccc095 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -79,6 +79,9 @@ let doInstallCheck = true; + # socket path becomes too long otherwise + preInstallCheck = lib.optional stdenv.isDarwin "export TMPDIR=/tmp"; + separateDebugInfo = stdenv.isLinux; crossAttrs = { diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 820bcbb9a35a..1467faac8e3f 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,9 +1,9 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.5"; + version = "1.5.1"; src = fetchurl { url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd"; + sha256 = "0pba9c8ya4hvqmg458p74g69hb06lh0f5bsgw7dsi8pjrcb0624g"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 209520097f04..350180b5dc6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1711,6 +1711,8 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon {}; + zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; + ### DEVELOPMENT / EMSCRIPTEN buildEmscriptenPackage = callPackage ../development/em-modules/generic { }; @@ -2065,6 +2067,8 @@ with pkgs; git-lfs = callPackage ../applications/version-management/git-lfs { }; + git-ftp = callPackage ../development/tools/git-ftp { }; + git-series = callPackage ../development/tools/git-series { }; git-up = callPackage ../applications/version-management/git-up { }; @@ -2257,6 +2261,12 @@ with pkgs; zfsSupport = false; }; + grub2_xen = callPackage ../tools/misc/grub/2.0x.nix { + xenSupport = true; + }; + + grub2_pvgrub_image = callPackage ../tools/misc/grub/pvgrub_image { }; + grub4dos = callPackage ../tools/misc/grub4dos { stdenv = stdenv_32bit; }; @@ -2362,7 +2372,9 @@ with pkgs; hddtemp = callPackage ../tools/misc/hddtemp { }; - hdf4 = callPackage ../tools/misc/hdf4 { }; + hdf4 = callPackage ../tools/misc/hdf4 { + szip = null; + }; hdf5 = callPackage ../tools/misc/hdf5 { gfortran = null; @@ -5749,6 +5761,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }); + mono50 = lowPrio (callPackage ../development/compilers/mono/5.0.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation; + }); + monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; @@ -6102,7 +6119,8 @@ with pkgs; luaPackages = lua52Packages; - luajit = callPackage ../development/interpreters/luajit {}; + inherit (callPackages ../development/interpreters/luajit {}) + luajit luajit_2_0 luajit_2_1; luarocks = luaPackages.luarocks; @@ -6531,6 +6549,8 @@ with pkgs; bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; bison = bison3; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; + bloaty = callPackage ../development/tools/bloaty { }; bossa = callPackage ../development/tools/misc/bossa { @@ -6549,7 +6569,7 @@ with pkgs; pythonPackages = python2Packages; }; buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view ]); + buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view ]); buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; @@ -6991,6 +7011,8 @@ with pkgs; noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; + obuild = callPackage ../development/tools/ocaml/obuild { }; + omake = callPackage ../development/tools/ocaml/omake { inherit (ocamlPackages_4_02) ocaml; }; @@ -7537,6 +7559,7 @@ with pkgs; db53 = callPackage ../development/libraries/db/db-5.3.nix { }; db6 = db60; db60 = callPackage ../development/libraries/db/db-6.0.nix { }; + db62 = callPackage ../development/libraries/db/db-6.2.nix { }; dbus = callPackage ../development/libraries/dbus { }; dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; @@ -9720,6 +9743,8 @@ with pkgs; re2 = callPackage ../development/libraries/re2 { }; + qbs = callPackage ../development/tools/build-managers/qbs { }; + qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; qca2-qt5 = callPackage ../development/libraries/qca2 { qt = qt5.qtbase; }; @@ -11297,6 +11322,7 @@ with pkgs; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; + prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; @@ -14526,8 +14552,6 @@ with pkgs; i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; - - configFile = config.i3.configFile or null; }; i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { }; @@ -16176,6 +16200,8 @@ with pkgs; thinkingRock = callPackage ../applications/misc/thinking-rock { }; + nylas-mail-bin = callPackage ../applications/networking/mailreaders/nylas-mail-bin { }; + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome2) libIDL; libpng = libpng_apng; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1c6116108170..fea8fe05babd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -114,6 +114,8 @@ let }; camlimages = camlimages_4_1; + benchmark = callPackage ../development/ocaml-modules/benchmark { }; + biniou = callPackage ../development/ocaml-modules/biniou { }; bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { }; @@ -551,6 +553,8 @@ let ppx_tools_versioned = callPackage ../development/ocaml-modules/ppx_tools_versioned { }; + ptmap = callPackage ../development/ocaml-modules/ptmap { }; + pycaml = callPackage ../development/ocaml-modules/pycaml { }; qcheck = callPackage ../development/ocaml-modules/qcheck { }; @@ -561,6 +565,8 @@ let reason = callPackage ../development/compilers/reason { }; + rope = callPackage ../development/ocaml-modules/rope { }; + rresult = callPackage ../development/ocaml-modules/rresult { }; safepass = callPackage ../development/ocaml-modules/safepass { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e772e406205..0bd8b0c5b0d1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10719,16 +10719,16 @@ let self = _self // overrides; _self = with self; { }; PDFAPI2 = buildPerlPackage rec { - name = "PDF-API2-2.030"; + name = "PDF-API2-2.033"; src = fetchurl { url = "mirror://cpan/authors/id/S/SS/SSIMMS/${name}.tar.gz"; - sha256 = "a802c25c1f00b093778223fc7aea94ebd87a9abdb915151746b8ee5d4a358769"; + sha256 = "9c0866ec1a3053f73afaca5f5cdbe6925903b4ce606f4bf4ac317731a69d27a0"; }; + buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; meta = { description = "Facilitates the creation and modification of PDF files"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ maintainers.rycee ]; + license = stdenv.lib.licenses.lgpl21Plus; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 232f0693ab90..5fc8e228dd96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25169,30 +25169,7 @@ in { }; }; - virtualenv = buildPythonPackage rec { - name = "virtualenv-15.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/v/virtualenv/${name}.tar.gz"; - sha256 = "6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d"; - }; - - pythonPath = [ self.recursivePthLoader ]; - - patches = [ ../development/python-modules/virtualenv-change-prefix.patch ]; - - propagatedBuildInputs = with self; [ ]; - - # Tarball doesn't contain tests - doCheck = false; - - meta = { - description = "A tool to create isolated Python environments"; - homepage = http://www.virtualenv.org; - license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; - }; - }; + virtualenv = callPackage ../development/python-modules/virtualenv { }; virtualenv-clone = buildPythonPackage rec { name = "virtualenv-clone-0.2.5"; |