diff options
Diffstat (limited to 'pkgs')
272 files changed, 8370 insertions, 4785 deletions
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index fbc3d1c36f91..b51acea061f1 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -22,6 +22,9 @@ rec { freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; }; go-ethereum = callPackage ./go-ethereum.nix { }; + hivemind = callPackage ./hivemind.nix { withGui = true; }; + hivemindd = callPackage ./hivemind.nix { withGui = false; }; + litecoin = callPackage ./litecoin.nix { withGui = true; }; litecoind = callPackage ./litecoin.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix index b92a656c0833..d2532e0d41e9 100644 --- a/pkgs/applications/altcoins/ethabi.nix +++ b/pkgs/applications/altcoins/ethabi.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ethabi-${version}"; - version = "0.2.1"; + version = "1.0.4"; src = fetchFromGitHub { - owner = "ethcore"; + owner = "paritytech"; repo = "ethabi"; - rev = "fbed04984cab0db8767e01054ee16271b8e36281"; - sha256 = "1zgyyg1i5wmz8l1405yg5jmq4ddq530sl7018pkkc7l6cjj3bbhd"; + rev = "18ddc983d77b2a97e6c322abcc23bec59940d65f"; + sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd"; }; - depsSha256 = "0srxv0wbhvyflc967lkpd2mx5nk7asx2cbxa0qxvas16wy6vxz52"; + depsSha256 = "1n4rxipna307r4xppb2iaads7kpa3yjv99fimvpn8l0f999ir2rz"; meta = { description = "Ethereum function call encoding (ABI) utility"; diff --git a/pkgs/applications/altcoins/hivemind.nix b/pkgs/applications/altcoins/hivemind.nix new file mode 100644 index 000000000000..1b2682f7d4c0 --- /dev/null +++ b/pkgs/applications/altcoins/hivemind.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, withGui }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "hivemind" + (toString (optional (!withGui) "d")) + "-" + version; + version = "unstable"; + + src = fetchFromGitHub { + owner = "bitcoin-hivemind"; + repo = "hivemind"; + rev = "147973cfe76867410578d91d6f0a8df105cab4e0"; + sha256 = "1ndqqma1b0sh2gn7cl8d9fg44q0g2g42jr2y0nifkjgfjn3c7l5h"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib + miniupnpc protobuf libevent] + ++ optionals stdenv.isLinux [ utillinux ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" + "--with-incompatible-bdb" + ] ++ optionals withGui [ "--with-gui=qt4" ]; + + meta = { + description = "Peer-to-Peer oracle protocol"; + longDescription= '' + Hivemind is a Peer-to-Peer Oracle Protocol which absorbs accurate data + into a blockchain so that Bitcoin-users can speculate in Prediction + Markets. + ''; + homepage = "https://bitcoinhivemind.com"; + maintainers = with maintainers; [ canndrew ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 2f8a6fcdad65..a729d5cd4efc 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libcdio, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3 -, lame, flac, eject, mkcue +, lame, flac, eject, mkcue, glyr , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID , makeWrapper }: @@ -52,7 +52,7 @@ in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' wrapProgram "$out/bin/abcde" --prefix PATH ":" \ - ${stdenv.lib.makeBinPath [ "$out" which libcdio cddiscid wget vorbis-tools id3v2 eyeD3 lame flac ]} + ${stdenv.lib.makeBinPath [ "$out" which libcdio cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]} wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \ "${wget}/bin" diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 1d1d0d6a6f01..765f0e9e5a79 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,7 +8,7 @@ let # Please update the stable branch! # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ - version = "1.0.52.717.g2f08534a-47"; + version = "1.0.53.758.gde3fc4b2-33"; deps = [ alsaLib @@ -51,23 +51,24 @@ in stdenv.mkDerivation { name = "spotify-${version}"; - src = - fetchurl { - url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "1xqd4pjb69zmbac5fq3pckgr4khlkzfkx8b029qzjc2hi52zfnj7"; - }; + src = fetchurl { + url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; + sha256 = "1sh6bv23yx0fcbmf60c2yyi6411ij85k4jalpjlck2w26nfj1b3g"; + }; buildInputs = [ dpkg makeWrapper ]; + doConfigure = false; + doBuild = false; + dontStrip = true; + dontPatchELF = true; + unpackPhase = '' runHook preUnpack dpkg-deb -x $src . runHook postUnpack ''; - configurePhase = "runHook preConfigure; runHook postConfigure"; - buildPhase = "runHook preBuild; runHook postBuild"; - installPhase = '' runHook preInstall @@ -110,13 +111,11 @@ stdenv.mkDerivation { runHook postInstall ''; - dontStrip = true; - dontPatchELF = true; - - meta = { + meta = with stdenv.lib; { homepage = https://www.spotify.com/; description = "Play music from the Spotify music service"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx sheenobu mudri ]; + license = licenses.unfree; + maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 69288880cb2a..a0fcfe811024 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 -, mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: +, mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { version = "20161230"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1yni9c17kl2pi9lqxip07b6g6lyfii1pch5czp183113gk54fwj5"; }; - buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; + buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ]; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 60e17982b5be..e9546c16d62b 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0w790b9m94m28bx7n94pg2zjxrcjf13228lsb0pl8kyfsk2k2glx"; + sha256 = "10qzhfz34i7x7z5fv5a73a6aiwxvanyn0v825a6yz9qfc2mg4shd"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index bba66366e6b7..23cb16c0733f 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,28 +1,24 @@ { stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf , cups, libgcrypt_1_5, systemd, makeWrapper, dbus }: +with stdenv.lib; + let - bracketsEnv = buildEnv { - name = "env-brackets"; - paths = [ - gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 - dbus.lib systemd.lib - ]; - }; + bracketsLibs = makeLibraryPath [ + gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd + ]; in stdenv.mkDerivation rec { name = "brackets-${version}"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb"; - sha256 = "0b2k0vv1qwmsg1wckp71yrb86zp8zisskmzzvx9ir19bma9jzr42"; + sha256 = "0c4l2rr0853xd21kw8hhxlmrx8mqwb7iqa2k24zvwyjp4nnwkgbp"; name = "${name}.deb"; }; phases = [ "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper ]; - installPhase = '' mkdir -p $out ar p $src data.tar.xz | tar -C $out -xJ @@ -33,27 +29,26 @@ stdenv.mkDerivation rec { ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 + substituteInPlace $out/opt/brackets/brackets.desktop \ + --replace "Exec=/opt/brackets/brackets" "Exec=brackets" + mkdir -p $out/share/applications + ln -s $out/opt/brackets/brackets.desktop $out/share/applications/ + ''; + + postFixup = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${bracketsEnv}/lib:${bracketsEnv}/lib64" \ + --set-rpath "${bracketsLibs}:$out/opt/brackets/lib" \ $out/opt/brackets/Brackets patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${bracketsLibs}" \ $out/opt/brackets/Brackets-node - patchelf \ - --set-rpath "${bracketsEnv}/lib:${bracketsEnv}/lib64" \ + patchelf --set-rpath "${bracketsLibs}" \ $out/opt/brackets/lib/libcef.so - - wrapProgram $out/opt/brackets/brackets \ - --prefix LD_LIBRARY_PATH : "${bracketsEnv}/lib:${bracketsEnv}/lib64" - - substituteInPlace $out/opt/brackets/brackets.desktop \ - --replace "Exec=/opt/brackets/brackets" "Exec=brackets" - mkdir -p $out/share/applications - ln -s $out/opt/brackets/brackets.desktop $out/share/applications/ ''; - meta = with stdenv.lib; { + meta = { description = "An open source code editor for the web, written in JavaScript, HTML and CSS"; homepage = http://brackets.io/; license = licenses.mit; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 868f9619ce2e..852967fecd5c 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -820,10 +820,10 @@ gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnorb"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.2.1.tar"; - sha256 = "0mip0czvpdl26xz9wamii5azj9bacjhdg0jgkrxyv17vqqlbag9x"; + url = "https://elpa.gnu.org/packages/gnorb-1.2.3.tar"; + sha256 = "1bqm08i2aam4v4gfzyxfmic0rg0ka7cns38khwj42vhwgv045xc7"; }; packageRequires = [ cl-lib ]; meta = { @@ -940,10 +940,10 @@ }) {}; ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ivy"; - version = "0.8.0"; + version = "0.9.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.8.0.tar"; - sha256 = "1c1impdk1p082v6nb9lms4n258z6ngz8ra90cshprs0ingrk705p"; + url = "https://elpa.gnu.org/packages/ivy-0.9.0.tar"; + sha256 = "1p5gfy16xik613ib30mv4yac004z4lpsybmraln1badyd6n3b07s"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 70ea1d58cf80..9ee0fb281e8c 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -316,12 +316,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "20161202.725"; + version = "20170330.1108"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e"; - sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285"; + rev = "c4aab21df64011916039e18094e189533018e115"; + sha256 = "1ac8rw0r4x1plrwy6xwswy5mj5h1r975y8wvx01g2j8an41xhlms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -793,6 +793,27 @@ license = lib.licenses.free; }; }) {}; + ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: + melpaBuild { + pname = "ac-rtags"; + version = "20170402.653"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8"; + sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; + sha256 = "1w9v32di9135mm598c4506gxf0xr5jyz8dyd9dhga5d60q7g9641"; + name = "ac-rtags"; + }; + packageRequires = [ auto-complete rtags ]; + meta = { + homepage = "https://melpa.org/#/ac-rtags"; + license = lib.licenses.free; + }; + }) {}; ac-skk = callPackage ({ auto-complete, cl-lib ? null, ddskk, fetchFromGitHub, fetchurl, lib, melpaBuild, tinysegmenter }: melpaBuild { pname = "ac-skk"; @@ -1173,12 +1194,12 @@ addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "addressbook-bookmark"; - version = "20161130.150"; + version = "20170331.1209"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "addressbook-bookmark"; - rev = "ad3c73369b804a48803fdfdf2ab613e6220260de"; - sha256 = "012kfqkmpagn8jrp09acpx631qmjim7b33j0pahv1fcqhin89pn6"; + rev = "54c4e57b000d54cedb3d791d054d293c8f45f2fe"; + sha256 = "17g4j5yc7phnn95cya8sw13jm1219j1yrjzdcvadi5xdwlb9gxgz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark"; @@ -1420,22 +1441,22 @@ license = lib.licenses.free; }; }) {}; - alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "alchemist"; - version = "20170118.142"; + version = "20170402.2339"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "20a0c043b5df66ee1f731e1ffe53d5697915b626"; - sha256 = "1szmjcim9mmzm45f7pb39gr0kf3y7x0kdhgvvbl9fbdzrphn02mx"; + rev = "46d09a6abaa8adf5e06184b77d04638ff3aa9087"; + sha256 = "1wvbn4capcf049y33633b4v8k1aqwi94lscif810f7p3m0xdai30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369"; name = "alchemist"; }; - packageRequires = [ company dash elixir-mode emacs pkg-info ]; + packageRequires = [ company dash elixir-mode emacs pkg-info s ]; meta = { homepage = "https://melpa.org/#/alchemist"; license = lib.licenses.free; @@ -1448,8 +1469,8 @@ src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "deeb659b1b1c6ec57a38875e9daf1f76f9b5c013"; - sha256 = "1z462b2cvfqz1pdrba89ag4v9mvw1dzsrzc219fz06f2xcpyz2v2"; + rev = "921b1d39ee1122c0f6935598dc17aaa904e74819"; + sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1546,22 +1567,22 @@ license = lib.licenses.free; }; }) {}; - all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: + all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "all-the-icons"; - version = "20170328.2313"; + version = "20170410.114"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "e7c8f824d542fd946dfe695ef370dd57a218d03c"; - sha256 = "0y5mf6iwyqsfl6xa00pkv23d52dadk1zgcmkx91i0ls3jb1cvarg"; + rev = "16a0bc57107562e69cb97701d9275b446b411a8c"; + sha256 = "0i2hrfjgxpg9n7k2n4gsl1wp93g0cv1wrcwwaw3fz0vf250f5avf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q"; name = "all-the-icons"; }; - packageRequires = [ dash emacs font-lock-plus ]; + packageRequires = [ emacs font-lock-plus ]; meta = { homepage = "https://melpa.org/#/all-the-icons"; license = lib.licenses.free; @@ -1684,12 +1705,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20170329.836"; + version = "20170405.301"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "14061ecfbde5f58a0f807eafc7c1871ff178cea0"; - sha256 = "05lq97xfdmw34yh1jy4b7ypks5nf3jjcrx12lk0jxhhgcr7j2lv3"; + rev = "6141aba393e992308d01b550f0b96add62440b04"; + sha256 = "1gkkjnmczpvaw020vw1gbda3dv0h1g7fzdqs3rigwlzzajc96bj4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -2273,8 +2294,8 @@ src = fetchFromGitHub { owner = "masasam"; repo = "emacs-anything-tramp"; - rev = "4e5f2ceb4624a633b809cb7ac671425fa061586b"; - sha256 = "1jzyxxk8c9dfr5d3i89cq7apjlrwc3278nn1fr7hlcg05nv2lfwl"; + rev = "dc5e218372293ade9bf42bd6782da6b127629d67"; + sha256 = "0jyh4gi8dz5ifpl1p338rarf9h53z97xfck516fcjdbkm91rwamg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp"; @@ -2347,16 +2368,19 @@ license = lib.licenses.free; }; }) {}; - apache-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "apache-mode"; - version = "20150828.714"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/apache-mode.el"; - sha256 = "1jndhcjvj6s1clmyyphl5ss5267c7b5a58fz8gbp1ffk1d9ylfik"; + version = "20170407.1140"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "apache-mode"; + rev = "8fd0d4db7ede5d4e360630235ede3beb1ba56cdf"; + sha256 = "0lawq0xx0y2kn89r633lb8kr4zkrbcm53dv8dylmv7lli9a7g1y9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/apache-mode"; - sha256 = "1a1pj3bk0gplfx217yd6qdn7qrhfbkx2bhkk33k0gq5sia6rzs44"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode"; + sha256 = "0f8r3xnnidcm9ahj8c3s1vxk6yqk3ra34nrc19r76xyprbb2sjsm"; name = "apache-mode"; }; packageRequires = []; @@ -2756,22 +2780,22 @@ license = lib.licenses.free; }; }) {}; - assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }: + assess = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }: melpaBuild { pname = "assess"; - version = "20161203.327"; + version = "20170408.1451"; src = fetchFromGitHub { owner = "phillord"; repo = "assess"; - rev = "47ce039423f660174d097698615aaad6c77e87fb"; - sha256 = "16b0fdz1nj25bkzb3hyarwa2zgk23dn9598a4ljbr9smdl2pdv6b"; + rev = "0a3e94477a08c3cda7c1dd4ea05ef87208901ac0"; + sha256 = "03fpfyamcfhc1amfnmq5r2qrzc9iws3mzwihr4nc0k5xjp7z0rhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess"; sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr"; name = "assess"; }; - packageRequires = [ dash emacs m-buffer ]; + packageRequires = [ emacs m-buffer ]; meta = { homepage = "https://melpa.org/#/assess"; license = lib.licenses.free; @@ -2910,8 +2934,8 @@ src = fetchFromGitHub { owner = "tom-tan"; repo = "auctex-latexmk"; - rev = "b7053f71f578ffb0d247f8a9e8d5152efd86e096"; - sha256 = "0slihygr74vyijnyzssckapscxmdd7zlgrs0wvmpw9hnjzwwzzql"; + rev = "0315925ac9a892e73859cf4b720f36f2727f47f1"; + sha256 = "0cdc2wkyqs4c6iypkynm0s540isp7yyyavp80rg5x3cid3hsbinm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk"; @@ -3906,12 +3930,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20170326.1157"; + version = "20170407.111"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "0c30cdba9e601c9e719b8b00101d2af9f93d2042"; - sha256 = "18sklj4hc8qybcrqymm6144dz6y8hf34s6szxis3flnnhx1x6a06"; + rev = "105efc84827cb764cac1e1e3a793abf106837021"; + sha256 = "1kb5l50m8hqmdc5yjw43l53nimsbc3g9jnlkkrdywqm0kbzc5znp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -3969,12 +3993,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20161229.605"; + version = "20170404.904"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "26e87aa7905a252b797e0bf592c9ff9eede165c1"; - sha256 = "1bfrc7wxnzhjn07psa5z1cflxxr1k8qc4jgsz5w7ds3sn48aji48"; + rev = "6dd5dde4d4bc0bc7758977b64e1ad1173f5f1602"; + sha256 = "0lscjwbksdqkjzfzvdz0llpxbmwk94byyxz0fljcncxzdzwvsz6v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -4095,8 +4119,8 @@ src = fetchFromGitHub { owner = "hung-phan"; repo = "babel-repl"; - rev = "0faa2f6518a2b46236f116ca1736a314f7d9c034"; - sha256 = "0sp0ja0346k401q5zpx3zl4pnxp4ml2jqkgk7z8i08rhdbp0c4nr"; + rev = "e619c16e349a1ee7bd0ee0d7f3650d33bff73fc3"; + sha256 = "1174r0gjpn5z3pnf32qlpqhmdfvskcd2vqgicvmqzjsrysj3fypn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd4ac01ea16fcbc6e9343a953a2f278c5874d3d/recipes/babel-repl"; @@ -4429,13 +4453,13 @@ pname = "bbdb"; version = "20170129.2224"; src = fetchgit { - url = "git://git.savannah.nongnu.org/bbdb.git"; + url = "https://git.savannah.nongnu.org/git/bbdb.git"; rev = "8998b3416b36873f4e49454879f2eed20c31b384"; sha256 = "086ivc9j7vninb46kzparg7zjmdsv346gqig6ki73889wym1m7xn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6b6801fe29cb6fb6183f0babf528375d14f966b3/recipes/bbdb"; - sha256 = "0zhs4psa9b9yf9hxm19q5znsny11cdp23pya3rrlmj39j4jfn73j"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb"; + sha256 = "0mm8n3dbi8lap3pjr97n2f675iy7sg476sm1vxygbc3j67rq1zb2"; name = "bbdb"; }; packageRequires = []; @@ -4514,8 +4538,8 @@ src = fetchFromGitLab { owner = "iankelling"; repo = "bbdb-csv-import"; - rev = "21c775d776be1a6b3a096912bcdb53dab6bfaa31"; - sha256 = "0amdn5hd72108ylss90yk550w6vzvsg91l29dycbfr8a3hrfs22x"; + rev = "dc9e722d1c1fcd55b71625ee3f05a4921851d186"; + sha256 = "0jkrznrfdh562bwy0adg1pzmqh6i766b5ki41g4pr9wcbmh937sn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/bbdb-csv-import"; @@ -4657,12 +4681,12 @@ beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "beacon"; - version = "20161004.756"; + version = "20170404.906"; src = fetchFromGitHub { owner = "Malabarba"; repo = "beacon"; - rev = "c9d86457d43decf61810006752544d7f7bd5a61d"; - sha256 = "132ixmzjz3sg15qvdbv3s8p6dv3bz7vwlhs50dax0z19dr79cda0"; + rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b"; + sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon"; @@ -4994,8 +5018,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "a354568ec2af8444b741f595a3a7183e3f67ad58"; - sha256 = "19aaqcaycq1msfgvvnlqkzqqijbzqzc015k69pbg41l5bvrwnqcq"; + rev = "103b6518e66d9acb990832f02dca093a7425ca84"; + sha256 = "0rsc9shvgla560y3001s9v29wiwz1g9il2z44939phwlkydhak7r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5448,10 +5472,10 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170312.1135"; + version = "20170331.1856"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; - sha256 = "0vr5v6laav6hhx8g9v4pjdmfjcc2bylvvjwzfby9a4s838dakgkr"; + sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+"; @@ -5488,12 +5512,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20170318.1312"; + version = "20170406.1153"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "d9f0545708bbbbe3df23b2b91cdd2824beb0df56"; - sha256 = "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8"; + rev = "6dd44cdef13c3695a2890c0329f0d870cce8dfdb"; + sha256 = "0rfc4zgyijl9gcbf1bf1hnsx2pwl02jmxxj372z7nsvjwhwc20w9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5677,12 +5701,12 @@ browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "browse-at-remote"; - version = "20170302.2236"; + version = "20170330.1452"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "browse-at-remote"; - rev = "6de3e242e7b11ee2cb942547ac01823fada52605"; - sha256 = "09c4hsg02bmws65z4396j1yavx96785l6h3yl6s91qgx4byq9l17"; + rev = "7a34d6579a98d13b2887addab25947ea96502de9"; + sha256 = "1ybb9gyw1b4fjbh02lj632vc89m9yq91dvshnbnzg0wbr77d33xr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203e177f09eac4ebb8c7e3532bd82f749f8e2607/recipes/browse-at-remote"; @@ -5840,12 +5864,12 @@ bts-github = callPackage ({ bts, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: melpaBuild { pname = "bts-github"; - version = "20150108.27"; + version = "20170401.549"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-bts-github"; - rev = "57c23f2b842f6775f0bbbdff97eeec78474be6bc"; - sha256 = "1sfr3j11jz4k9jnfa9i05bp4v5vkil38iyrgsp3kxf15797b9dg9"; + rev = "ef2cf9202dc2128e5efdb613bfde9276a8cd95ad"; + sha256 = "173i9n4c8mg93gpc7ljxh3nhm4lq2c04yhrvjz6fwwwqvmnkha5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f3e87699181877e50d75a89e2ee76e403fc9317/recipes/bts-github"; @@ -6256,12 +6280,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20170316.1516"; + version = "20170401.703"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "677d6d3c253e69bee9e310911605833e79253ee3"; - sha256 = "0h8kq3p2ksyiqn4f6z7flq15q3dxps2fp5a8zzfpxbs67k13nrf3"; + rev = "f60ed2a563b3867a98ab41290b46572789c43272"; + sha256 = "11axmbqvak8djldjp9kqcaz7q6dxkig9h193l5javgf78pfcdlki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6614,13 +6638,13 @@ pname = "caml"; version = "20151009.845"; src = fetchsvn { - url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/"; + url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/"; rev = "16556"; sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/55c90eb51ac6a69383c8b63987235d325f43fdb0/recipes/caml"; - sha256 = "0kxrn9s1h2l05akcdcj6fd3g6x5wbi511mf14g9glcn8azyfs698"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/caml"; + sha256 = "1z5wm2h930fhl4v01i6ki8ms58n4dn4h085iac075sijp8dpih92"; name = "caml"; }; packageRequires = []; @@ -6762,8 +6786,8 @@ src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "cask-package-toolset.el"; - rev = "24fb0cf745d5e10342dbd2cdcd3d6c9910167726"; - sha256 = "1m40s9q00l06fz525m3zrvwd6s60lggdqls5k5njkn671aa3h71s"; + rev = "bf5ae2fec2c84816d9e2b45a0799240401de9fc3"; + sha256 = "1cy4bsrmz4x0c9hfsm789kfw1fb71h25dw8m9yjm795a0vdgskah"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset"; @@ -6987,12 +7011,12 @@ centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "centered-window-mode"; - version = "20160210.247"; + version = "20170406.635"; src = fetchFromGitHub { owner = "anler"; repo = "centered-window-mode"; - rev = "ff2350f5258249bbc9e07ac60c76028f4ae07190"; - sha256 = "1i5ipll7jlrxqb0kcwq0rlrpfaxsyp663bwjdnhj84c50wlv052f"; + rev = "ac8b7eca96a771e6921ffd6fad09566c0447092c"; + sha256 = "0lkamd4qi2pp2riqw90flgq6rrz8mrjqghmzppng06dafalyfxnv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode"; @@ -7054,8 +7078,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "19de82713504f253961ad46d30943bf004f8a64c"; - sha256 = "1x8fr5rczzppgpq7hrcvzv95s5hjpvm4ksm5wwmkvy5a8awghdyg"; + rev = "37e40b61521efb63e1b5c8efb441e20805974fbf"; + sha256 = "0l3455j6is72vfxlv63bsrwqiykqn4a1nys08l2vx6yxxxy7m0z4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7093,13 +7117,13 @@ pname = "cg"; version = "20170201.347"; src = fetchsvn { - url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12088"; + url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; + rev = "12127"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a275ee794b0aa30b1348bb3a984114eef8dfc808/recipes/cg"; - sha256 = "0ra6mxf8l9fjn1vszjj71fs6f6l08hwypka8zsb3si96fzb6sgjh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/cg"; + sha256 = "0xj4yqjg0r9m9cvwgs60lsid6qm1fi8lmb068dj6xaga11n70si5"; name = "cg"; }; packageRequires = []; @@ -7108,6 +7132,27 @@ license = lib.licenses.free; }; }) {}; + challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "challenger-deep-theme"; + version = "20170402.534"; + src = fetchFromGitHub { + owner = "MaxSt"; + repo = "challenger-deep"; + rev = "02317915e36cb19e3e46f17fdec074677159b3a7"; + sha256 = "02khn3wwzjxai81jrp8yaxfsa5n685l9b09ryd0wjf2hsa8ng975"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; + sha256 = "1apjc32wy7h7fadxckdbfa6wzd360c7v6dig9gikjbsxm8xgdg60"; + name = "challenger-deep-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/challenger-deep-theme"; + license = lib.licenses.free; + }; + }) {}; change-inner = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "change-inner"; @@ -7675,12 +7720,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170322.155"; + version = "20170403.402"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "0816372ff483dd92eb8775c76929835b0955ae70"; - sha256 = "0jh7wv2h6xxm7h3pmabcx30m16j2lz11z5pzv73p3miyqpvkh6mn"; + rev = "35c18ac8afefecf746fa0a77e930636736cf6541"; + sha256 = "1r4706s8k3kpgkcn1jm9794bhpjfp0zxc4siqrr0h5hxfjnizc59"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7801,12 +7846,12 @@ ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ciel"; - version = "20170323.2203"; + version = "20170330.526"; src = fetchFromGitHub { owner = "cs14095"; repo = "ciel.el"; - rev = "2cc6a4a338e6b1e477f37e8a2fa3c661209c0804"; - sha256 = "148g1wl9f2bbgpqnyl6qppmzs61z771d1l64643vwvrh3xn4q4vg"; + rev = "8c73f78d60ef52d3c395a9629963a63439b8a83e"; + sha256 = "1jaxqri8l7y1lqj830h5alxn37skjpb56j6ax8qf9926n8qz3arm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel"; @@ -7951,7 +7996,7 @@ version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "299036"; + rev = "299842"; sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2"; }; recipeFile = fetchurl { @@ -8157,12 +8202,12 @@ clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "20170126.118"; + version = "20170407.553"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "0fb72efc1cb9a2a688e324e7fdc51f258a86e36d"; - sha256 = "0sibcrsygaxk60f2rrjbmsp7cjfgqkj7a40psal19nf1ygcy634y"; + rev = "0a25f2ed361fff056ee23cfa64eac1423c75dfeb"; + sha256 = "1alpvwmfqm9hqgcd4bhg54pvqjc85dc7wrcajxzv00gki47gj2zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8337,12 +8382,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20170303.2310"; + version = "20170407.312"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "4dcd7bc95f056ea61b0d1b16c5b03e1a6681b709"; - sha256 = "0z27hgd3jc3lnhv2j3gc5inwlwmqidw7js41ciwawjma59bhv1ka"; + rev = "2d67af4230657fb06f0df4453b9d21031b32c1db"; + sha256 = "1dan05yd3dvf3r4khahpyq849sq96bjxz7zyady8x3k3gnn35q5w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8362,8 +8407,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "4dcd7bc95f056ea61b0d1b16c5b03e1a6681b709"; - sha256 = "0z27hgd3jc3lnhv2j3gc5inwlwmqidw7js41ciwawjma59bhv1ka"; + rev = "2d67af4230657fb06f0df4453b9d21031b32c1db"; + sha256 = "1dan05yd3dvf3r4khahpyq849sq96bjxz7zyady8x3k3gnn35q5w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8593,8 +8638,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "6a5a214f43cccc83fbe3dd6de4747aba43088701"; - sha256 = "09xkv6b83b8wv043zq287azsjvqgl0nsmfprq3lsk5hqc82l6006"; + rev = "333c565acefef652d2593d6eadc97551865a67e6"; + sha256 = "14dlvyxvakj1ykm27apv9iv3gxjaa5m4zs7562vih14d7bqywsc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8899,12 +8944,12 @@ colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "colemak-evil"; - version = "20140508.1612"; + version = "20170401.1626"; src = fetchFromGitHub { owner = "patbl"; repo = "colemak-evil"; - rev = "624985835a9e8192c687b99f7d59e7d01713c453"; - sha256 = "1bwbqb9j5cn9b42n4w8nr6sqyk40xcp06mnxn9f28w4hnjd12pqj"; + rev = "b01296a50ee225d0e21e81f99c3c01432f89a7c7"; + sha256 = "09ipxdwvi1bsicl67fbpd5aq5g9ws9frim9q24y7h6srynj4awa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f0750a3f9537782ee61d6e56c51ce7b86def12e/recipes/colemak-evil"; @@ -8985,13 +9030,13 @@ pname = "color-theme"; version = "20080305.34"; src = fetchbzr { - url = "http://bzr.savannah.gnu.org/r/color-theme/trunk"; + url = "https://bzr.savannah.gnu.org/r/color-theme/trunk"; rev = "57"; sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d49f86519b1340420a5ee587de77a3a6fa5791c3/recipes/color-theme"; - sha256 = "1p4bjh8a9f6ixmwwnyjb520myk3bww1v9w6427za07v68m9cdh79"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/color-theme"; + sha256 = "1ds098v50p4g6ji0zy7m5nyj2kadm3l3v0pnb01wkjjx6anh3qsy"; name = "color-theme"; }; packageRequires = []; @@ -9087,12 +9132,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20170106.1620"; + version = "20170330.33"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "ed7bcd2dd40989c99fe0ff13802432de8e0e8edd"; - sha256 = "0z65y0wda3rwymmjy7q8g4h1ar1a9crqgf3i8y9cyq5n8bmc5z7c"; + rev = "56d9c31a6bea3657363f79d5987d4afa6a4caf41"; + sha256 = "19aw5bac7sgyj70g093ds43ddx69mqrwgabx0wvjcg84kfggl6j4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9792,12 +9837,12 @@ company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "company-go"; - version = "20170303.909"; + version = "20170401.345"; src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "007b034ad7b6d5b70bd18348fc7609a9fdcbad18"; - sha256 = "1cy7fjbip8c9pmv91bk4kcjcl5qdz3an2i78ywlb3b2qhsac21kc"; + rev = "1ed1baa46aeda2ce7de181161d4e2d369a740ce1"; + sha256 = "1ywyvppqyv6r52jagjn45nbrx9r5hsr2b3nxaya8sxsrkjv6hsn7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -10065,12 +10110,12 @@ company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "company-quickhelp"; - version = "20170226.522"; + version = "20170402.35"; src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "30197a39ddedef550fd98803805dc15f844fc3c6"; - sha256 = "1a972l0y58bjpbnmxd2h33arx26naq9f8dbq2vka2axigpy4455r"; + rev = "a6eaf04e31af9e0d2f47c4c1439fc586f91d0a62"; + sha256 = "1flb9wzgj0argd10m2l859glpiwzfjyggyrw2zfalkh8c52nywvd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -10131,6 +10176,27 @@ license = lib.licenses.free; }; }) {}; + company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: + melpaBuild { + pname = "company-rtags"; + version = "20170405.2311"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8"; + sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; + sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f"; + name = "company-rtags"; + }; + packageRequires = [ company emacs rtags ]; + meta = { + homepage = "https://melpa.org/#/company-rtags"; + license = lib.licenses.free; + }; + }) {}; company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-shell"; @@ -10285,8 +10351,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79"; - sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9"; + rev = "6b32dc7a832e6c4883dd434530c8d6d69fe36c15"; + sha256 = "0zx57xhg065hbcisvsryqv2lb34fnzfvzv418nbc6r3yy29yb9ar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -10348,8 +10414,8 @@ src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "9668749635472a63e7a9282e2124325405199b79"; - sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; + rev = "7f2bb81e75db895c99611a7a9fbde7c239b757ba"; + sha256 = "09qnk8xhk5vjn7iqfzg3yzydas47453k1qm22gbmlfxh6lvxsqh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; @@ -10637,12 +10703,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170328.737"; + version = "20170410.24"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073"; - sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl"; + rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26"; + sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10763,12 +10829,12 @@ cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cov"; - version = "20170222.940"; + version = "20170405.1508"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "cov"; - rev = "41719590b26b20642c31d233858dc27f34b277b3"; - sha256 = "1ph8hxnwbww194gcqq79ny6p3p396w1dgjr6inkg6f52ylycp25m"; + rev = "74e8f32433eab6b31357642ad5a7ed79a3dfbd05"; + sha256 = "100fk11fjj8wx8lm4ln4p4b6brxfgnkxq387v6ikyigr6lascmsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov"; @@ -11677,8 +11743,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "bd0bd943792530194e9bea86e4cf6fe9f8261182"; - sha256 = "1z5li1h376978iby273ynvx52phdnsgsil8vlpj98izf19qnsmmq"; + rev = "0558bdb4d1ed4da734ac7194f0bdbe7c030cc70e"; + sha256 = "18hf07pyyxdgb1li26yf26g77xqdpmgkxqkhxsq5aa8chj6zv900"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11778,12 +11844,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20170322.1007"; + version = "20170404.426"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "2ea398532e8229e329f6ea9b264ffd42068b16b9"; - sha256 = "1zxj81dqci73zf01h9rz3gkd0qfd7n8238jzkjsmyhyvq7l644hz"; + rev = "e7066a1310b2437d1b68ec5afd800d06977dd687"; + sha256 = "116hyd5c74m713xmzsl9panvn7014r7bg4267wvla6844n1qshp8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11799,12 +11865,12 @@ dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dante"; - version = "20170328.232"; + version = "20170410.55"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "0fe8c8243e5ce1aa6c241d4e5d51e489b1fbd512"; - sha256 = "15r1bczfxbp7rgxh0gq1516kypgnkm4wsf9svl0fxzdcayaawl3k"; + rev = "9c29ac5cca30b02c227518c472af3a645a7c3d1a"; + sha256 = "1pk6lmzq64fzbhqvxxvymspknq96zakjb65v52a45jgl4y9c1dlr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -11988,12 +12054,12 @@ darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20170328.1604"; + version = "20170401.1521"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "419746ab4c06bd2146ff6ddf68aa74dfd73d8c96"; - sha256 = "0gxvz617np99x5ynh7y0cammxmwxp42kcnnqxl5ljknn4lwbapar"; + rev = "fb66992286c009e594eb7bb9ee2f1cdc3bebb555"; + sha256 = "0n7qgnyl4rdvgwjb7gz6m1c22mxwg8bp08r7lz27z0b1bcyw94sc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -12093,12 +12159,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20161229.1711"; + version = "20170408.1653"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "89875ba44ef9f69dd561591ea8ec6d39a0b4aa6d"; - sha256 = "0qx2kb30s1z0mlr2sk1jx538v768g7df7v5ymmnvipl8xkr2ams3"; + rev = "b409028a42059c70ac3a64e5a033477f27607101"; + sha256 = "1s5lrc1vgc9q82nyz43sg094za0ncimr67p4mhmxqqxxchfk75x7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -12410,8 +12476,8 @@ src = fetchFromGitHub { owner = "preetpalS"; repo = "decl.el"; - rev = "500ae2da41c65f4e35abf5cd352411ce7ed3f9df"; - sha256 = "1slfh4sjvprmg0pa4pq1h5jiwiszak7l8hakbvjy1ycbh97gnd17"; + rev = "b25825de88289fab5212dfd6d18874ca2748123f"; + sha256 = "1imz3w41vblw9gpw42v6hlrz2zdzd6kp5pfvb97v8dw8mc06pyvs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl"; @@ -12490,12 +12556,12 @@ deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deferred"; - version = "20161228.1930"; + version = "20170331.1759"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "9668749635472a63e7a9282e2124325405199b79"; - sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; + rev = "7f2bb81e75db895c99611a7a9fbde7c239b757ba"; + sha256 = "09qnk8xhk5vjn7iqfzg3yzydas47453k1qm22gbmlfxh6lvxsqh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred"; @@ -12742,13 +12808,13 @@ pname = "dic-lookup-w3m"; version = "20170315.709"; src = fetchsvn { - url = "http://svn.osdn.jp/svnroot/dic-lookup-w3m/"; + url = "https://svn.osdn.jp/svnroot/dic-lookup-w3m/"; rev = "96"; sha256 = "17g0bl94qmzalh3m6r6q10q06864d1h1nx5i7fddsamakmg89ziw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6627b66fff02513ee467ed0f4436fb5cd400a81d/recipes/dic-lookup-w3m"; - sha256 = "0zc0phym431bjqg0r8n5xsa98m52xnbhpqlh0jcvcy02nbmdc584"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dic-lookup-w3m"; + sha256 = "1siqrarpyqjh1h350dsyca993fy6qin4apgyjm4vpp6awip8xfp0"; name = "dic-lookup-w3m"; }; packageRequires = [ stem w3m ]; @@ -13383,10 +13449,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20170324.1112"; + version = "20170409.1441"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "00w4d3zw789cl0ch7h0nk4mzlb88806cbq6mcslwf82732vxzkv0"; + sha256 = "0bjpz9zaq6b158964b37llrn6jakfhzai8ahwyi8d6jsf392hljp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+"; @@ -13685,17 +13751,19 @@ license = lib.licenses.free; }; }) {}; - dirtree = callPackage ({ fetchurl, lib, melpaBuild, tree-mode, windata }: + dirtree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tree-mode, windata }: melpaBuild { pname = "dirtree"; version = "20140129.32"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dirtree.el"; - sha256 = "1q03q4j0wkbg9p2nzf1kb7l517b21mskp2v52i95jbxh09igbjjx"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "dirtree"; + rev = "ba55f1e716e386fdd37cb8e7f48616e405dc7251"; + sha256 = "0abs3r4zzfnf4igiakrv3bpyxz7qlnw26l57rynsk7c3w3s5ya29"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/343a34103fd435e01bb64e90536cc1e4da4e83c4/recipes/dirtree"; - sha256 = "0wfz9ks5iha2n0rya9yjmrb6f9lhp620iaqi92lw9smm7w83zj29"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/dirtree"; + sha256 = "1fm003rix3sdfx8fq3ab5s8b2q65gbkjsn1j3fg5qmhv56p7lrs9"; name = "dirtree"; }; packageRequires = [ tree-mode windata ]; @@ -14580,24 +14648,6 @@ license = lib.licenses.free; }; }) {}; - dos = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "dos"; - version = "20140808.1435"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dos.el"; - sha256 = "0sfmcd1rq6wih9q7d9vkcfrw6gf7309mm7491jx091ij8m4p8ypp"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6c536abcb5a544e22bb339effa5bf39df96c12b9/recipes/dos"; - sha256 = "0cpijbqpci96s0d6rwqz5bbi9b0zkan1bg8vdgib1f87r7g980nc"; - name = "dos"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dos"; - license = lib.licenses.free; - }; - }) {}; dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dot-mode"; @@ -14935,13 +14985,13 @@ pname = "dsvn"; version = "20130120.1257"; src = fetchsvn { - url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1789422"; + url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; + rev = "1790830"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/dsvn"; - sha256 = "12cviq6v08anif762a5qav3l8ircp81kmnl9q4yl6bkh9zxv7vy6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dsvn"; + sha256 = "0fl23fcnf4x9gm51761551cyr3i9954k0d5nq2c99nxzrajbnyk6"; name = "dsvn"; }; packageRequires = []; @@ -15037,12 +15087,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20170328.2013"; + version = "20170330.1409"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "1df89e837d4c28c941db879b028f92b3378745d8"; - sha256 = "19n18a057ngvfqhaancji06abpp3qlqymsygchv0s9v9q6nzfi49"; + rev = "1c8d705178607e7175341816f4a20ebd36480329"; + sha256 = "1lav31cmnyzxpqwv74nwhld9rpjz7wl197cslzjl171ca5n322vm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -15414,12 +15464,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20170328.2015"; + version = "20170409.2149"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "544b6ef850c10e6bb15d0ac9a6474d471044309a"; - sha256 = "1j0ffs9517ba29lwd92sk30ih6sxlx2ychrr6lzc0a3lzdlzfaqz"; + rev = "65fe2afeb240ff16b6fa0e580e3b03342b388e28"; + sha256 = "0sv4m44zbil54mppqybq5978f3dnn0smjpkl3qw7d4sfh4dwf779"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo"; @@ -15561,12 +15611,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20170327.141"; + version = "20170401.1342"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "1eea156ea6f1376d474274ce76b1d6864223c47e"; - sha256 = "0lhpwa4rgxb480gzfp55infr9672fv3b3my72f6wkwhh1k5i5xjb"; + rev = "a1c8a5045ff31001f0a0dde188e20f23640f5469"; + sha256 = "1awrkcqk38aash3whihhjrxq9f9b568vpiaihyhcsi0773hl5h3b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15810,12 +15860,12 @@ ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ede-php-autoload"; - version = "20170221.1002"; + version = "20170406.609"; src = fetchFromGitHub { owner = "stevenremot"; repo = "ede-php-autoload"; - rev = "8ab5c333ded9110ed2dce90ca7fd89dcb3912dd4"; - sha256 = "127a5rf21ynw96lw1ydzdvpjpxzccn3dhvc6f24s96sg8r04hpbw"; + rev = "2aae77b5ca2ce458f56fe67a33d5e84bb9428e5d"; + sha256 = "1vsmpvip4dwj1jwvj5iswci14xky4mrfpqgh1g8i56p5ql9ifsmr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; @@ -16201,8 +16251,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "b196db4ca284abfbc63416582fe17cc357551fc2"; - sha256 = "0sw0cf69yswhgnyp10qjirrb2w2p9y6pc7ni8wbw8l16pmc7vgg0"; + rev = "a9bec9b4cdaec8fa92bec398c4c5231817e7efad"; + sha256 = "146jq14xjab996r5ff9nschbrh4zk7grggnj7xm8bxwnr9yv0qv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16238,11 +16288,11 @@ }) {}; eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eide"; - version = "20170213.1254"; + version = "20170407.1229"; src = fetchgit { url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; - rev = "66d4490ec38dd992ba90b3801879d3f0ff312635"; - sha256 = "1y8imvgms7nb8fcpm1v6zkx3hqsf6zygc38gbj87c8s85f2qmfrq"; + rev = "d15589a117ac710b70df71cdf33a33ca05e55d13"; + sha256 = "0k0x8xlxnv4fn2q3fyaxpbj4776cbc6ylbiwxqjzvqqzaq6lmx8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d384f185f76039b06a1b5b12c792b346c6d47a22/recipes/eide"; @@ -16279,12 +16329,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20170322.650"; + version = "20170407.618"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "2547226f2ee32726809a3a603e6797492896f170"; - sha256 = "1rkva6lmss32vd96wvgh0r5phdr54xs1hjmwpkcr4x2h1dm1w7a6"; + rev = "39f5d329f188759662f703cc587a9973bda0aa5a"; + sha256 = "0lais4n817lizqpjv90ajijh8dwa9znc4ib57v8y20g76yffq1gi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16396,8 +16446,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "b47a94877b8b621534403a533ad147a971caaf89"; - sha256 = "0qhy7bxgs8gbbjww438jmmqhz20aczp3bvdpbywbwcmfkadv6086"; + rev = "cdd39a51aab1ed23ac7195297eb986fc482e8c42"; + sha256 = "0av2lpj1rij8mcf0jxdfm6pm6pwrv1wzh095z8vsfcdda8svznxc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16480,8 +16530,8 @@ src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "26d1b4f7920ca32e0e76a3ffa23784a80253c9f4"; - sha256 = "0rk1qvgdnx1xn7pmb2713i68xm05kp3cfkwvd5smbkzjj2nvbi20"; + rev = "c0f1c01a82903a1d7f5d49eba6d9e9d373423907"; + sha256 = "0kj4rbn86v9hjkshpyn65cmyhrnmg3s6ir6p4ricnhzv11rgkx6y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -16848,12 +16898,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20170305.1633"; + version = "20170402.1842"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "5028a4f75cc5e7d7e9134ed32a9f5bc4b6809b32"; - sha256 = "1glj6s8hpas5ph9bg85rq6fq6n4nzq84di27sa2nbv7qpjwq4fcj"; + rev = "67c4f07f5b0f942f030848f5d657909a1424b597"; + sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16918,12 +16968,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "20170125.1846"; + version = "20170402.1842"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "5028a4f75cc5e7d7e9134ed32a9f5bc4b6809b32"; - sha256 = "1glj6s8hpas5ph9bg85rq6fq6n4nzq84di27sa2nbv7qpjwq4fcj"; + rev = "67c4f07f5b0f942f030848f5d657909a1424b597"; + sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17048,8 +17098,8 @@ src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "6ef632c8922e01714a25c6e04fd5522be6e5ea26"; - sha256 = "00c9s60g7rl784q4slfaavqkjhj8j73pglflpjh8pvrgj77c4y6y"; + rev = "54b6221a06a32075d1d0c991f75f53c6c792830e"; + sha256 = "1xzm86l37fjiknqbsdv14n70mgaw0105i55fbl4rf0p9q4nircmv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; @@ -17380,12 +17430,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20170324.227"; + version = "20170401.1152"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "c793c9d048f16b74bddf7aff5b3e3cf32d90f71f"; - sha256 = "0cmn8j2hbh5qzwwskhjmpilgcdf0h3lm9jj0vx1fwwagxg369gw2"; + rev = "9d143d1e85d6d05792e4557393edeeb155fc950e"; + sha256 = "0wbvym7jal2n45pqd1nf10009cxlfffdsyip7yv1fixbb6b39y5c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17976,13 +18026,13 @@ pname = "emms"; version = "20170301.1406"; src = fetchgit { - url = "git://git.sv.gnu.org/emms.git"; + url = "https://git.savannah.gnu.org/git/emms.git"; rev = "6601ba8ef710b8ed260773e18a3baa940a7adc3a"; sha256 = "1fzbzyvm98128dr01rldlabqkz9mag1z1qys36v2h6cfax1xjv9i"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms"; - sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; + sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94"; name = "emms"; }; packageRequires = []; @@ -18078,12 +18128,12 @@ emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv-jp-radios"; - version = "20170322.830"; + version = "20170330.904"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-mpv-jp-radios"; - rev = "dbb22a8ccfabf961965093abefa77217cac1d8ff"; - sha256 = "0w22qkdqw5328rxn7ik4yfw77wbigaspyz30hd1v68qklhxpag94"; + rev = "7c3dc98e86a178c217bec74fb1e5da7de00fded9"; + sha256 = "0xdqi3fi26pj166z2f1fpl9ckdma9rsck324ha343r2y3snfzch0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; @@ -18246,12 +18296,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20170323.730"; + version = "20170401.954"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "9ce171d38915c81ba0f387e013aad2e089d61d48"; - sha256 = "1p2hws3jyk4pvgxznirp20r9s6h1554h6sn8kil203cb4l64wb3f"; + rev = "4f365dc562c8c5642719faf85b7536278c561d2e"; + sha256 = "0j3ydg2n6dq77qpyhyqdkbxhfhzmml5b5h8cghsx0i5267grssph"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -18468,12 +18518,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170318.1059"; + version = "20170401.257"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "9ccf54cddb1d7884f36de9d7d077cee55eae410e"; - sha256 = "0y6v9bmhspfmr3bmqf5av4n1xdwj0nx9fws0gw8n9ln92yz6w3sz"; + rev = "bb09141e7e2a25947f891008cf6036525c8ed484"; + sha256 = "15r76hmibpyvz87mwi9qzyn63l7k4ab5bhx5g5ziaak8q3vwwibl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -19109,8 +19159,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "53b483cb14c4b3b666eab63f9f09d7ac827f9a7c"; - sha256 = "1pw1ibqyn7j56dk6yh21hg91xv5kp478da3xv3gb77mh4is09n8b"; + rev = "a7307600a2b8dbcf628ae8ccf26137bc32f060cc"; + sha256 = "0q07c7h6pzfl72i8vfb9j9l069zjblfclcxl9bnmci9kzj7ghmrr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19165,16 +19215,19 @@ license = lib.licenses.free; }; }) {}; - ert-expectations = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + ert-expectations = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "ert-expectations"; - version = "20130824.500"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ert-expectations.el"; - sha256 = "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7"; + version = "20121009.34"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "ert-expectations"; + rev = "aed70e002c4305b66aed7f6d0d48e9addd2dc1e6"; + sha256 = "0qgi3rj49k0hz4azg7ghcj6385p5s9gakqjhrjnhih7dxvihcgxi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/55809f1a04061a26665d2995975aba429815c19e/recipes/ert-expectations"; - sha256 = "094lkf1h83rc0dkvdv8923xjrzj5pnpnsb4izk8n5n7g0rbz1l9w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/ert-expectations"; + sha256 = "07mp0azb6wsa1z4s6q8jyh7dpzils0wh2bamfmxzy4gjqjwv8ncn"; name = "ert-expectations"; }; packageRequires = []; @@ -19266,22 +19319,22 @@ license = lib.licenses.free; }; }) {}; - es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, spark }: + es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170307.2136"; + version = "20170410.354"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "527a2f70e1de7df46e59609b245e7e99c53708d1"; - sha256 = "19kss3hrjf1cj4lgj68qw5zszar7c7pjbqj8sxlwicnrg831mj0n"; + rev = "25a7361365d25ad6823b99913be72d1b724083b3"; + sha256 = "0lqxk54443x0ccxr745k5dlq6zh4kqc1dmnhh6dqcnfyc4amqs0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp"; name = "es-mode"; }; - packageRequires = [ cl-lib dash s spark ]; + packageRequires = [ cl-lib dash request s spark ]; meta = { homepage = "https://melpa.org/#/es-mode"; license = lib.licenses.free; @@ -19630,8 +19683,8 @@ src = fetchFromGitHub { owner = "ecukes"; repo = "espuds"; - rev = "ef854367d469c6eff459d24a544addd21a4fbd23"; - sha256 = "024msmnwlnsgqa523s3phxj1g77pyw917gz1fhz56062576nv22q"; + rev = "67a77b92f23f9016d133543de93bfbe1b2f9a818"; + sha256 = "0xmcdw5hw6dmcmwjp1jvdvh2ijymlkcksjscm28cj442s4sarqgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds"; @@ -20163,22 +20216,22 @@ license = lib.licenses.free; }; }) {}; - evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-colemak-basics"; - version = "20161117.1319"; + version = "20170405.1037"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-colemak-basics"; - rev = "5e56117af85e89659e9565abefef24fab7b567e8"; - sha256 = "0r62rpgklsc24yj57w72jq9i1c54fr4ksy99siyvkginmcink7kz"; + rev = "207fddde50e36fc3ccd926c69ef7901e938db2ff"; + sha256 = "06r0x6yvwa811sfb9izzld4a460wip7nn6dfxw91i6x8g825h2qd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics"; sha256 = "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k"; name = "evil-colemak-basics"; }; - packageRequires = [ emacs evil ]; + packageRequires = [ emacs evil evil-snipe ]; meta = { homepage = "https://melpa.org/#/evil-colemak-basics"; license = lib.licenses.free; @@ -20208,12 +20261,12 @@ evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-commentary"; - version = "20161015.1251"; + version = "20170410.227"; src = fetchFromGitHub { owner = "linktohack"; repo = "evil-commentary"; - rev = "a5f2543cb2b90d73b86776f02b25ef16c505832e"; - sha256 = "1nslk5j55yqaczpbz7w8jirl6gbccb32w8g6bm7higvv8cjv7qsg"; + rev = "8cd9ea799e981b3b5ed3dcdf45d5464096e4abd2"; + sha256 = "1bq8f00dczhlqsp6s7k7cjb9mfpdznykwqm3jn7nj5fn5gdiramx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary"; @@ -20628,12 +20681,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20170312.2052"; + version = "20170405.1418"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "62378695eb45990dec776864e16c28829136aeb6"; - sha256 = "196ii51malqh2ahfk13rj6p4np0755zhx4pdk18090pwl4hgkzfz"; + rev = "79f5755a65018d8e9798f52e595771e7abbbed2d"; + sha256 = "17xx4m6j5dcgd33pjqlra5xfqwx1hdhrwqy2mqbykzxpbmadlmph"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20691,12 +20744,12 @@ evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: melpaBuild { pname = "evil-multiedit"; - version = "20161010.1703"; + version = "20170408.1744"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-multiedit"; - rev = "e2df8629971df7c905256c504ff5f90b94eebdb8"; - sha256 = "127x55msyy54n6lkml615akhafnbn62cxnmwj1brjwzzi5cbk6bn"; + rev = "615f2ac3539c39d5ec11e4c9ba0958d8a9381090"; + sha256 = "068cymahvpyzn13wnma0lfym0f0vfr36kdq7pl8qmhf8ra7xxq92"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit"; @@ -20884,8 +20937,8 @@ src = fetchFromGitHub { owner = "linktohack"; repo = "evil-rsi"; - rev = "236bf6ed1e2285698db808463e5f2f69f5f5e7c0"; - sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f"; + rev = "65ae60866be494e4622fe383e23975e04d2a42a3"; + sha256 = "0cc2yxck5brnicllcadb4m5zlzczvdy6v38q34hj8bri1kxfzslz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24f438b47e8ede0ef84261424c122d2ac28b90cb/recipes/evil-rsi"; @@ -20905,8 +20958,8 @@ src = fetchFromGitHub { owner = "juanjux"; repo = "evil-search-highlight-persist"; - rev = "2f9ea9086373292610f50e5f468b55c3fe072bfc"; - sha256 = "04mf3zd424kfnswifrg3qlyi39f58ydnm7ahcd0zi168bv1d9r6j"; + rev = "1b130e771fc9f3bb7c80e1a50c2847a9e024ad09"; + sha256 = "1la7gamv1qd5wsdlxjjx859zciynln3g9lnxq51iylsbfxgc2f7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91361f95852910968b395423e16377c70189fc55/recipes/evil-search-highlight-persist"; @@ -20943,12 +20996,12 @@ evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20170328.1011"; + version = "20170405.1644"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "3579123acb130e18e9bd8ff3b3029f7052528a32"; - sha256 = "0pn4k55wg2lzjlpv10c39mvcb6y2fgbc6cfb24czw70ykc5ln087"; + rev = "c3e5e26c14f4a47daedb4fc48e1b0fb993aa0999"; + sha256 = "009491hskqkvycng70n3mm7zqxlf6jjninddlcbnknyfr44y4xka"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -21048,12 +21101,12 @@ evil-terminal-cursor-changer = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-terminal-cursor-changer"; - version = "20160806.2236"; + version = "20170401.142"; src = fetchFromGitHub { owner = "7696122"; repo = "evil-terminal-cursor-changer"; - rev = "918a741c2ad83f3aa3478863d01bf57422eb6009"; - sha256 = "0wdn2gp93r555p7pp9pw8ma2wfs2gzvb54ncrh3ad0p8v95x1kf5"; + rev = "b49ca4393d2f3cc6014174950059b36a5cb22949"; + sha256 = "1zra2h0x20whshbc4sfyj6w73jv6ak435mr9n6r6s7brqqqgpa36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/148d324afb1891b239dfad680ad7b87b4611316b/recipes/evil-terminal-cursor-changer"; @@ -21591,12 +21644,12 @@ f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; - version = "20161002.800"; + version = "20170404.1039"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; - rev = "4ef57d1539a964a0d02b23becbe9b5e49b805d66"; - sha256 = "1hymz7chs177pwgfddz6prb18iqj93n1j2xzfszlgl28246939cl"; + rev = "fabdbd4a4a8caf8684f0fa656f457a03c5dfa4de"; + sha256 = "1983ymny8329d826kfm5f88na1lym991xnz8wjz4nd1ah52c323x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22ddcf536af597b688d8edb70b3636ed6c265bf5/recipes/f"; @@ -22224,10 +22277,10 @@ }) {}; find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-dired-plus"; - version = "20170222.1750"; + version = "20170409.1832"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/find-dired+.el"; - sha256 = "002lcqhddw163w8h2lkp3yd47qhbia9ml7g8agngffsin9jip7qw"; + sha256 = "0zfqkw9vghbzvdh3iyqkkdq777bb1yhfgqk7p28dxz861z13cmfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+"; @@ -22243,12 +22296,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20161202.2205"; + version = "20170402.2100"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "08ab38b89d21f528fa7dc18f860191365852959a"; - sha256 = "1ybv1scpf7578zfjpl71nynzydq8g5607ai6l0vavprdhri70xdf"; + rev = "a81f7d7020d5bdfcc835911d4def6f09301a1f55"; + sha256 = "167anv3qyslfzyrcq4qnzhdx8zhbj1r0lmrvnp1spsalvcbph9ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -22342,16 +22395,19 @@ license = lib.licenses.free; }; }) {}; - findr = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + findr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "findr"; - version = "20130824.507"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/findr.el"; - sha256 = "0a04mgya59w468jv2bmkqlayzgh0r8sdz0qg3n70wn9rhdcwnl9q"; + version = "20130127.1232"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "findr"; + rev = "1ddbc0464bb05dcda392b62666ad17239a2152d3"; + sha256 = "0wx4hd4agrfvk0igyash658cbf7v3bv01rlspllsvzr59fl3faqq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/66bba94ec4168441c8e43253c7e1cfd82b613431/recipes/findr"; - sha256 = "0pxyfnn3f70gknxv09mfkjixqkzn77rdbql703wsslrj2v1l7bfq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/findr"; + sha256 = "0pw72bdpmc0ymlgjmwwrslhynij5a5b9sc3rx6vyprpv1ad4ac2c"; name = "findr"; }; packageRequires = []; @@ -23081,8 +23137,8 @@ src = fetchFromGitHub { owner = "Gnouc"; repo = "flycheck-checkbashisms"; - rev = "39362240b8e38e6ddc1da2e2c2229e3fecdf6057"; - sha256 = "1s2zq97d7ryif6rlbvriz36dh23wmwi67v4q6krl77dfzcs705b3"; + rev = "0794ad763d7cd81286283f6400bc89a81e8e07d4"; + sha256 = "06jkvi17960wghphar9c1nixanb0197v8q5nm96mgz0gxn923400"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f5678ea5aef4dc8a517d6d9381a64f182645d344/recipes/flycheck-checkbashisms"; @@ -23308,12 +23364,12 @@ flycheck-dedukti = callPackage ({ dedukti-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dedukti"; - version = "20150106.651"; + version = "20170407.258"; src = fetchFromGitHub { owner = "rafoo"; repo = "flycheck-dedukti"; - rev = "717977c0ead0dc6e267ba2164781d92ee016b7b2"; - sha256 = "1hw875dirz041vzw1pxjpk5lr1zmrp2kp9m6pazs9j19d686hyn6"; + rev = "ea34af5e677fbf18a40935b531abb1d9aae59f6b"; + sha256 = "03flfn7caxa8jpp6v3mn1mvs8lf4khcl8nsgd1nb93k7wp9x6l5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/732832e88a65a8866fa3872ff5f29eb8a26438f2/recipes/flycheck-dedukti"; @@ -23392,12 +23448,12 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20170323.634"; + version = "20170403.1116"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "5bc8c9511eb9817fddadb65ff4f0520b52c09de3"; - sha256 = "18xcgpqr0cxhp79i6zq9c1131rwcsv9lmryiiyph56zl4vg2hb37"; + rev = "879c52116989f6041ccd20f5db210f5552d5c649"; + sha256 = "12qblzrw99lcl8qccl26kwqiwscn04izvjrsq3mnp1r5q0s0jxl2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -23417,8 +23473,8 @@ src = fetchFromGitHub { owner = "aaronjensen"; repo = "flycheck-dogma"; - rev = "7e14207a7da67dc5524a8949cb37a3d11de1db6e"; - sha256 = "1f3wn48am7920s6pm7ds1npfbj1w2pb8k790rl79rvc398g1pyyr"; + rev = "eea1844a81e87e2488b05e703a93272d0fc3bc74"; + sha256 = "0wmp4q1jzb6giwrv8ajgqriy155mcc7jnj5sycpfk3hw6q74js66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd7601c55206fd0b9b59f98e861c52b9d640278/recipes/flycheck-dogma"; @@ -23959,12 +24015,12 @@ flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pyflakes"; - version = "20170325.1258"; + version = "20170330.1611"; src = fetchFromGitHub { owner = "Wilfred"; repo = "flycheck-pyflakes"; - rev = "439c0e5bcc4bb1a0c68b619a862df6ea316f0b43"; - sha256 = "0fjjv8ygx55vk91fdzn7ikm6kgwq9kzn14f5lfawipyymxrih3na"; + rev = "61b045939e3743b2162b7e4e73249c66fc2b8f65"; + sha256 = "03p0666vpprp6ijkvx9ypaw58bdq42gh533270plv2k5l8r22cl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05e6f3041151006e44f91e5bcbaa7be3750fb403/recipes/flycheck-pyflakes"; @@ -23998,45 +24054,45 @@ license = lib.licenses.free; }; }) {}; - flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }: + flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }: melpaBuild { - pname = "flycheck-rust"; - version = "20170322.306"; + pname = "flycheck-rtags"; + version = "20170403.957"; src = fetchFromGitHub { - owner = "flycheck"; - repo = "flycheck-rust"; - rev = "ae7c14758c3d33615d981f15951500feb2881b06"; - sha256 = "1gldjfg112jphpvzbaz3viars8yjyb783ry1sp37g5nlb80lf7jb"; + owner = "Andersbakken"; + repo = "rtags"; + rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8"; + sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; - sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w"; - name = "flycheck-rust"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; + sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4"; + name = "flycheck-rtags"; }; - packageRequires = [ dash emacs flycheck seq ]; + packageRequires = [ emacs flycheck rtags ]; meta = { - homepage = "https://melpa.org/#/flycheck-rust"; + homepage = "https://melpa.org/#/flycheck-rtags"; license = lib.licenses.free; }; }) {}; - flycheck-scala-sbt = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, sbt-mode }: + flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { - pname = "flycheck-scala-sbt"; - version = "20170226.1127"; + pname = "flycheck-rust"; + version = "20170404.842"; src = fetchFromGitHub { - owner = "rjmac"; - repo = "flycheck-scala-sbt"; - rev = "2d063d42628baf4cd4f38224013ece5b027db046"; - sha256 = "0ch63mm24ljpz1kd6w2qs4218ifir6aah7dnxipi2q2yz24frg6x"; + owner = "flycheck"; + repo = "flycheck-rust"; + rev = "a89c0298f5e8fdcb0c33833ca1eca64632cec053"; + sha256 = "1h2n1y69fxj2naxlyl7056rhggbpmh13ny2rcf0jjr1qnrrq756n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0afc1e5b31689a5ba52443e2878114d9ec0e7757/recipes/flycheck-scala-sbt"; - sha256 = "09d6nj7rc1ba4psnb2csnmrs1mh5xnwh7gq7g6kq4y4f27wr8zcg"; - name = "flycheck-scala-sbt"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; + sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w"; + name = "flycheck-rust"; }; - packageRequires = [ emacs flycheck sbt-mode ]; + packageRequires = [ dash emacs flycheck let-alist seq ]; meta = { - homepage = "https://melpa.org/#/flycheck-scala-sbt"; + homepage = "https://melpa.org/#/flycheck-rust"; license = lib.licenses.free; }; }) {}; @@ -24064,12 +24120,12 @@ flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-status-emoji"; - version = "20170311.1203"; + version = "20170405.1600"; src = fetchFromGitHub { owner = "liblit"; repo = "flycheck-status-emoji"; - rev = "2f323cb210a280fc05061f3fc689c627b40bfcb3"; - sha256 = "0gz18jp5bcwm86w6ir8vyf8rb3l2h524zfvx0jpfk0k1mmxj9cs7"; + rev = "c4e891ad287c12b83b754ada27b4550fb763c07f"; + sha256 = "12nlzs4fha1bmq1xbfgf5j4wg9llacl2m3jr8fbk8144pyss3kg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji"; @@ -24106,12 +24162,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "20161229.331"; + version = "20170409.25"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "ae7b29111cb160774c317997902d7ef29cedd7d9"; - sha256 = "17s34rqxkirb88y8jzl3ybs7j3ylp9ckdfx3sqwfn0cyspnj5f1d"; + rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5"; + sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -24194,8 +24250,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79"; - sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9"; + rev = "6b32dc7a832e6c4883dd434530c8d6d69fe36c15"; + sha256 = "0zx57xhg065hbcisvsryqv2lb34fnzfvzv418nbc6r3yy29yb9ar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -25430,8 +25486,8 @@ src = fetchFromGitHub { owner = "larsbrinkhoff"; repo = "forth-mode"; - rev = "45650c28a2cdc149a4480d5ea754758c75f8eb01"; - sha256 = "14p0qygs2ng0jq7hqnhq3za52pzs8gv8qr75a6ic0irh21mvspzp"; + rev = "52d84393c09be34934efe3cf80849d438cffb632"; + sha256 = "15lq5q0vzzy8hppzxn06wkm843zhnhq922sg0f9bxcnwvs7v2v99"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode"; @@ -25468,12 +25524,12 @@ fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fortune-cookie"; - version = "20151110.2235"; + version = "20170407.1517"; src = fetchFromGitHub { owner = "andschwa"; repo = "fortune-cookie"; - rev = "9bf0d29358989e1aee61c472bd5204b9bdf46465"; - sha256 = "1kk04hl2y2svrs07w4pq9f4g7vs9qzy2qpw9prvi1gravmnfrzc4"; + rev = "bad99a2cd090f6646c7ee1125b95dd98744939c6"; + sha256 = "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab0d56626c9bf847c693b4d9ddb08acee636054f/recipes/fortune-cookie"; @@ -25759,22 +25815,22 @@ license = lib.licenses.free; }; }) {}; - fstar-mode = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + fstar-mode = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20170329.953"; + version = "20170408.1115"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "a033486d2d01cccb3d1b3a17e57155cca167b08e"; - sha256 = "1dwcni802pqmj3safvr36c7l5mafdvyfvxy1k5qp3ah7qy08xknw"; + rev = "88ac69fbe056972ac92f8f941aade79147df2124"; + sha256 = "1pm8zjvfdi2qgm0313flmgwjkc7yb1k4h85kw3m0d6g02g5s9rfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy"; name = "fstar-mode"; }; - packageRequires = [ company dash emacs ]; + packageRequires = [ company dash emacs flycheck quick-peek yasnippet ]; meta = { homepage = "https://melpa.org/#/fstar-mode"; license = lib.licenses.free; @@ -25908,12 +25964,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20170216.138"; + version = "20170408.908"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "9e9f3b91db7ac161e5985ee8e6104c7eb05d24f9"; - sha256 = "0kmj9kgp3xcyvx5xc67h69y8ghiw5wc42n9n2gc66in8j8sfxxr3"; + rev = "dfc095d0cbb77cbdee5005bbfaea10257eea059b"; + sha256 = "090j76qfj32i9r96cqv8kp57g9mfj3w50a125gx8h1xknqb7831a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26723,8 +26779,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335"; - sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb"; + rev = "51ed4d7b3642f20bcc30cd664bfb1936e92531c3"; + sha256 = "14m4zhcq8rbfrmb6cykpa6i0rr4cyx1g3p01jgrk7yciygd42255"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -26866,12 +26922,12 @@ git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-lens"; - version = "20160203.2237"; + version = "20170403.418"; src = fetchFromGitHub { owner = "pidu"; repo = "git-lens"; - rev = "be62df785ae14fa8652fe2cdd342d3256f8c0933"; - sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc"; + rev = "77e74e8575e3be49ff19b9d79bd4b8d9d8a662e0"; + sha256 = "1axh9v1svb6353g2mqkfk9d0b7q1g4rkscw6nj1g9z72ix4rmnch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens"; @@ -27475,12 +27531,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20170123.248"; + version = "20170406.732"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "ffa5fec15971ccec0b19f759c9191cac9ee851eb"; - sha256 = "0hlzdvm7d0r9jh4cv9ff1wdjyfffr2417kkq0mlbv0bvqczwdd8b"; + rev = "72f6a7fc9153d141494b19ca7ff2c0d1e35c2a16"; + sha256 = "12w5hnp5nnsy532kfwsp43n633k1n03hs1az6pd9sczjzhhz9ihb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -27686,8 +27742,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "007b034ad7b6d5b70bd18348fc7609a9fdcbad18"; - sha256 = "1cy7fjbip8c9pmv91bk4kcjcl5qdz3an2i78ywlb3b2qhsac21kc"; + rev = "1ed1baa46aeda2ce7de181161d4e2d369a740ce1"; + sha256 = "1ywyvppqyv6r52jagjn45nbrx9r5hsr2b3nxaya8sxsrkjv6hsn7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -28481,8 +28537,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "ba5f0223b6e1fa692f0e700718a8cfa65595e2b3"; - sha256 = "1bglnvp009x8c5na3zdzbvfz72i1arxmi5y1c2i0yjw4hggqvvlm"; + rev = "9bfdc5ce62c0585b48b154cc460f8664dcd124c3"; + sha256 = "0p00s08fjwh106dag9wyhikzrh0vqd4pzb852b2zrmb7zlhigx65"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29008,12 +29064,12 @@ gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruber-darker-theme"; - version = "20161017.1108"; + version = "20170330.1211"; src = fetchFromGitHub { owner = "rexim"; repo = "gruber-darker-theme"; - rev = "ac87018437667c84fb5bb7e7b17e5ab2c8347272"; - sha256 = "0gw06d9h0fn9jds8vk8dkz8ghf62jrjmxj8q0qlaisdipmdqk87n"; + rev = "b9e59d9580d2b95dabf9a53ee3d51c2868b693fa"; + sha256 = "16g3rshbh9xzr6ng58vp2qw3zin0ylvlnmdg54p5cf8f0d11fd4a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme"; @@ -29701,12 +29757,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170325.553"; + version = "20170406.25"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "c8fe96acc1a8e73e39445b2d5e050540d69d9f5a"; - sha256 = "03wjrpr191ydqd1kgh65h6naw5bsk16zk14cw885zidyv27d0hr2"; + rev = "8165d8a809c21e220a257806ebe88180cbc8694a"; + sha256 = "1vx6liapkkfsd678nmlsx3r641v2vxxbqk82cw6cqanzp3i5p7y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -29805,12 +29861,12 @@ haxe-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: melpaBuild { pname = "haxe-imports"; - version = "20160814.52"; + version = "20170330.1604"; src = fetchFromGitHub { owner = "accidentalrebel"; repo = "emacs-haxe-imports"; - rev = "0fbd5d26f976bcf70bf26e685b2c3c0dc465a058"; - sha256 = "0hkyhj29imn1hrjabqjwqlj47qdwigcyclic3k3bigk06pjwalmh"; + rev = "164e9d2b6ce420dda543d8dade27d2f28d347132"; + sha256 = "1ymg128qpr325hakjw3b9jckq87k8nhk8jlx8hdqa1yx6rv0lfda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db7d2b08e914aab7719c6d3a951b142ec7252f34/recipes/haxe-imports"; @@ -29969,12 +30025,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170329.1221"; + version = "20170409.1155"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "b7b2cf9fbf0ad68a7487ddab62677384d19b3b8a"; - sha256 = "0qhdyazyz5y0gs1fcyy4xf4ffdvwrjxpfiki4iyy1fin481bkhwv"; + rev = "57ea1a4727cdacf915ba4c20a452d8959919f7e2"; + sha256 = "1sj228sr4zp6cbcjx5hakm220adxz9a4flkhg00dkafqzhzgflna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -30557,12 +30613,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170329.1221"; + version = "20170410.557"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "b7b2cf9fbf0ad68a7487ddab62677384d19b3b8a"; - sha256 = "0qhdyazyz5y0gs1fcyy4xf4ffdvwrjxpfiki4iyy1fin481bkhwv"; + rev = "57ea1a4727cdacf915ba4c20a452d8959919f7e2"; + sha256 = "1sj228sr4zp6cbcjx5hakm220adxz9a4flkhg00dkafqzhzgflna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -30914,12 +30970,12 @@ helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }: melpaBuild { pname = "helm-flx"; - version = "20170110.957"; + version = "20170404.1230"; src = fetchFromGitHub { owner = "PythonNut"; repo = "helm-flx"; - rev = "4ba59e1db2d3c33c8ebd40207456f31ab05c5d75"; - sha256 = "1bh0nbw2ylgfba0k2bvhasxr6nlcvs5g62ls0xy8207dayjrbjxk"; + rev = "c8650d9b34afbc236c28aee12cbee998fda8d810"; + sha256 = "0400maq605qq631a766lzmphyaxwq0lfvb6x29j6aqd6pgxxrjs5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx"; @@ -31229,12 +31285,12 @@ helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }: melpaBuild { pname = "helm-google"; - version = "20170318.527"; + version = "20170407.1156"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "helm-google"; - rev = "27e619d3bd9974a8e1aebd2e10ebf658f49e620b"; - sha256 = "01bw1papl2cblqd6kciw9aha7jkj3rilxb8mzi0avpxgm1g3d1fb"; + rev = "b3f10af10075f1982434d4c27c5933124940942a"; + sha256 = "102g8yb15rpyxs4pndqqbskg4b8g8ssqk9wfxs9zlyah5qcb2m33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google"; @@ -31397,12 +31453,12 @@ helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hunks"; - version = "20170225.602"; + version = "20170406.257"; src = fetchFromGitHub { owner = "torgeir"; repo = "helm-hunks.el"; - rev = "1ea40753244ec843f38481b0889bb7d0e8db6619"; - sha256 = "0lhzzm5z50zfhfvg7chrflgnjnmpr9k9w40s6yczpsfanqm96qp3"; + rev = "287685254002d47432f267884ac6a83de67ea07c"; + sha256 = "0gfly5wv391cw7dpixxik0nqs2f7h1n8102pijjipk3g79f1f1ic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks"; @@ -31648,12 +31704,12 @@ helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-make"; - version = "20170206.1323"; + version = "20170409.44"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "ed406557c814bb2521cf826370e57ffe9d40d33e"; - sha256 = "02dfrr474yza18xvshjx41h1fsk81g950k6p3h4j1hpdqgjkv96k"; + rev = "3a5da626247095d8c1350e50a39736e3bf0db771"; + sha256 = "1aaw6c3mw064g0ym5vz2fibq7csabqvgc8lx7wwsl35jbcx3y29c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; @@ -31750,6 +31806,27 @@ license = lib.licenses.free; }; }) {}; + helm-navi = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, navi-mode, s }: + melpaBuild { + pname = "helm-navi"; + version = "20170402.752"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-navi"; + rev = "2256591174ff79f889450fdc10822316819d6476"; + sha256 = "0bbb52v1c81a6ap10qi7mqigi237vwrlmf8mg3ckglm1i710636j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5ffbc25c0eb30b9c96594d50f47cd0383aa8ebc/recipes/helm-navi"; + sha256 = "0v3amm15pwja2y7zg92hsfhp3scmswwl0q0slg33g11rvj26iiks"; + name = "helm-navi"; + }; + packageRequires = [ emacs helm navi-mode s ]; + meta = { + homepage = "https://melpa.org/#/helm-navi"; + license = lib.licenses.free; + }; + }) {}; helm-nixos-options = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, nixos-options }: melpaBuild { pname = "helm-nixos-options"; @@ -31816,12 +31893,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20170322.1209"; + version = "20170409.1055"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "bc9c69b0495b1dd8e84bfcf1722165e30ea87904"; - sha256 = "0zcxpijxgmpjxx8kincq9w8d83y4pnzi0glbiv92xlxm91fk3mbl"; + rev = "07313ddf77cd38355b77a3fa0b46be998de38732"; + sha256 = "0rscnb9lws9y6x0ggg03ran2vjpn7a61rywz3y1vvr5skf2nhs9n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -32152,12 +32229,12 @@ helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-rage"; - version = "20161201.222"; + version = "20170331.607"; src = fetchFromGitHub { owner = "bomgar"; repo = "helm-rage"; - rev = "d9a342e2bbdabe86d6c25bb1939c55e3a2a12381"; - sha256 = "05amzj09jwn0ypnk53i1m1pzxqxghxcfv6s9y0gxnxhr440rbjhb"; + rev = "67c62eafe8af70b330895576dcb004e45c93a98a"; + sha256 = "0rrrkz092h7cikcafwf6blkyqsb6qwq1mkw8k4mbb8vy9bp9mx0b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage"; @@ -32317,6 +32394,27 @@ license = lib.licenses.free; }; }) {}; + helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }: + melpaBuild { + pname = "helm-rtags"; + version = "20170402.653"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8"; + sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; + sha256 = "1vv6wnniplyls344qzgcf1ivv25c8qilax6sbhvsf46lvrwnr48n"; + name = "helm-rtags"; + }; + packageRequires = [ helm rtags ]; + meta = { + homepage = "https://melpa.org/#/helm-rtags"; + license = lib.licenses.free; + }; + }) {}; helm-rubygems-local = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-rubygems-local"; @@ -32597,8 +32695,8 @@ src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "9c7204ea9d7ce232ce3ff88107854c219397528c"; - sha256 = "1vqr40bkf7ss25x5bd6nhqi417chgdrkf9gvp302z311vnvpycsy"; + rev = "6c0a61fc31c88577dc701d9d9010367a2873439c"; + sha256 = "1xahmb3a44iiip2fls4wfkxns08b4y2bq6jwd20ylpccj48qxmjl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp"; @@ -33037,16 +33135,19 @@ license = lib.licenses.free; }; }) {}; - hide-lines = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "hide-lines"; version = "20151127.1040"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hide-lines.el"; - sha256 = "1q87yp1pr62cza3pqimqd09a39yyij4c7pncdww84zz7cii9qrn2"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "hide-lines"; + rev = "331122bf19361130351cfe55968c2a7820329eb3"; + sha256 = "183l0sx8zn3jv1fqa3xj7a6fd792sp50jyhm50j3hy7c54m4capf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2a4e010b04a4c5dddc3f7259fad929e4cb66760d/recipes/hide-lines"; - sha256 = "146sgvd88w20rqvd8y8kc76cb1nqk6dvqsz9rgl4rcrf0xfqvp7q"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/hide-lines"; + sha256 = "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d"; name = "hide-lines"; }; packageRequires = []; @@ -33910,12 +34011,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170315.1829"; + version = "20170405.1248"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "9b671c6ca7a2d76338d6f4e38966e9cdb78bd991"; - sha256 = "1v3bd43kaihwbxvflg5kfiw2wmwjmvh5hhdzmdjlvmvqrhwsnxdc"; + rev = "ff2b2f4afa7a449c7f01defc4227897cd9e6ae8b"; + sha256 = "0ry8cxki1vhc9h4fkbjdglnx6rcm1wi3ws5bw6pvz20g4jvsz0iw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; @@ -34304,16 +34405,19 @@ license = lib.licenses.free; }; }) {}; - http-post-simple = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + http-post-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "http-post-simple"; version = "20131010.2058"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/http-post-simple.el"; - sha256 = "1wp2rwc1hgd5c3yr6b96yzzakd1qmy5d95mhc6q4f6lx279nx0my"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "http-post-simple"; + rev = "1c7b06cb0d6930aaaf3f319d9836786d40f1595f"; + sha256 = "1nvcqh3wwczh83k4nb7zgk1r07bsaycbds4zhpy7gic3jhxbvdns"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4d1df16d1c429c46ea5555021ce84d050007adfb/recipes/http-post-simple"; - sha256 = "1b2fh0hp5z3712ncgc5ns1f3sww84khkq7zb3k9xclsp1p12a4cf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/http-post-simple"; + sha256 = "0z3zphaqywbm7vn2g1f7fkrdamgsc26i8zydm9y53v9z9fmzch5s"; name = "http-post-simple"; }; packageRequires = []; @@ -34700,7 +34804,7 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20170303.1455"; + version = "20170409.1830"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el"; sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp"; @@ -35904,12 +36008,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170325.2346"; + version = "20170330.2134"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "4e802769559153b975f1b24d5a28bc80d212c807"; - sha256 = "0i66y0n0yq3dzhl176anqsjj7p0pvrpwfyahhg8cd5mw1svgdf5f"; + rev = "431c06844bfb1c99b49f494aa73df3e699b48f30"; + sha256 = "0aza4r44lxzs4fjiqc6y23b7s6r1jyvr39dkmw5570gs4lhlij1s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -36090,12 +36194,12 @@ inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; - version = "20161007.724"; + version = "20170409.949"; src = fetchFromGitHub { owner = "shlevy"; repo = "inherit-local"; - rev = "426f7997af0906013846d20729a499f0ce6db634"; - sha256 = "1n97636c3zi7cq93m5fxvgqkqg5aryn742q7pb1s1w47smdpclgl"; + rev = "b1f4ff9c41f9d64e4adaf5adcc280b82f084cdc7"; + sha256 = "1fargashyqn4ga420k3ikc1akf7mw3zcarpg24gh2591p4swa0ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; @@ -36404,12 +36508,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170321.129"; + version = "20170408.1939"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "04265e68647bbf27772df7b71c9927d451e6256f"; - sha256 = "0zax01dmrk1zbqw8j8css1w6qynbavfdjfgfxs34pb37gp4v8mgg"; + rev = "b501c022f5bc40518db726ff08e544308b6bdc55"; + sha256 = "1wacvnzg07di939782bg0nbgn81rrfqx5psxq1f9k6clzvn7f26i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -36674,12 +36778,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20170322.1438"; + version = "20170404.1127"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "63eb90e1f6f257ea8113450d0e02366148f5c2fb"; - sha256 = "19cr7k33gkkbwzbpib6hvp67r4iz4j68ykmd6mij4gk8r517bqsh"; + rev = "6b9b0aa40614580b007b55f2096f3f12c46d4288"; + sha256 = "1055rri447fwlqi7dp7dr6h4r48q9ahx76pyv1grxqf30kzv3wc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -36962,12 +37066,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170328.1957"; + version = "20170410.47"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073"; - sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl"; + rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26"; + sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37004,12 +37108,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20170324.401"; + version = "20170406.107"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "1dcb258a0207053a33ac207c11f2414aa89daba2"; - sha256 = "1nc6d67cbizk1k44b53sx913h2lbrlfmdbi60pz3h567idclw83i"; + rev = "712f204d242663ca8cdbb2b2d6732b5cf0c411b4"; + sha256 = "1mcl5j3brjsrqsafqpag8b4y8iyp2c8cbaffmv5vfw3b18hss3wf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -37067,12 +37171,12 @@ ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "20170302.1033"; + version = "20170410.24"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073"; - sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl"; + rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26"; + sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -37148,6 +37252,27 @@ license = lib.licenses.free; }; }) {}; + ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }: + melpaBuild { + pname = "ivy-rtags"; + version = "20170402.653"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8"; + sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; + sha256 = "18f0jak643dd8lmx701wgk95miajabd8190ls35831slr28lqxsq"; + name = "ivy-rtags"; + }; + packageRequires = [ ivy rtags ]; + meta = { + homepage = "https://melpa.org/#/ivy-rtags"; + license = lib.licenses.free; + }; + }) {}; ivy-todo = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-todo"; @@ -37279,13 +37404,13 @@ pname = "jabber"; version = "20170106.1603"; src = fetchgit { - url = "git://git.code.sf.net/p/emacs-jabber/git"; + url = "https://git.code.sf.net/p/emacs-jabber/git"; rev = "2ef76cff4a5a932cf17dc6107a0c5adee806081e"; sha256 = "0jvgp121544vc0yd31cncz06dkgw4za605nkk914vmql321zjzr2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cff77a688d51ff2e2f03389593465990089ce83d/recipes/jabber"; - sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jabber"; + sha256 = "0saajvfpzgcsqa7h7aa6l0bns6swr40c46md6s0d90x9lrvwp7ws"; name = "jabber"; }; packageRequires = [ fsm ]; @@ -37338,12 +37463,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20170321.214"; + version = "20170410.558"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "7cd363187a8d41fe604925df51169ca9ed32f798"; - sha256 = "0zy7xfa5m01518jf1jy0r4r4r0y0q4p0jd07zdvxihkga7ycr4bp"; + rev = "9f473f019963e1abae04f958a6c7ec221aa0aacf"; + sha256 = "19aydkph56bd1gwqcz04viya8cr4wj98yh8kqgn9kfqxrrkkb2ic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -37716,12 +37841,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }: melpaBuild { pname = "jdee"; - version = "20170326.1333"; + version = "20170330.21"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "940069c397b6db841acfd21ffd15495388deba7c"; - sha256 = "0p7pfy75cc2rqf4s9m71zaind8rfn3sqak63w10sn542d2m2nhng"; + rev = "70ee33d1cb151cff821d31540a6629d21013be04"; + sha256 = "07hgdp5vl0blgzcs2393lzn285l2s2bf5lvngz6k1xb7zx2zwn93"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -38007,12 +38132,12 @@ jpop = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jpop"; - version = "20160816.348"; + version = "20170410.550"; src = fetchFromGitHub { owner = "domtronn"; repo = "jpop.el"; - rev = "485aec3e09e4f01eeb4b737c4de99fadf79e0b31"; - sha256 = "1a63xzczwb8frr3d4a2z864qq2wx83lgljqbqphkabx99apc749l"; + rev = "7628b03260be96576b34459d45959ee77d8b2110"; + sha256 = "1x7qha7xyn2j225h7axhskngc8icjhgm3f451iq3qysj22q8g4d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a52a3cf909d12201196b92685435f9fa338b7ba/recipes/jpop"; @@ -38217,12 +38342,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170321.153"; + version = "20170330.639"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "d3b31baf68acd1b7e0d05582e504c44e1a587be7"; - sha256 = "1k9y5vzm518j98iysc7l6vhp2xy8a06qyd1v5p2xmf3dq751r57v"; + rev = "908395e3aa413b4293b35aab9d41a56f1dbe1e04"; + sha256 = "1klwg6clx5nvj6755rakzdg62brfms1s8g9cccdkipbb8m6paffh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -38322,12 +38447,12 @@ json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }: melpaBuild { pname = "json-mode"; - version = "20160803.1606"; + version = "20170402.1808"; src = fetchFromGitHub { owner = "joshwnj"; repo = "json-mode"; - rev = "e8ba0c03c5c10f61b8f0b3f5d531ef1d80dec9b0"; - sha256 = "1j02bg20ngarfwifdxz6al6394rjms2491xh4nlia7d6ihhhrafr"; + rev = "c528c7784f6449a35a8c90db58cb73125c69987e"; + sha256 = "0g9zc9sbs3m92qn2jx4nyd0b8s10c1nl92z5rwq9nci5wsmpqxzg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode"; @@ -38364,12 +38489,12 @@ json-rpc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "json-rpc"; - version = "20160427.807"; + version = "20170402.955"; src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-json-rpc"; - rev = "5692192d25eba1b47758272e8de9d67c9ea4aecd"; - sha256 = "0cbqhijv2zv9mhnjxadr2kbz5b6jcvciwmza22jkwds0nkn2snmp"; + rev = "e77a62012e4d6c946666eed3a17454d5c6f83367"; + sha256 = "1pwa1ifz0c83lwwpj75h10wj7jyghsxg6wpdlfy4dp8102wr8nhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82c6b97cdfe2970f028a00146b01e5734710291b/recipes/json-rpc"; @@ -38470,13 +38595,13 @@ pname = "jtags"; version = "20160211.1229"; src = fetchgit { - url = "git://git.code.sf.net/p/jtags/code"; + url = "https://git.code.sf.net/p/jtags/code"; rev = "b50daa48510f71e74ce0ec2eb85030896a79cf96"; sha256 = "03w5y9c1109kpsn6xnxdaz3maiwbvxywqshc1l5wngfc85jwiv8y"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c083b5368d0c0682e9e92fe6e027c9be0e0af0f1/recipes/jtags"; - sha256 = "0in5ybgwmghlpa5d7wz0477ba6n14f1mwp5dxcl4y11f1lsq041r"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jtags"; + sha256 = "1f3dw9fr31lcqmida14d9rsvy1r1b5d6ihqwdj9hbx5kv7d8jyj7"; name = "jtags"; }; packageRequires = []; @@ -38763,8 +38888,8 @@ src = fetchFromGitHub { owner = "wsgac"; repo = "kanji-mode"; - rev = "5e9d5b72468ece11cfb81b729be6babf63ede425"; - sha256 = "1zh7klqaza840q5f44zzh1wrnd6sqa2k93z3dgx3yhhsxfd1dxvy"; + rev = "eda4f8666486689d36317db7dbda54fb73d3e3d2"; + sha256 = "1m0s1kdgz1psiidpxcrzm8qmvmrmk5g2k8lz1lq357z482l4i7ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f1fb16f2f7f677d0817fd63633dd071ba2cf12/recipes/kanji-mode"; @@ -38780,12 +38905,12 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20170329.649"; + version = "20170407.1037"; src = fetchFromGitHub { owner = "0rdy"; repo = "kaolin-theme"; - rev = "be544a81cff86ab1b54ad673b9229185882ca998"; - sha256 = "1pjbkff8lcjb6ixjh9pdmgzfdjqq21w9c4q8qjcwmicj1pn1wwya"; + rev = "26f631dd8bfbfe7d2bf1006c477a7f29ae9fb365"; + sha256 = "0sr86hw311j1pwcldg00mwwfq6c2qpqimnfnwhr24nx3q8z0c7ym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; @@ -38882,16 +39007,19 @@ license = lib.licenses.free; }; }) {}; - key-chord = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + key-chord = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "key-chord"; version = "20160227.438"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/key-chord.el"; - sha256 = "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "key-chord"; + rev = "72443e9ff3c4f1c3ccaced3130236801efde3d83"; + sha256 = "15jfpysyydcvqlvdannxg2s4bh4i9z6i950fad1qlq43jfmq7k55"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b38ec88553f9b1dfa11b0ce82433b450eb47ebce/recipes/key-chord"; - sha256 = "0cr9lx1pvr0qc762nn5pbh8w93dx1hh1zzf806cag2b9pgk6d4an"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/key-chord"; + sha256 = "1g0jqmnn575h5n4figxbc5xs76zl8b1cdqa6wbi3d1p2rn3g8scr"; name = "key-chord"; }; packageRequires = []; @@ -39285,8 +39413,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "dce021f9d6d4b20f32e93876302c89e27e1b3f44"; - sha256 = "0h0vgrmcg922dcssn58slbnqbrlmifwg2qngj1k1gp9kmp8z5jih"; + rev = "46a687a4d5965290c2907cfc9e99812b358ac3bf"; + sha256 = "0s0d097k4l6hqqs8mq1syf1529gm62qiwd4lgib7qkkabf4miq24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -39362,22 +39490,22 @@ license = lib.licenses.free; }; }) {}; - kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: + kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20170226.1627"; + version = "20170409.1909"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "60141505ca027231866f7032c557afd7d085b35f"; - sha256 = "1c47p9zan4cifiaz097sc3sxq04inh5rqqc22p105x0jm0hykd93"; + rev = "9af03ee3e772458061b893b9362259f6f8ad0f3a"; + sha256 = "1185693h5zfzcfzs1n5xjzh3jxmhlsjr7q7knc19dzmkdf1vxal4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; sha256 = "0f3n7b3plsw28xpz07lf5pv71b6s2xjhq2h23gpyg0r69v99chh5"; name = "kodi-remote"; }; - packageRequires = [ json let-alist request ]; + packageRequires = [ elnode json let-alist request ]; meta = { homepage = "https://melpa.org/#/kodi-remote"; license = lib.licenses.free; @@ -39470,12 +39598,12 @@ kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kotlin-mode"; - version = "20160720.1339"; + version = "20170403.826"; src = fetchFromGitHub { owner = "Emacs-Kotlin-Mode-Maintainers"; repo = "kotlin-mode"; - rev = "9e2e4c11fe3a9e8f63ce351762a2b1ac5dbe8a75"; - sha256 = "0yzhizxb8g0zlnx97vnaqvv0pm2mx4jg7qc2hnfvc5ya02yxhc6p"; + rev = "e5c6d845e689ed0623b864ff863cc99ca558b442"; + sha256 = "0add2vi13caxgcxgl2yxdjccjmszs0918jm70084ry3iih8ljl37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode"; @@ -39551,6 +39679,27 @@ license = lib.licenses.free; }; }) {}; + kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "kubernetes"; + version = "20170410.353"; + src = fetchFromGitHub { + owner = "chrisbarrett"; + repo = "kubernetes-el"; + rev = "53f83a2e553647292191738ac65b1b930da748bd"; + sha256 = "0zv17x2srqflpqf6xqi4qwz81ajghq6xv0fxprb35b4v7j5x3zzw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb95e7cd186d02c45d14319858044468a14d9f72/recipes/kubernetes"; + sha256 = "0608wkdnbnrq2mhvnq0m2bk50bm3kzr528rvia4hlda1hwbfz867"; + name = "kubernetes"; + }; + packageRequires = [ dash emacs magit ]; + meta = { + homepage = "https://melpa.org/#/kubernetes"; + license = lib.licenses.free; + }; + }) {}; kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; @@ -39740,12 +39889,12 @@ lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "lastpass"; - version = "20170327.352"; + version = "20170405.417"; src = fetchFromGitHub { owner = "storvik"; repo = "emacs-lastpass"; - rev = "37ce019f3d305ac9806bf7a6f087bd53b12b48b0"; - sha256 = "0yvdi4fdgk7bk8mz3vjd246wbfbyw6yl821cx94zczlajg9cz9dn"; + rev = "69e1ab9fec515c3fedc9230d7c2ef6d0b3d2ff36"; + sha256 = "1dpl52plihsy8m4qgrj1fzms7q1fny8dr2qi9llg9j9m5apg3i0l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass"; @@ -40219,16 +40368,19 @@ license = lib.licenses.free; }; }) {}; - levenshtein = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + levenshtein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "levenshtein"; - version = "20051013.1056"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/levenshtein.el"; - sha256 = "0m94z18i1428bispxi285flvjf22kjm33s4sm0ad11m0w0jizir6"; + version = "20090830.340"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "levenshtein"; + rev = "070925197ebf6b704e6e00c4f2d2ec783f3df38c"; + sha256 = "1w6rhp723kn1ns7r0gcblp5q8bvncicnjjsgdangbib1a4l2xw79"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/dd530e23d6de5a592faf4fec7394d052ff440a8b/recipes/levenshtein"; - sha256 = "1iypnz0bw3baqxa9gldz8cikxvdhw60pvqp00kq5p3v4x3xcy4z2"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/levenshtein"; + sha256 = "1vdbgzs7gfy89a1dzf6z5l3f5jmly1i8lb2fqi2d08qyl5rhb8bl"; name = "levenshtein"; }; packageRequires = []; @@ -40578,12 +40730,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170326.801"; + version = "20170409.48"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "15301856dbefe5138f14ade673df4a574cf15eae"; - sha256 = "15wqgjnpr8i9lsk0mj9y0yaykdr8slh2xswh18hvky4x6azzc6lx"; + rev = "b5f6777fde363723fd82387cf5eaa5182a8b781d"; + sha256 = "1c1azl4q1frh3d5i58h9ar4lj8nfy920xsvvwbmjlpb4d54di9f7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -40999,8 +41151,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "fef24043fa2c4020eec6ef45d0da7b8b3f967b57"; - sha256 = "0wnzjj84n23nkfvx18pjfhc8jfip54qqbw218w3ci4qfghdx741p"; + rev = "af6290684b9dc470d885ed1d6c04185034130e04"; + sha256 = "1wafp2iv6qvsmh37jpmrsjw0dkm3axraz2my7cr37vcalwc5ib04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -41121,12 +41273,12 @@ log4e = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "log4e"; - version = "20150105.505"; + version = "20170401.604"; src = fetchFromGitHub { owner = "aki2o"; repo = "log4e"; - rev = "6592682ab7de0e3d1915aa4d3c53e083be79fbeb"; - sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022"; + rev = "34309972ad02abcebbcff6b1682731978aef030c"; + sha256 = "12zk40gqrh86m50y777kprkwz75vbcm0q1a9narzcs2lnpwc8g4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d0e451c5a8eb25db95990b058964a9acea4b89/recipes/log4e"; @@ -41144,13 +41296,13 @@ pname = "log4j-mode"; version = "20160108.1118"; src = fetchgit { - url = "git://git.code.sf.net/p/log4j-mode/code"; + url = "https://git.code.sf.net/p/log4j-mode/code"; rev = "26171b1e723502055e085393b0ecdcb6db406010"; sha256 = "15x6368pk4bbvhbd6cqnazcxfdz0b3f70029x0884a5797janln5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39321e054925a8de854942fec4ed8e7570099fc6/recipes/log4j-mode"; - sha256 = "06lam4iqxlbl9ib2n2db2nj6jbjzrw2ak8r99n6w4s3fny1q3yxx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/log4j-mode"; + sha256 = "0311jb47fjji8dqy98anr487f7vnvi85p4mn5ymqvxs5c6972gms"; name = "log4j-mode"; }; packageRequires = []; @@ -41225,12 +41377,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20170303.1225"; + version = "20170331.1156"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "6409991053350ab2d3def61749b92780dd1ed095"; - sha256 = "0phhkg3qgh4q4b7as0a00zx7kcrlmh24by1sjbp7b4dsd0mnz22k"; + rev = "b5cafd1145f22e7beff8ef8ed742bf10af1e6e1c"; + sha256 = "08is4fg94a6am7c2j0d5qd1nkrnik5vpzg3pqkimyxgy5czj764b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -41285,16 +41437,19 @@ license = lib.licenses.free; }; }) {}; - look-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + look-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "look-mode"; version = "20151211.1026"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/look-mode.el"; - sha256 = "0sl6hqggi6qn2qp9khw11qp5hamngwxrrwx98k3pwpj9kgicdpgp"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "look-mode"; + rev = "d65f75e8ea24eff2ac31c53b4835b45127eedd56"; + sha256 = "1adzlviy928wsqx9fvxi71rwv89zyydqmf5g0wrlx66r0ksw3793"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/245ded3ee787da7ad5f462fc6f519a963485adb5/recipes/look-mode"; - sha256 = "0y3wjfjx0g5jclmv9m3vimv7zd18pk5im7smr41qk09hswi63yqj"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/look-mode"; + sha256 = "0nhhz5s423g4kqqh0vy8k0696r0myhjfv84p2vciliky9gv1wkig"; name = "look-mode"; }; packageRequires = []; @@ -41369,12 +41524,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20170311.2126"; + version = "20170409.2355"; src = fetchFromGitHub { owner = "vibhavp"; repo = "emacs-lsp"; - rev = "0fc5400562247b5d674ae8d18f78824de12ba6b0"; - sha256 = "1zmpkpx2nhm1vvdagrp75jz6v3d4n7zv45xp49m81xzqsyw20im0"; + rev = "69d041662e1b20c1c2e79f6d4be12fc546c733ac"; + sha256 = "0s335djpfvb05v8gf44ipxikn79b7h6aw1bsvsrhscy9xcf57fml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode"; @@ -41513,22 +41668,22 @@ license = lib.licenses.free; }; }) {}; - m-buffer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + m-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "m-buffer"; - version = "20160721.1539"; + version = "20170407.1441"; src = fetchFromGitHub { owner = "phillord"; repo = "m-buffer-el"; - rev = "9c45387989bd7d813f15e56ac5d3210f5e44b1c6"; - sha256 = "1hiasrn3irxg7s413c34zxknml6fsy3yyykkv2lidk19npy6fslh"; + rev = "e2d5a416ce47b36da10a9815ff5702f28c716d57"; + sha256 = "0nm8ljciim7wjc4r021jv8xrsk7jffmagzbllbvd5cab4zxvs4ik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer"; sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94"; name = "m-buffer"; }; - packageRequires = [ emacs ]; + packageRequires = [ seq ]; meta = { homepage = "https://melpa.org/#/m-buffer"; license = lib.licenses.free; @@ -41681,12 +41836,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170329.221"; + version = "20170410.414"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335"; - sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb"; + rev = "51ed4d7b3642f20bcc30cd664bfb1936e92531c3"; + sha256 = "14m4zhcq8rbfrmb6cykpa6i0rr4cyx1g3p01jgrk7yciygd42255"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -41709,12 +41864,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20170211.1601"; + version = "20170408.1426"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "2437efb93767b352eecf27f5d5e3513e34a395ca"; - sha256 = "1pmsbl8jh3dgs42k7b0a9ya1ywwy5435pshplc23z33i7qplva9f"; + rev = "ae6250aead8f283eac8d6951a249cfc7d85e0b40"; + sha256 = "0n6dhc92z5w67rcfngjzprzbdn42ja263gdqa7fncqq9p66slccq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -41881,8 +42036,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335"; - sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb"; + rev = "51ed4d7b3642f20bcc30cd664bfb1936e92531c3"; + sha256 = "14m4zhcq8rbfrmb6cykpa6i0rr4cyx1g3p01jgrk7yciygd42255"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -42192,12 +42347,12 @@ malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }: melpaBuild { pname = "malinka"; - version = "20160615.1348"; + version = "20170410.242"; src = fetchFromGitHub { owner = "LefterisJP"; repo = "malinka"; - rev = "7a5c6e61462d2d76edcf9231d3cb70a63509269e"; - sha256 = "19ypnqrdxragnhdxfraxrinbsiamwpmgqgjj35crjnifdcj6lqzz"; + rev = "8ab9e0bcefb122ef5b931284c6cc329d8f8aaa82"; + sha256 = "0pasdzgikp8rylxxyfmxd0dd4gfjklgrsd6v1idv8cd0955gbrd8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/909a2d78f49a11e3f90e7d3c7f8af55e15113442/recipes/malinka"; @@ -42789,13 +42944,13 @@ pname = "matlab-mode"; version = "20160902.459"; src = fetchgit { - url = "git://git.code.sf.net/p/matlab-emacs/src"; + url = "https://git.code.sf.net/p/matlab-emacs/src"; rev = "3b3c48ac0c27039e0bef89c643f0ee4c0b53d3d0"; sha256 = "0kizmzpmc8iw15n6xkrf7m5kbjcs5rwdrxyrfij6cj43szlnkf1z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/39e384608df76bb3e91bd1405e3a5029181ff94e/recipes/matlab-mode"; - sha256 = "1bybc5xv5hbjh8afmh03qda5g3m2wcgsk6lgj6jkyyxzdfxqkrck"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/matlab-mode"; + sha256 = "128v4rwc99dwyfgi5crbr5649fz4l7dwh4lid8w2mwpknyxaxy28"; name = "matlab-mode"; }; packageRequires = []; @@ -43034,12 +43189,12 @@ mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mediawiki"; - version = "20170113.1308"; + version = "20170402.244"; src = fetchFromGitHub { owner = "hexmode"; repo = "mediawiki-el"; - rev = "03c5ca4e884782950d2bcc784ecc2167e43e4aa9"; - sha256 = "1d2dxpgbccd0p818xpj2wghfhvngyf4mad1ds84v2lbzyxphp6qa"; + rev = "245cb51fc4b67ccfcc3296f82e8e3a74c1a1602e"; + sha256 = "1kjpl45y3mnksvd938s1hviyxmrq9ayk9rdna8hhgmirk01fhqyf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki"; @@ -43055,12 +43210,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20170324.222"; + version = "20170402.2049"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "1ddaca25ee978736dcb3922bb1952d750c39cd5a"; - sha256 = "09g81d1l5mhji4vbljxgfrgr0051sv7kqy0vwf7awxa4slgl6bnd"; + rev = "b38e0a0333e92f8a14840534a8b8ff8fd715330b"; + sha256 = "0ysjcvbnbc28c8vs7cc18vr4sqffcc4y4p3xzr8d5giccgy9192v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -43259,6 +43414,27 @@ license = lib.licenses.free; }; }) {}; + meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "meson-mode"; + version = "20170409.522"; + src = fetchFromGitHub { + owner = "wentasah"; + repo = "meson-mode"; + rev = "7aae0da7523833d85a229ce7875185c90fa39620"; + sha256 = "167wdmzcxs1i56hlv3daw0dlhc0mya0fz86m6db2cn8gvi0wnpvj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode"; + sha256 = "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80"; + name = "meson-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/meson-mode"; + license = lib.licenses.free; + }; + }) {}; message-x = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "message-x"; version = "20151029.718"; @@ -44958,12 +45134,12 @@ mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "20170323.2254"; + version = "20170403.2222"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "e8b2c1d1a95c5275b1062956eb5384bf45fa8047"; - sha256 = "06jyq6vilry39f24bn08l0wjh1kv9m1pl57vw1qvzk36vmld5cqy"; + rev = "c57a29933e4a03e0ece8310c51a8bc2143f8b010"; + sha256 = "0mgxldxb07ixp8jli7j5jgv2b5vfzhvdv9nszqap4hp4iz7hm50f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert"; @@ -45098,16 +45274,19 @@ license = lib.licenses.free; }; }) {}; - multi-term = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "multi-term"; version = "20160619.233"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/multi-term.el"; - sha256 = "0i7gixcyqhd8ajbslfmb58rvdihzfprydwiqr730q9q0yfja36j8"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "multi-term"; + rev = "f954e4e18b0a035151d34852387e724d87a3316f"; + sha256 = "00cz3q654vpmijbqxp8c6nkxqj9zx1hjr3552l0adk3fbg6qpmcq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/multi-term"; - sha256 = "1va4ihngwv5qvwps3m9jj0150gbrmq3zllnyq1hbx5ap8hjrhvdx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/multi-term"; + sha256 = "16idk4nd7qpyrvyspbrdl8gdfaclng6ny0xigk6fqdv352djalal"; name = "multi-term"; }; packageRequires = []; @@ -45621,8 +45800,8 @@ src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; - sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; + rev = "d14186e99fa800d293e8e3072ba26f383c6624c6"; + sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd314150b3f8ce529a2ae39a71e03bebedfdc6b9/recipes/nameframe"; @@ -45638,12 +45817,12 @@ nameframe-perspective = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, perspective }: melpaBuild { pname = "nameframe-perspective"; - version = "20160927.2103"; + version = "20170405.1819"; src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; - sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; + rev = "d14186e99fa800d293e8e3072ba26f383c6624c6"; + sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2543af5579d37a3eb52e6fea41da315f5590331e/recipes/nameframe-perspective"; @@ -45663,8 +45842,8 @@ src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; - sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; + rev = "d14186e99fa800d293e8e3072ba26f383c6624c6"; + sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc17af8ff1694120d12a0cdbfccec78834810acd/recipes/nameframe-projectile"; @@ -45970,16 +46149,16 @@ navi-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, outorg, outshine }: melpaBuild { pname = "navi-mode"; - version = "20160327.134"; + version = "20170402.1210"; src = fetchFromGitHub { - owner = "tj64"; + owner = "alphapapa"; repo = "navi"; - rev = "a6b824ab2591e89e47f7399987f4fb3fa5d9306b"; - sha256 = "0vmrh8y8q7zch48iz9lk4n0b3s1b8zp3wki3906s709b5ajfvk7h"; + rev = "ef9b5dd15ef96ed3192774e96cd74ee6cccf8b10"; + sha256 = "1v0h7chq746x5vwb3fzk4djwgnkl2vg3m7pmnhxsq1nj5kfvw2vx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a06141b0ee1e10bc3f16fcca35d971dc7e9d07e/recipes/navi-mode"; - sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/navi-mode"; + sha256 = "0pc52iq8lng2g0vpnrhdfxmibc1dx9ksmrjg0303as1yv41fnc69"; name = "navi-mode"; }; packageRequires = [ outorg outshine ]; @@ -46368,12 +46547,12 @@ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20170326.144"; + version = "20170409.1737"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "dc81622d899976cb7d4515b592972d17d590ca20"; - sha256 = "1mdficz9dgdlb6hvi7c5qkvw22j1wgaap3a6as1qka16mhlgv13j"; + rev = "58707562dd29c7a9f36e96a8e894caec90ce1e41"; + sha256 = "1r6vs77b2rsdarkvcsg6awfa4mna308m53002vxykmpj9apkjszr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -46389,12 +46568,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20170329.538"; + version = "20170408.1048"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "94c08d19c94924b5f549aff61be84efc46e41126"; - sha256 = "06plyf6hlkwk3c9kv8sagq5qhjmv82nv4rqbwlfjc0yxk2dr6gcf"; + rev = "b54285e69c1c27833dda2b50f61985240ae0d4c5"; + sha256 = "0xir10im940vlj84xi54r0lf1w18pb4dvvqldy1sprgx62iq66z7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -46456,8 +46635,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5"; - sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p"; + rev = "1fe1976e0d68b520f04f8ad4f619bb52c40cef78"; + sha256 = "02mlf4gmfwwc0fclfx2h4pqs9ahcm7jd4zvr39f0w99b1xrybgf7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -46582,8 +46761,8 @@ src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "0227c5eea5b9f3fb056a7ef6052ef6f076371bde"; - sha256 = "0hjb2paylmcc68998cqgfdnw79z43ha5bv1cg91ysbdjcx2lp1x7"; + rev = "18e1506135be031db010292d27ef156e32766017"; + sha256 = "1lqz9fda24i3zkff9nnj4gndrs2bfql80wvvfisn106a3j0ah1n8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -46725,12 +46904,12 @@ nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nord-theme"; - version = "20170325.2314"; + version = "20170406.700"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-emacs"; - rev = "8df429d20d69e5fd914881a71ae3a044d02b392a"; - sha256 = "15gjcrx514790djsyfmm8z8q36a3kyf4yhrms5qj423hfc94d3s7"; + rev = "f7a2f6e6e4757ae6094003b139be9a335eadfef7"; + sha256 = "11970wjzd8hf3j66fcpyvba7ij7gf9931i584014a72p2y0l7qkg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme"; @@ -46767,8 +46946,8 @@ version = "20170313.1712"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "e1c1d33f3726f5cadb2f92d23735dcd1102fbc88"; - sha256 = "0s2spmjl2v2zv80ri1l36njgipyxkdg7zvlb8ik5118i0fhbf3p2"; + rev = "ce8c88824ab91882ea50c761b930390953cf2c34"; + sha256 = "0c6f4qyvwwjp9d6x4v26fdp0kcrz6v42ix7ah0g14h0wa17yf9vi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -48128,8 +48307,8 @@ src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-log.el"; - rev = "e5a8ee7d63eb1e745b37ba4e3e71c5ea025e2342"; - sha256 = "1nvgh9wvgswcs3r958b579rsx540xrhlnafc6cmcd63z6yck19w0"; + rev = "21b81c2358e2a17a636c6494eb084241d06962b7"; + sha256 = "1241jfckijwimm6b9xfp2rjap5va5hkphcvj3qflkprq2y33y8s3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log"; @@ -48149,8 +48328,8 @@ src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-quotes.el"; - rev = "537f7191bede7156dae94622e92cec04c6cd4bdf"; - sha256 = "1x8af8jv4n83sl4rgj0d2rpmw9g78rknm1h523f3b1a5x4kdvsz6"; + rev = "3818c60190eea3c8dc119d6a07531f6b68e7b673"; + sha256 = "0ha4rxkyahcvpaydk3bi06y519sd9glqjs3a3s87i962h9a20caz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes"; @@ -48170,8 +48349,8 @@ src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-scratch.el"; - rev = "7e04d7f20ee383bf72dfdcfd642bf08e4b8ab973"; - sha256 = "1icdk19vwihc8mn04yxl2brql2gssn3gxd5bv7ljdd6mn5hkw500"; + rev = "b0f7c39c7e378694191351b234a78abae762fb85"; + sha256 = "123qxl56d0ikwpjv5i3zh3q7xzd2i34sjgcfb732cg4xfxrpd3bs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch"; @@ -48191,8 +48370,8 @@ src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-tags.el"; - rev = "3f88b087d492e8ef742416d6e4bf8be41e5a46c4"; - sha256 = "1lvnkdrav7h15p8d5ayhfsjynllwp4br1vqxmw0ppxnlyq7337n5"; + rev = "f949a062e8dab12e8fda39eec465d53a2f23e314"; + sha256 = "01nawy8nadi9yspnql4wq8ssn5xgaf34yknxdjyhkswjr3bql3f4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c77e57f41484c08cae9f47c4379d1752ccf43ce2/recipes/omni-tags"; @@ -48226,15 +48405,15 @@ license = lib.licenses.free; }; }) {}; - omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s }: + omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "20170216.754"; + version = "20170404.2224"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "bcc5d7ba940c1118ab61071783747162f0c927cf"; - sha256 = "05i3z6whvgq81qnrwgvfglhwi214145ksg8h81rc0g4ir54wzsik"; + rev = "93c188938305533ea34ceca51dd53c7841598ada"; + sha256 = "0ynjxf0r9i5yb98pnhrcm55shhv4gqfr0wigfkz83yqzpsjzq6fn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp"; @@ -48250,6 +48429,7 @@ json popup s + shut-up ]; meta = { homepage = "https://melpa.org/#/omnisharp"; @@ -48548,12 +48728,12 @@ org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "org-ac"; - version = "20140302.413"; + version = "20170401.607"; src = fetchFromGitHub { owner = "aki2o"; repo = "org-ac"; - rev = "9cbbda79e2fe964ded3f39cf7a2e74f1be3d6b9a"; - sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca"; + rev = "41e3ef8e4039619d0370c23c66730b3b2e9e32ed"; + sha256 = "1l3fn8vjdqq7rrn1b7l2i238bhjni13mg9v25dydin0sfb697abk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/adf598f8dae69ff286ae78d353a2a5d4363b4480/recipes/org-ac"; @@ -48695,12 +48875,12 @@ org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-board"; - version = "20170327.1337"; + version = "20170403.916"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "53469a2f0577924de1c7d887fecea409d17fd588"; - sha256 = "0fg7lkgcr7zwwjald7hbvwgl72m21lqxmz7p8sq31iw3jh42fqgf"; + rev = "1daf7bbd52edec82156f0289d42fc7b190f0bc3a"; + sha256 = "0sm4gr17yi2iki28yimzk5mffp9xfpafk6abi6c6frxab0x42vg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -48734,6 +48914,27 @@ license = lib.licenses.free; }; }) {}; + org-brain = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-brain"; + version = "20170404.2329"; + src = fetchFromGitHub { + owner = "Kungsgeten"; + repo = "org-brain"; + rev = "9424b8002238a1ffb67e78e25bc997826f37dc14"; + sha256 = "0vn2s8p21kfnabva7ikal87hl4asgdj6hm7597hfx45w60vakn9a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; + sha256 = "0c05c6lbr740nnjp9p34padrbrc3q1x2pgylkyhsxadm4mfsvj0c"; + name = "org-brain"; + }; + packageRequires = [ dash emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-brain"; + license = lib.licenses.free; + }; + }) {}; org-bullets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-bullets"; @@ -49073,12 +49274,12 @@ org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-plus-contrib, s }: melpaBuild { pname = "org-drill-table"; - version = "20140117.137"; + version = "20170408.1205"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "org-drill-table"; - rev = "d7b5b3743ac04f8cb1087c5c049c0520058fa89c"; - sha256 = "0m5c9x0vazciq6czpg5y9nr5yzjf6nl0qp5cfajv49cw2h0cwqyy"; + rev = "5662511e98697e086149a223a64f9f01fabf7330"; + sha256 = "1bd9wifw57v31bihqrq5305a5xmjq980crlnqak0l9pksjkbw2bx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3347da186765877826b224e1f5d1b585ebd3692c/recipes/org-drill-table"; @@ -49136,12 +49337,12 @@ org-edit-latex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-edit-latex"; - version = "20170327.1847"; + version = "20170408.2046"; src = fetchFromGitHub { owner = "et2010"; repo = "org-edit-latex"; - rev = "ecdae5aa9763adbb1c103578a49dcd7fbfea3de7"; - sha256 = "18mg5zy67hvm79y10z5gzjfdggdkfksb1zkpijqv347f84w1l31z"; + rev = "a3faf83fe13910596c370a0d4b9a69f9b65f6f99"; + sha256 = "13q2xd8h0i4ain1y68qnvipmilly9ivdsv2glvnz5ji8k9f5wajk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/180416a18ea8c424ec990be91bc11fc149e427d0/recipes/org-edit-latex"; @@ -49453,8 +49654,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "8892fbdb6092af9e5ab5d9ed46762da67b57ffa1"; - sha256 = "1n4djqrk9hqsxrra1x2cxgfx2djsavdmqd53bpik3wn6lr00w1gj"; + rev = "133634706541cc22385e79ca08793cc5593f9e21"; + sha256 = "05jbwxl7gp1syd5dx73azdka18n2hf5z0ac1lkrdjd8w5xxhrcca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -49473,8 +49674,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "8892fbdb6092af9e5ab5d9ed46762da67b57ffa1"; - sha256 = "1n4djqrk9hqsxrra1x2cxgfx2djsavdmqd53bpik3wn6lr00w1gj"; + rev = "133634706541cc22385e79ca08793cc5593f9e21"; + sha256 = "05jbwxl7gp1syd5dx73azdka18n2hf5z0ac1lkrdjd8w5xxhrcca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -49833,12 +50034,12 @@ org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-random-todo"; - version = "20170321.804"; + version = "20170404.318"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-random-todo"; - rev = "14a065e1d376838f16a6ba32ed8710304542a4e6"; - sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir"; + rev = "8b784ff0419fcaa2467991bc670e0e8e31be62c0"; + sha256 = "14lsc6a9ddfd69x06z3ia9mlvac2p8iwvxbfnbmn2m49lijs8724"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; @@ -49902,12 +50103,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20170325.703"; + version = "20170410.635"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "4117e8b9273ea8533a4ca9f1271cc81b789c57a4"; - sha256 = "0kgfask1ylphcxjb93ybdgxmzrmhn58wky1iq0npcsq1949ajx1w"; + rev = "eed76b5e0ae41668349a4d4d756a478e753817f8"; + sha256 = "1hbsj594plzwn6aym8zchigc4y98bnf9i3izij5rxv9jpiw4bcc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -50077,22 +50278,22 @@ license = lib.licenses.free; }; }) {}; - org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + org-table-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-table-sticky-header"; - version = "20170317.1913"; + version = "20170408.1814"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "org-table-sticky-header"; - rev = "4048357d4ac42885b207677eb6f118e167a0f20f"; - sha256 = "1x5b931khl89yfnknndqfwhpqqqy6i8fylr59dpsffsrfp7pbqs1"; + rev = "93dc69efc00ac9fd3cc2ece5100f51df33ec7d8b"; + sha256 = "0d9d9sxak6kvqbb91h65ahw272d7dfxpgjw6zbs472xb6di1r6pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header"; sha256 = "1rk41279rcsdma39zpr1ka5p47gh1d0969wahd0jbm5xlmx5gz2m"; name = "org-table-sticky-header"; }; - packageRequires = [ org ]; + packageRequires = [ emacs org ]; meta = { homepage = "https://melpa.org/#/org-table-sticky-header"; license = lib.licenses.free; @@ -50896,22 +51097,22 @@ license = lib.licenses.free; }; }) {}; - outorg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + outorg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outorg"; - version = "20160327.132"; + version = "20170402.1415"; src = fetchFromGitHub { - owner = "tj64"; + owner = "alphapapa"; repo = "outorg"; - rev = "456b1500b560ead633ce723986a48c33fb52ab76"; - sha256 = "0szvynvw16vr7br95pssqkil0xnfdh46x8lgan4z9v6impdav0nf"; + rev = "c279ad21517b3c0e07950b0c175d9a69f77cfaf3"; + sha256 = "1l6w6kfwk1519alksxx1d9cgn04ndwldqkmh98df0z1dgc801b2m"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d57762fe51a524731e228c80b4b2d25e827e5858/recipes/outorg"; - sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outorg"; + sha256 = "10jh64d1nalfig69nnsib46915jinv37lvmxa0aj91zymq2szdm9"; name = "outorg"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/outorg"; license = lib.licenses.free; @@ -50920,16 +51121,16 @@ outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }: melpaBuild { pname = "outshine"; - version = "20161024.2158"; + version = "20170402.1158"; src = fetchFromGitHub { - owner = "tj64"; + owner = "alphapapa"; repo = "outshine"; - rev = "d45a512d149996ca232c0218e2d6b5bc802285a9"; - sha256 = "0f4jb39pd23kszf9wpdmibn3wqgx76y68n1l7jb9y8l47vs519lh"; + rev = "87d7ed5e34d9ed515e526a9e8470e62da7300949"; + sha256 = "1mm22qs0j1cyr95daj1wv961g9y0pcalr21cnryyilyb3g5dgq29"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6dc02a576abb8e115f674a9d896f8bc932b7571b/recipes/outshine"; - sha256 = "1ajddzcrnvfgx3xa5wm0bcll9dax52syg1p521mv0ffkld63jyfl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine"; + sha256 = "1qqmvs17hq5s047nqplg4sa09xg5ck6zwqyg91xmbh71bx80v28v"; name = "outshine"; }; packageRequires = [ cl-lib outorg ]; @@ -50983,12 +51184,12 @@ owdriver = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, smartrep, yaxception }: melpaBuild { pname = "owdriver"; - version = "20141011.738"; + version = "20170401.612"; src = fetchFromGitHub { owner = "aki2o"; repo = "owdriver"; - rev = "0479389d9df9e70ff9ce69dff06252d3aa40fc86"; - sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk"; + rev = "d934f182bafe29aa16c173440eff3fef08b0ec10"; + sha256 = "0yy5sah7vcjxcik3sp2cxp9gvcryyzw799h8zf4wbvjxv74kd17c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3f9c1bb19345c6027a945e7f265632da1a391cb/recipes/owdriver"; @@ -51050,8 +51251,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "ac2479dd030ff47c760c30b68d7d6d133ed82903"; - sha256 = "1vgqi073i6wlgfgjnpyaqbygrb3m9pm5frv0r70k07q2kvmalhy9"; + rev = "c3ac9201777a0a7a5fa572b3504543138f7039eb"; + sha256 = "1l2v4sh0jhzwngcgx93w85wr5f1d67pbi4sc9ks2csfj9awcw63b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -51067,12 +51268,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "20170328.1131"; + version = "20170331.114"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "94ff7358ad311cc6ad3bd720fbbb51fbcce94aa3"; - sha256 = "0iz38qc7fpd8rl9wacwq76y49mi53vr9jy6bw7f0ja1gbzfa8sgg"; + rev = "4cff438a06dce6e6e6a83e3900e90588f9f05b74"; + sha256 = "0i3jbvw34aklfxq8q887l83yl5n13bdqhvjz4ih4yqnzwgcsd74r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -51193,12 +51394,12 @@ ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-latex-chinese"; - version = "20170313.2146"; + version = "20170401.439"; src = fetchFromGitHub { owner = "tumashu"; repo = "ox-latex-chinese"; - rev = "7bc56542dc488d24f22f2653232b1cf5dab17c5f"; - sha256 = "1hs0rrk8bcyskay945d7phjj5ln8j8gr01qybqnl6a6mfrcpv2b2"; + rev = "f79d25443987a169a1234f5fbb2bc115cccea33e"; + sha256 = "1sw7wvsyp5z7jdijkc3lyfx7b0cq3c60fjdvmqlpygl9020md99w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese"; @@ -51319,12 +51520,12 @@ ox-qmd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-qmd"; - version = "20160606.504"; + version = "20170402.957"; src = fetchFromGitHub { owner = "0x60df"; repo = "ox-qmd"; - rev = "b41ffcf47af1a635596df31d4b0a704f274b5654"; - sha256 = "1zv8kh7hlskj4g1c4k3cx0hzraal3inn75yzxs08ndvycdsn6cky"; + rev = "3a24c7a0b3ec80e494b977e14a3dfb94c9f1d8ec"; + sha256 = "030nay81c49ings96akzzy108a6agg91rvpmg0pf05qmjysfysmf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e71826e8a8c30b0eb535cce7a379740011b79534/recipes/ox-qmd"; @@ -51550,12 +51751,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20161014.2251"; + version = "20170409.2149"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "9a6824cda477d1bd77d0507b62dcc09ed436b32e"; - sha256 = "1yswi3yqpfm8sjlhcv4phd069vl9rc2ngi5ma6acpah532k4gi1f"; + rev = "5ed001d66463ecc8906f773452702e848e09f2d8"; + sha256 = "1rkbyqabikbgv3zzr0g7f9qqgr4jpf8qh6qvjlivk9wb594dr0qd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -51592,12 +51793,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170324.1727"; + version = "20170404.751"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "de08b846b3a031838b79445bb7a254c9de4a80f6"; - sha256 = "0mvs4afjp5ab89vdz3bd9pca55brn57lxvjqjjyc6cyqxpclh06j"; + rev = "a8358b3f8fd8dba1d3a883012e2f8e3614f42af2"; + sha256 = "1bcx152wkgwvh4w86rgh2hhy07klzjfs97sfr3vc7j00si7ps65i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -51987,15 +52188,15 @@ }) {}; paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paredit"; - version = "20160615.1325"; + version = "20170405.1149"; src = fetchgit { - url = "http://mumble.net/~campbell/git/paredit.git"; - rev = "7c27746a8eb259ae24b5dce9380801c4846258f0"; - sha256 = "02s8cvrpcdp8xr7m8bfgwiy7wl9bc4834jlm071ypzx5xfip3zxd"; + url = "https://mumble.net/~campbell/git/paredit.git"; + rev = "99829aa423c9e8dd1be8d64c4b68982cf4c1559b"; + sha256 = "13h5gd9s1ajgqzq6ylzcmz4irb071wyhh9qj195ld177irkxi9wd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d83b5d24db3527e48e3de40c320255bc2dbfccb/recipes/paredit"; - sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit"; + sha256 = "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653"; name = "paredit"; }; packageRequires = []; @@ -53012,12 +53213,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20170311.716"; + version = "20170401.218"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "6b3987b6c085da52a4a1e1a8433bd4a6f3f411d4"; - sha256 = "0w2wmy1mhpjfmm0js5h0nqwwmj2xzpasc1m40slwh0lcm9176w9c"; + rev = "651fe02ff10eece65c01ac8d286174cc8ffa87fa"; + sha256 = "1nij6mrz2fm411z97z13dyy38i482dkpj50fjsgnlc9pmggykqnx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -53411,12 +53612,12 @@ php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }: melpaBuild { pname = "php-auto-yasnippets"; - version = "20170324.914"; + version = "20170330.1814"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-auto-yasnippets"; - rev = "d6e04b2db9ebe220e25e4d3a1550bf6fdafdf032"; - sha256 = "160y5kp5m7kfkj832i7rawgj4ylnf100xqn7v0fppqapri2f177l"; + rev = "03e1f0899c081813901ac15c2f7a675a37cca9f5"; + sha256 = "0d7y6njsd1s2r5df2k8wvvwgxpwwyaqkhdd2b3p1php8rrbj3mg8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d47ca8cd5900a80a2ede1b354547addf9b2bbbac/recipes/php-auto-yasnippets"; @@ -53495,12 +53696,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20170307.1750"; + version = "20170405.844"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "c761c97e53d50a015bf8d5d554f4917267b0f6dc"; - sha256 = "0hy0bzscv3hakldmjynsm9rz91v5lyb7rp20ljzfvbzzbkbxzdai"; + rev = "11674976ee981bb05fb79c5b6de6973b53d51e98"; + sha256 = "0d1vz95kplyrymv3i9c5k2p2pg2smrv0bkp3kyrjx73nsq2n981k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -54247,13 +54448,13 @@ pname = "po-mode"; version = "20160827.857"; src = fetchgit { - url = "git://git.savannah.gnu.org/gettext.git"; + url = "https://git.savannah.gnu.org/git/gettext.git"; rev = "41e5199f0e4a3e9d518d6f95a3efdfae5e2c7913"; sha256 = "06ww6081aicw2d4rprig8ab5g1rx7dqx7cl9xh444k746c8a554d"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; - sha256 = "1hb9vrr2x6mh0yzckmx9fk6535d6r189974n4bizpr1xdikn7dgp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; + sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w"; name = "po-mode"; }; packageRequires = []; @@ -54532,22 +54733,22 @@ license = lib.licenses.free; }; }) {}; - pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }: + pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "pophint"; - version = "20150930.1034"; + version = "20170403.701"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-pophint"; - rev = "fc02a155e28ae27466bedabc756e75c936b01266"; - sha256 = "0n1w1adglbavqgrv16rzhym72c3q083mh0c8yl5lj7adn4nr4gr3"; + rev = "5d1db7c0b92862ba2cc5f3566b25840b8ce3ba59"; + sha256 = "09av2krrmm8g3f3f31kl4j4agmmf8hx9irzrqyvgshljflk0nq1q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0055c2887acbbd8a2803bf3f81ac2cc444cc805a/recipes/pophint"; sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72"; name = "pophint"; }; - packageRequires = [ log4e popup yaxception ]; + packageRequires = [ log4e yaxception ]; meta = { homepage = "https://melpa.org/#/pophint"; license = lib.licenses.free; @@ -54556,12 +54757,12 @@ poporg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "poporg"; - version = "20170303.526"; + version = "20170403.51"; src = fetchFromGitHub { owner = "QBobWatson"; repo = "poporg"; - rev = "ba2f7f4c8662164c5e6f89aa2923484d6f1df8ed"; - sha256 = "04z2p4f5mdnc8jms6z360f3qv6ngpbyp7b88ybvw67kjkg9jn821"; + rev = "2c58d68c81ecca4140bf179f19ed153ec804b65a"; + sha256 = "1ymqhy0sqd54z154s3cm6q1m4xnr9wkx9dl5f93845k11ay3kvln"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63502ec265a66d3f72ef93a2f6e7c2e517ff98a3/recipes/poporg"; @@ -54619,12 +54820,12 @@ popup-edit-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "popup-edit-menu"; - version = "20170329.452"; + version = "20170404.725"; src = fetchFromGitHub { owner = "debugfan"; repo = "popup-edit-menu"; - rev = "bd823ae3068e053804258697848392492538914c"; - sha256 = "0j2ynj8dshpagbjg38snfk626pfsb25y23w2nkb4h7v4kfv6587g"; + rev = "925600a6e29183841199e866cf55e566a6a1b002"; + sha256 = "1dd0ss7cjdjs3c7vkq8p874408iysih80brc8vlfh1f43cnc5v92"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e824ae5bd9214f8de210059f8145f13a4e62e8a1/recipes/popup-edit-menu"; @@ -54928,12 +55129,12 @@ prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prassee-theme"; - version = "20170329.758"; + version = "20170406.1953"; src = fetchFromGitHub { owner = "prassee"; repo = "prassee-emacs-theme"; - rev = "5be0ad067182881012bea5ae352636eaff06b01b"; - sha256 = "1l73dvi5pdbw8x1qbk9zhi1ddz000k54lm0jg2rzlcsxwnz2f4sf"; + rev = "7ce96272a514caa8598aa3c7227ade8a21e20daa"; + sha256 = "033qmd1rfjpiz27zz34b96dyc2lil08qdf9nn13sa915gc6704ps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme"; @@ -55405,12 +55606,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20170309.30"; + version = "20170407.319"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "0c307c8cbf6162fa992bcdbdd1940bf6eff28253"; - sha256 = "18m35h9r1gs96hkgqmjhkwnlg5dj9knh227n2k9xckg161mld2fg"; + rev = "323fb845f2da0fc95ac27efd11f4d696f5fe647d"; + sha256 = "1c0iv9k9sapv4f49qsarivg46xkpw1ckdyh7qizv1ailb3q9faax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -55808,8 +56009,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "4a0dd03e52e09332c8fd0f8f26a8e0ae9f911182"; - sha256 = "0x741ivcyx1yn5qp63swl3n5966zwjngmalwr85sq3qb5vacifj0"; + rev = "efec7571047c680e11354bd30bf8bd3dfda15ff0"; + sha256 = "1rika22vx05f6jd5a89n31gv62k5r2y31qi9hb5y2ycdghfyd6nz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -56568,12 +56769,12 @@ pylint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pylint"; - version = "20160728.1033"; + version = "20170402.555"; src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "da2e9724a195ea48451222457e56fbb9311186da"; - sha256 = "15xwdmsffj4xysl4mg17ip7pid9i035xhsh3r1qg2bqi2ikwqzgr"; + rev = "79f45263a8904533160d3fa0d4e69b11d3d7d315"; + sha256 = "0fcf8yw40nslc5zhl525np6w0y6sghjhsf0bf5vg2p7l2jwf205r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -56929,8 +57130,8 @@ src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "c1fe1dce4740ca1fcc3ac4c72db6999579d867a1"; - sha256 = "1m0mx8marrhc3wb925x66rpr15ynax2vx0crljqqsxk04bralj27"; + rev = "a39ab429d6544dff17e933f8d98530da4f8c636f"; + sha256 = "002r4vc2a5yjm448xsk2dsfzm9p1whiwrcb0pccyy2597ba87w55"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -56985,6 +57186,27 @@ license = lib.licenses.free; }; }) {}; + quick-peek = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "quick-peek"; + version = "20170327.27"; + src = fetchFromGitHub { + owner = "cpitclaudel"; + repo = "quick-peek"; + rev = "6a006fbf1a41b04c0e7522d50c942ec89c3637fc"; + sha256 = "06rww4a6j7wc32hvay83xcjl16aykm8hwlsh764fx9hfxxfa1fka"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/68f59a3048ec6196b138b6584a22ce70baa38284/recipes/quick-peek"; + sha256 = "0ivg6v9c535bw2bv636wmkd4sy037j55054bfm31wvvxk99bndwq"; + name = "quick-peek"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/quick-peek"; + license = lib.licenses.free; + }; + }) {}; quick-preview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quick-preview"; @@ -57097,8 +57319,8 @@ src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "40f99f69b46edbf0855c92d908c11e29bf2e817c"; - sha256 = "18gf9fzn30190mgdgijzqxyh11q1kmx94fixs6c7gv927i8j7whm"; + rev = "6e0d1b3ebd54497c0cc995a92f09328ff101cd33"; + sha256 = "0sz78cnx6gifsgd1r1l1p8bkjc5jwfh57yvwabc9zzgivfimhcb5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -57114,12 +57336,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170315.1216"; + version = "20170407.858"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "1c2c8964c5d16bf5c4ead2be8d19abc0244f59e6"; - sha256 = "0cxi81rgqv4ri96gbzr2p2mnwyp3jn3klsvds9jkmgw6dd5q4b8a"; + rev = "3332895078ebc5e2f547538913eccb1db63ec0ca"; + sha256 = "09a251m0j8ican0myp96755ykg6z2bp0kgggwbdbg4af6bwz3a13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -57897,12 +58119,12 @@ rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rebecca-theme"; - version = "20170220.1342"; + version = "20170406.2136"; src = fetchFromGitHub { owner = "vic"; repo = "rebecca-theme"; - rev = "c42e33227a18258145156e69627b713b303ee702"; - sha256 = "0nkf3jf8x95ybw29gwkivfc3pnaiga7awz2mpyjm5bnz4i335mkm"; + rev = "ddbc2e0ceaa4849ddd284a9265211b61a8777106"; + sha256 = "0d4yk6gkswfx7hkwgq5s9qc2bi73041fcsigpzvl2q0smb8202cr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; @@ -58126,8 +58348,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b"; - sha256 = "08w4ll3z2pygry85x1g1kz2ibbiq93zq3my9zll226xi9hx1nll0"; + rev = "b1167e3a65694f3c40966f73a3e15ae78f48585d"; + sha256 = "0f7yzyyqa1mpw15wr56p92kmcx2h2m46x6932qk5fhn7zihik97p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -58747,12 +58969,12 @@ restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restart-emacs"; - version = "20170313.939"; + version = "20170403.1125"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "restart-emacs"; - rev = "38603b019b703f6e78f640478ee6412ba743f7b1"; - sha256 = "0zvknsakxfzkbfi7sg61q1m3484h1a0h6clzxd8hg4xifw6crf9y"; + rev = "67bbbf0635b252a0c76854036c5d7ad864938a6c"; + sha256 = "0dyfgwnrxc8yyw743ijpgn2hnmxsfvblw80hj8x66ajb0k3j8lnw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs"; @@ -58993,12 +59215,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "20170318.657"; + version = "20170322.1049"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "6c85ce6974b67644dce5a607285f04197fe4874e"; - sha256 = "09r5rnnwxyqkf9kzpragwqxhhlgpr49kbvxc6ci18bkcs44vvcnw"; + rev = "32fc22b192cbad03fca3835f29c36ab4a90e50a0"; + sha256 = "168p4h7h9ik1f56cw0zr8brbn53d5jglv9r7i9zqh80zzhljw4xv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -59249,8 +59471,8 @@ src = fetchFromGitHub { owner = "marcowahl"; repo = "rope-read-mode"; - rev = "a43d56d79a0595374a8414979b758fbea3cab0a8"; - sha256 = "1z5f6z3mii24h82lhpdlyaazjlf69ffp6la1ajl0hn91hx297dw9"; + rev = "66c02e3efab84e12c2857cb2b56d524e98b7bc87"; + sha256 = "1hmp7k17q5d5i6286x99jmfq954d9ys5347xk3aph9m5pmybvfrf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; @@ -59329,12 +59551,12 @@ rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "rpn-calc"; - version = "20170328.349"; + version = "20170402.1833"; src = fetchFromGitHub { owner = "zk-phi"; repo = "rpn-calc"; - rev = "9f38d2a5f9a7f24e01804dafcf8a4951daa2bc62"; - sha256 = "08y8yczzpwg7bw01bgpc54kx0ijhg0y8pwl8kcgdxgmav38y46fb"; + rev = "4d8aa137b31392a76a0fd4eaf676291029c1aad9"; + sha256 = "0m373xzxx6ywrxll0qqsnyx55bfp0phbw6mcczz53yw9kpf3mf22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/rpn-calc"; @@ -59392,16 +59614,16 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20170329.1245"; + version = "20170408.1642"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8d868af718f29e7428658fe56979e05659f3a9c3"; - sha256 = "1nj1r3hdgzfhmhy7v9s7ivww7y1hd70bw4vp904m20qwq81zpm69"; + rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8"; + sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; - sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; + sha256 = "0s5m4zjvnc1k4gkkizbs4ysvzzbfh45717pksg9bnyzwx5lcw5yd"; name = "rtags"; }; packageRequires = []; @@ -59457,13 +59679,13 @@ pname = "ruby-additional"; version = "20161115.2259"; src = fetchsvn { - url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "58216"; + url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; + rev = "58302"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/17cc8e84dd68f280c23f77510f58f21e7e7cbaae/recipes/ruby-additional"; - sha256 = "0h0cxik8lp8g81bvp06mddikkk5bjdlch2wffcvsvi01is408w4w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-additional"; + sha256 = "0w88hijkr7rjm8ig65n20bqkb1ymqmb3wdwc6bskp26d49w85xjg"; name = "ruby-additional"; }; packageRequires = [ emacs ruby-mode ]; @@ -59537,13 +59759,13 @@ pname = "ruby-electric"; version = "20150424.752"; src = fetchsvn { - url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "58216"; + url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; + rev = "58302"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d67431327845171f0e50d28e9276cbabecf6cb0/recipes/ruby-electric"; - sha256 = "04j04dsknzb7xc8v6alawgcbymdfmh27xnpr98yc8b05nzafw056"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-electric"; + sha256 = "0abi1hqjscz2wj4n5habjb6rksxkhwv0cvpw68irkj4fas92qhk8"; name = "ruby-electric"; }; packageRequires = []; @@ -59786,12 +60008,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20170117.824"; + version = "20170405.707"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "0de149a9ad04f652cd7a59a9ef67be8a7d86ba76"; - sha256 = "0cj12mz47k20d2lrnwr81ijbs42wjpdzmw646yghvazdrq23b12h"; + rev = "19e6f604a0c9d838a1426604d70ce3af0960621d"; + sha256 = "0phggsdcnjcc8zxw66ida1a6hq8ccqh66islhm6ix1yaycrwvhms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -60189,8 +60411,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "714e14e4a6b8eb62677784de6213e1cde79a6554"; - sha256 = "0yq86lm8754899lvx9g9w4y34gsw91xw51m9rsk59x7jfd2lfq6x"; + rev = "e34e519c1276e7f1b299fea40fea2f114c7ef455"; + sha256 = "09rfxip87iad670xxw0www8ig12qavpjs1ys7x5nzga7aw3apij2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -60269,12 +60491,12 @@ scheme-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scheme-complete"; - version = "20160604.533"; + version = "20170410.617"; src = fetchFromGitHub { owner = "ashinn"; repo = "scheme-complete"; - rev = "bc7f0bd687c9a6625393053fb6490b4f37c82505"; - sha256 = "0xa0md847v3qizvf22jrb1rwynrdp7dbxv32rf4vl8yjsh44wspn"; + rev = "6bf844202cb9e8490ce37a414374be3f04eefca4"; + sha256 = "16mbcwx1x6bg86qfgl6bhq5qjkz9xgd5f2jl993vvfk824qg4jgl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/scheme-complete"; @@ -60972,17 +61194,19 @@ license = lib.licenses.free; }; }) {}; - sentence-highlight = callPackage ({ fetchurl, lib, melpaBuild }: + sentence-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sentence-highlight"; - version = "20121026.750"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sentence-highlight.el"; - sha256 = "01qj57zpqpr4rxk9bsx828c7baac1xaa58cz22fncirdx00svn2k"; + version = "20170405.2352"; + src = fetchFromGitHub { + owner = "sbelak"; + repo = "sentence-highlight"; + rev = "f47839853455d0f4ffe50b3b0f9d3e7a15ace1fa"; + sha256 = "11s5zvwklf5vzwiiwmcw5c93qjvf5nxclbbk8hlj8fg88c5ssbzd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1f41eba284e297177e89b9b7a8da4779eb6fdcba/recipes/sentence-highlight"; - sha256 = "16kh6567hb9lczh8zpqwbzz5bikg2fsabifhhky8qwxp4dy07v9m"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/531ec8b371465d916f332818c04359dc66009a42/recipes/sentence-highlight"; + sha256 = "0pr8f3b6hcflk400fq6j7fi8iv7r2drzdg19rbx3w7n3xwipwjf0"; name = "sentence-highlight"; }; packageRequires = []; @@ -61325,16 +61549,19 @@ license = lib.licenses.free; }; }) {}; - shell-command = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + shell-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "shell-command"; - version = "20090621.632"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/shell-command.el"; - sha256 = "0jr5sbmg4zrx2dfdrajh2didm6dxx9ri5ib9qnwhc1jlppinyi7l"; + version = "20090830.340"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "shell-command"; + rev = "7e22125f746ce9ffbe9b0282d62f4b4bbbe672bd"; + sha256 = "1my2i26a03z8xyyacsnl5wdylnbhhvazn23bpy639d3l4x4l7jzw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/shell-command"; - sha256 = "1jxn721i4s1k5x1qldiynnl5khsl22x9k3whm698nzv8m786spxl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/shell-command"; + sha256 = "01nviashfr64wm78zi3vrqrqdqgsamp76d9kasxv0b7fqmfx7yjk"; name = "shell-command"; }; packageRequires = []; @@ -61385,16 +61612,19 @@ license = lib.licenses.free; }; }) {}; - shell-history = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + shell-history = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "shell-history"; - version = "20100504.150"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/shell-history.el"; - sha256 = "0biqjm0fpd7c7jilgkcwp6c32car05r5akimbcdii3clllavma7r"; + version = "20100505.139"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "shell-history"; + rev = "ee371a81f2d2bf5a308344078329ca1e9b5ed38c"; + sha256 = "0jyz31j5a07shcf2ym5gnn16xk5r3s84ls8kxk5myvxi3wkpgdd4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/039854cf1b41b18423876170c5f48300bf3fe29a/recipes/shell-history"; - sha256 = "1blad7ggv27qzpai2ib1pmr23ljj8asq880g3d7w8fhqv0p1pjs7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/shell-history"; + sha256 = "1cmk8rymnj7dscxjq0p23jgwc16yvzw1804ya5wsg95v239gz1hy"; name = "shell-history"; }; packageRequires = []; @@ -61713,16 +61943,19 @@ license = lib.licenses.free; }; }) {}; - showtip = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "showtip"; - version = "20080329.1959"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/showtip.el"; - sha256 = "01ibg36lvmdk7ac1k0f0r6wyds4rq0wb7gzw26nkiwykn14gxaql"; + version = "20090830.340"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "showtip"; + rev = "930da302809a4257e8d69425455b29e1cc91949b"; + sha256 = "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/19636728b501dadddaad9743635fd51ceb12cc07/recipes/showtip"; - sha256 = "1fdhdmkvyz1dcy3x0im1iab6yhhh8gqvxmm6ccwr6rl1r1m5zwc8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/showtip"; + sha256 = "1d5ckka2z0ffwyk9g3h91n3waijj2v7n8kvdks35gcr2yl3yk780"; name = "showtip"; }; packageRequires = []; @@ -62299,12 +62532,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170328.2044"; + version = "20170331.2242"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "fc85625ed4421e4fe79c87c3844d6561543c0ab8"; - sha256 = "08xfqacvq1a0g6pvj6pjg3mi2yl1c756kn92csacdq3g7z4sfkm2"; + rev = "86756c37968cbbc171e52e416ef656af2a2258a8"; + sha256 = "1vhcfmyk9swf5h7gka9fbwq2s3x4a540km6wjxqynmpw8c45q154"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -63030,12 +63263,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170312.450"; + version = "20170401.315"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "2acdee84701021049bea0925988df61e340c2311"; - sha256 = "1k0aybgaa595gdr8d1v3wid349hzmnxr3i0isdh3sdzf9b9dh313"; + rev = "a5f39550d419ca10eb0075f799c0864ade7c88d7"; + sha256 = "07j9cr06v78xnsfnd9ixpddiap7il3xrd0fpsyxyl9xsb2gp3jgh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -63386,12 +63619,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20170326.1920"; + version = "20170406.1736"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "349980879a66493ed421e9c83f4857662267b8df"; - sha256 = "0alwp2i554alac76zlskviabi12nivmpy4yhm9nwz7lsnv7qsikj"; + rev = "15803162483e635f3e22b2efea33ccad725e0535"; + sha256 = "1nc8xp22i57kf89x0qh69dspl9hl710m01gdr35ph5gl8ycmyir5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -64538,16 +64771,19 @@ license = lib.licenses.free; }; }) {}; - sr-speedbar = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "sr-speedbar"; version = "20161025.131"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sr-speedbar.el"; - sha256 = "15kvl270a5xx1w5fjlrawslnpwyks2x17356xcr0idhv5xw2wn30"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "sr-speedbar"; + rev = "77a83fb50f763a465c021eca7343243f465b4a47"; + sha256 = "0sd12555hk7z721y00kv3crdybvcn1i08wmd148z5imayzibj153"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e1f3e11958db5ecf764d6e659608220af2166fb3/recipes/sr-speedbar"; - sha256 = "1zq3ysz1vpc98sz2kpq307v1fp1l4ivwgrfh2kdqkkdjm4fkya23"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/sr-speedbar"; + sha256 = "1v90jbqdw39yrfcsnyqas8c5g09rcf1db65q2m2rw7rik8cgb052"; name = "sr-speedbar"; }; packageRequires = []; @@ -64643,12 +64879,12 @@ ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-config-mode"; - version = "20170110.1756"; + version = "20170406.2158"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; - rev = "badbd859517e0a7c0cb8002cf79f4c474478b16d"; - sha256 = "13dqzyc99qvspy8fxdjai0x0s0ggyhdlf6apyrq2r1z0j6gaf88g"; + rev = "99d14509289943b29c702232076704c11f19a82b"; + sha256 = "1khgabsmg8vwpvpligvxwgqq275sh33w4704dpwyq1h25jq317bj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce38cac422ad82f8b77a1757490daa1f5e284b0/recipes/ssh-config-mode"; @@ -65162,13 +65398,13 @@ pname = "stumpwm-mode"; version = "20140130.1816"; src = fetchgit { - url = "git://git.savannah.nongnu.org/stumpwm.git"; + url = "https://git.savannah.nongnu.org/git/stumpwm.git"; rev = "61a7cf27e49e0779a53c018b2342f5f1c5cc70b4"; sha256 = "03is0690p7aw77c30j4r2b5gi5rv5f70wvpixy5qhcchlaxhaw82"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3a1e6358c529e3b9e51bcfa6e2e294acbf662882/recipes/stumpwm-mode"; - sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/stumpwm-mode"; + sha256 = "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf"; name = "stumpwm-mode"; }; packageRequires = []; @@ -65284,12 +65520,12 @@ subemacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "subemacs"; - version = "20160105.359"; + version = "20170401.234"; src = fetchFromGitHub { owner = "kbauer"; repo = "subemacs"; - rev = "d693919991de6b93f0797daae2a12285e54ae27e"; - sha256 = "10pirwc7g9vii5cyk4vg6m5g5hlap0yg9w4qy257744c67jmaxvg"; + rev = "18d53939fec8968c08dfc5aff7240ca07efb1aac"; + sha256 = "1k2lg7cxr98rq77sk0ypzlr3cyl20ld20jz8y21fdaa6ci8kdvdb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18714a6b5ca4dcc51fa509fee1dc9afb0595c707/recipes/subemacs"; @@ -65842,12 +66078,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20170328.737"; + version = "20170410.24"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073"; - sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl"; + rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26"; + sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -65986,6 +66222,27 @@ license = lib.licenses.free; }; }) {}; + symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "symbol-overlay"; + version = "20170408.449"; + src = fetchFromGitHub { + owner = "wolray"; + repo = "symbol-overlay"; + rev = "06c5a46ef7f105ac0281a881b5b4f914e2de314b"; + sha256 = "1nr564zmi9wsxnpdk3i7hsrpy3dnj9gk153ki2kz3v0fdbkqwy62"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; + sha256 = "1al60x2mnjsv99jd10v5sd56zz185wsddiq7128phf1l35bkibis"; + name = "symbol-overlay"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/symbol-overlay"; + license = lib.licenses.free; + }; + }) {}; symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symon"; @@ -67010,6 +67267,27 @@ license = lib.licenses.free; }; }) {}; + terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "terminal-here"; + version = "20170403.547"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "terminal-here"; + rev = "5f98902c65f0d8130e1ae11b9d1c95bff276962e"; + sha256 = "0mmjch5jl19dv5y6057vk1wpnialz0ax8wghjmy1xx4yjd1n8rgx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; + sha256 = "1w64r3y88lspxxcqcqfwhakk8p9vl7q3z610dykfbqwqx61a6adj"; + name = "terminal-here"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/terminal-here"; + license = lib.licenses.free; + }; + }) {}; tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "tern"; @@ -67346,12 +67624,12 @@ theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-looper"; - version = "20160924.2205"; + version = "20170330.1829"; src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "66788db264b3d94f25a077f9a6cecfa1c8ad2c96"; - sha256 = "1wckby9q7c6xdq0kv0x0fdjr9gplj4an5s3kx78dqrxcjj12a35d"; + rev = "4c07f6f6e1c733d274e26ed8eb03cc5bb6e9149a"; + sha256 = "0nq298fclba9k1bdg9yhhnfsxw1dnvs96m6wdl5wnv21087zj77j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/861c3b96189233956b15f222702ff034ed2d8cd1/recipes/theme-looper"; @@ -67406,10 +67684,10 @@ thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }: melpaBuild { pname = "thing-cmds"; - version = "20170307.1538"; + version = "20170331.1338"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thing-cmds.el"; - sha256 = "16bfjak7953mhmn7abd3pq8cqh8njir5x5x7acqs8zmd9n9qpni6"; + sha256 = "0zi7hbdb5w0lry09rdsxmb0kqnfp6s72kn0z5npfhvwalkcpywbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thing-cmds"; @@ -67531,8 +67809,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "7470995ce4bb480a86beaf1d8babce95c6f4b8c7"; - sha256 = "0srq5qcmnfplr30yxh6l4szl4vjfj41dwm615zq0mfjakxd3pbm1"; + rev = "2d65c2365f19f637bc732222e71d78727bf0b709"; + sha256 = "0g347bhy6hppkl4769ahfyw2cbl0dqhv889c0xf8wbzfbsn9kaz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -67588,12 +67866,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170325.602"; + version = "20170406.2103"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "a38e71fd07fceaa069d701cb6a3637dfd53c9f23"; - sha256 = "01fg82i1a5ck6f5qj2nrz2hzl46hcsaxk13chbb71r99r80xm9lm"; + rev = "eabcad4dbebb705d4e366f90344ea543068d2dc4"; + sha256 = "1ykxsr8q9gwx2d8b0v2xf4glchwg3ikcx60a5r4phw1nlwff8gg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -67888,12 +68166,12 @@ tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tldr"; - version = "20160807.2022"; + version = "20170401.2140"; src = fetchFromGitHub { owner = "kuanyui"; repo = "tldr.el"; - rev = "b2b154b0cbe495f25de1bd9bccc76666ef209342"; - sha256 = "1bdd31aravm01ahy3ksgfdm65rknzj2v5a69vnag36ap7lj4ax49"; + rev = "05da2ac1d82f9918b493e0895e98cd59666d3e28"; + sha256 = "14ni301cn6s793157k1fkz65ab1xgh94n3g12hcj1xnmbdvnlymy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr"; @@ -67930,12 +68208,12 @@ toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toc-org"; - version = "20170324.103"; + version = "20170404.15"; src = fetchFromGitHub { owner = "snosov1"; repo = "toc-org"; - rev = "f0b94e07bb4b32db039088a58578bced29256431"; - sha256 = "1dbi8kzr5nnb3sclafniq2sipwyran8h1vsqdy1wqd1a5306538h"; + rev = "d30b57f16d158fa859b0626f5350520f3ee86f44"; + sha256 = "0q0wshcxn60c87lml2fxrhikrj7zay48ijrwj334yzwp26dvm422"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org"; @@ -68282,8 +68560,8 @@ src = fetchFromGitHub { owner = "chmouel"; repo = "tox.el"; - rev = "27a074b21238855ce3c33d22e42d69e2c2921205"; - sha256 = "1m3f0i6vrkrncd7xsgz65m6595iv6yr4gbbzlis8p01kd98wbxfk"; + rev = "7655eb254038d5e34433e8a9d66b3ffc9c72e40c"; + sha256 = "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08a7433e16f2a9a2c04168600a9c99bc21c68ddf/recipes/tox"; @@ -68316,6 +68594,27 @@ license = lib.licenses.free; }; }) {}; + tql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "tql-mode"; + version = "20170402.1846"; + src = fetchFromGitHub { + owner = "tiros-dev"; + repo = "tql-mode"; + rev = "2c4827652b4b9b640f3c55e27e1b1856ec9e2018"; + sha256 = "08vsg5y2bg9gxzfcm630vv95d9kwzxqhzz5dzbbi3g71nlgcclk2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6a7c3dec5d970a4e819c0166a4b9846d74484b08/recipes/tql-mode"; + sha256 = "0nrycix119vail6vk1kgqsli4l4cw8x49grc368n53w0xwngh0ns"; + name = "tql-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/tql-mode"; + license = lib.licenses.free; + }; + }) {}; traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }: melpaBuild { pname = "traad"; @@ -68469,16 +68768,19 @@ license = lib.licenses.free; }; }) {}; - transpose-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + transpose-frame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "transpose-frame"; version = "20151126.626"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/transpose-frame.el"; - sha256 = "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "transpose-frame"; + rev = "011f420c3496b69fc22d789f64cb8091834feba7"; + sha256 = "1nhbinwv1ld13c0b0lxlvfm9s6bvxcz2vgfccqg45ncg9rx70rsw"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7682372c9075e19fcef2a2462c30010ee324cd14/recipes/transpose-frame"; - sha256 = "0bqip7vckic3kfq3d31ifs1zics1djxwj2jadafj6f1agv02sdz5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/transpose-frame"; + sha256 = "1ksdc4d9k05452hcq4xx0j5nfl9n01z8abbca6j7j66bdf3m4l1b"; name = "transpose-frame"; }; packageRequires = []; @@ -68529,16 +68831,19 @@ license = lib.licenses.free; }; }) {}; - tree-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + tree-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "tree-mode"; version = "20151104.531"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/tree-mode.el"; - sha256 = "0hffnzvzbvmzf23z9z7n7y53l5i7kza9hgfl39qqcnw4njg48llx"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "tree-mode"; + rev = "b06078826d5875d74b0e7b7ac47b0d0917610534"; + sha256 = "13bbdhdmqg4x9yghanhr8fsbsxbnypzxdxgicz31sjjm675kpnix"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/dc67872b6463bebbf06ef9a44521ab2a029fa359/recipes/tree-mode"; - sha256 = "0xwyhlc5lagj46nd70l81rvb43hs08pic96grk62zknig8354c24"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/tree-mode"; + sha256 = "1b15xgh96j4qas1kh4ghczcn7hb1ri86wnjgn9wz2d6bw3c6077b"; name = "tree-mode"; }; packageRequires = []; @@ -69701,22 +70006,22 @@ license = lib.licenses.free; }; }) {}; - uptimes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uptimes"; - version = "20170326.515"; + version = "20170402.143"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "5e321692bf5ccdc286f4831fa8fe55467c1c56aa"; - sha256 = "04n4bryfid6scma43whw156wcza77ij7szgc5f73d98j9fji6lay"; + rev = "2be31db3508513478d3f27f4eff2ff1094786b4e"; + sha256 = "177d1h84w9rr6x3hsq9z7sbr8s8pippgy0l99gpdhycbff6a7cwg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h"; name = "uptimes"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/uptimes"; license = lib.licenses.free; @@ -69785,12 +70090,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20170327.1449"; + version = "20170405.1028"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "a354568ec2af8444b741f595a3a7183e3f67ad58"; - sha256 = "19aaqcaycq1msfgvvnlqkzqqijbzqzc015k69pbg41l5bvrwnqcq"; + rev = "103b6518e66d9acb990832f02dca093a7425ca84"; + sha256 = "0rsc9shvgla560y3001s9v29wiwz1g9il2z44939phwlkydhak7r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -69831,8 +70136,8 @@ src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "d6f6a9465a26fc78ff72a3c234f118256ab24309"; - sha256 = "1nswnzmr43b4x1kcai0ygy5v3nyc3713209x3pwq30hs7jk3swb0"; + rev = "f64e9d2e78ed626216ad29098b23ef200ecdc770"; + sha256 = "0g01p5qrwiah4z4hahv7a4a4nzrznqcwjnljns1zyk49n63rfrmh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -70076,22 +70381,22 @@ license = lib.licenses.free; }; }) {}; - vc-darcs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + vc-darcs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-darcs"; - version = "20151225.1228"; + version = "20170409.623"; src = fetchFromGitHub { owner = "velkyel"; repo = "vc-darcs"; - rev = "f9b4cd89ed7eff91009ce27d9e1d2fb555a5efff"; - sha256 = "1zpvinbc3nrnjm931fgzrlkl31xcsg9ikh041s1fkfjkhfq0h82h"; + rev = "9c5cbf6fd9b624a31e918dd1a516b24d8b7ffe9d"; + sha256 = "0g26hyjblxldqr5hhijqaclmk1p6a1kc5yh3hkflw6y7lgcrqxkx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/54f89c50ae45365e86bdadcf67b2411c0f4c5603/recipes/vc-darcs"; sha256 = "1xskl9wjxkbdpi0fm769ymbvya70vssi944x5252w2d3layibm6m"; name = "vc-darcs"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/vc-darcs"; license = lib.licenses.free; @@ -70688,12 +70993,12 @@ vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; - version = "20161030.840"; + version = "20170330.1613"; src = fetchFromGitHub { owner = "m00natic"; repo = "vlfi"; - rev = "a8ba8363b20d13fdb474faae0ea8d4178c350ca0"; - sha256 = "02xqfrv45d0d36jn6nvzmy6pc9dy7mban2dvljxspgpidqlwj8p8"; + rev = "eaa362922734a6fc0b1228a040be267faec07d3c"; + sha256 = "1s2yqknwg02nnsy7b1lr2si4mj8sz3wkm0criqwnbhh380k5sypr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf"; @@ -70832,12 +71137,12 @@ vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20170329.612"; + version = "20170403.2159"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "cbd1e35375309f0c813b5689a765c483caef6d60"; - sha256 = "1lpac1bkgjnkhhglynpwfz4vr3g90m8124ii43yd5n06vpx21c3d"; + rev = "95ca5d13f55b7863fe187865c8c4f6e378af11a1"; + sha256 = "18dxqfkgg2ii6ys6vsi2y7jx26rk3pwh1z3wnqpw225x2jzfz7rv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -70850,16 +71155,19 @@ license = lib.licenses.free; }; }) {}; - w32-browser = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "w32-browser"; - version = "20170308.1518"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/w32-browser.el"; - sha256 = "0pp3fl2r5g32qv8ysiwnznpc5na7cqh3vp5mq59yfhv5p6myayxj"; + version = "20170101.1154"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "w32-browser"; + rev = "e5c60eafd8f8d3546a0fa295ad5af2414d36b4e6"; + sha256 = "18hcr9l5id2xdin20wrg9sdmwfad7qk78iryyg24ci9lvl53m02x"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32-browser"; - sha256 = "14vc2cipwlwwc0b5ld4x0zvydkg8nbjmp0z2x6ca0nmxw8sfsnc6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/w32-browser"; + sha256 = "16sp0gn4yv7iaa55i2kvfsqw3610gr3x31l9lqa14r9xmfhda1rn"; name = "w32-browser"; }; packageRequires = []; @@ -70927,6 +71235,26 @@ license = lib.licenses.free; }; }) {}; + waf-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "waf-mode"; + version = "20170403.1240"; + src = fetchgit { + url = "https://bitbucket.org/dvalchuk/waf-mode"; + rev = "20c75eabd1d54fbce8e0dbef785c9fb68577ee4f"; + sha256 = "09jqxbkkprsrcj7gj9hi8ll7d17425lyjmdmqf12ffqv5pz6aq87"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/44c1aa152ba47113a91878df78d9b56eead98744/recipes/waf-mode"; + sha256 = "16rplrs599a67dcxcdc33zb9bqivv4a2mvrshvyip1lp75f36r5h"; + name = "waf-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/waf-mode"; + license = lib.licenses.free; + }; + }) {}; waher-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "waher-theme"; @@ -71245,12 +71573,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170320.1240"; + version = "20170408.1147"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "4d16489eb14e47f3d63b4bdd4d9f7177133a973c"; - sha256 = "0xgij4ln7r8q56c79m729nayr66bzmlkfbmmy8pr33rca6m66hfr"; + rev = "f6b8fe78d053a4aba180c4d8037c303f0e4ae453"; + sha256 = "0wrb88yh26fpl8fg4w9wbvg7xmd6kpsrv3lh79f8q4xzfpl2g56h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -71581,12 +71909,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20170315.1055"; + version = "20170407.605"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "3c7ecc69d48258af66978a685aedcbc8d1ada512"; - sha256 = "1q6v4bnw9sl6f138lxkqp979xpbgsb57gxj8a1k7clms16kkn5ci"; + rev = "bb30f56868ae4888a8ac5a406c7c7ee2ff168f9b"; + sha256 = "1v50qa611lqj0hjp8v6pnyqvnmljkd0p5g9aj517kv5d7b2rk1dj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -71792,8 +72120,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "e66476fef5c5afe75f09e4fe94109423a99fc2c6"; - sha256 = "1lvk8nh9gp3i98jjinqx17fxammxkfwh0dvzhah9ram73i6xq1yd"; + rev = "8e56c97e19b838a63a79e0a8f69c9c448f04b1ed"; + sha256 = "0s7y2py0hx0nixqiqz63mj8qb3h8jfpkwrkz6nl093zrxpmby3wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -71908,16 +72236,19 @@ license = lib.licenses.free; }; }) {}; - windata = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + windata = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "windata"; - version = "20080412.755"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/windata.el"; - sha256 = "0dcbnqcqw7jzwwdn0rxxlixga1zw1x3a2zbpxvd90xp7zig4f0yz"; + version = "20090830.340"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "windata"; + rev = "a723fc446ceaec23d5f29ecc8245d94c99d91625"; + sha256 = "0y8yw5hazsir5kjskrh4mr63mmz87dc7yy5ddmlwpmn03wanqpha"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8a813e89fc19130d9cdc68f16bba00a0a501427b/recipes/windata"; - sha256 = "0xq51rdanq5as6kfyi97hsqmig5g35w7xv8c96bhzyflranw7jw5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/windata"; + sha256 = "1mah2vy46pxwjd6c6ac14d2qfcixs2yrgwmzmisnfgsvprdlxryb"; name = "windata"; }; packageRequires = []; @@ -72160,8 +72491,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "c5c0bb98b281"; - sha256 = "0gxvx2n6xza17qf1p4v0nbcqfkkhrmg9a56c5d126b4vgmg3bf9v"; + rev = "e85aef10521f"; + sha256 = "012h652i35vq3ygh62yr82mcvkmflqbxvz701c9px9i4kgyvhzdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -72765,12 +73096,12 @@ xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-find"; - version = "20170124.1342"; + version = "20170407.251"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-find"; - rev = "0bd47dc9b570a1526cd3e387280280f20f6a5602"; - sha256 = "1nl8xgkcvnpp4iwcxvvdr3fb6kz5zjxdvkk6ldnybrcypg0xndsg"; + rev = "a83fd078b9b475edc5fd29e0c7d4f02f203e0390"; + sha256 = "166f4yjz1s6bbjz4cw2n8hgv98ambhjy9qs7hkq9d7jjpcjgyzwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find"; @@ -73458,12 +73789,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20170213.1023"; + version = "20170406.241"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "1c3ade410fb0bf5b6f2140b099f0ef96836ee74e"; - sha256 = "1p0m702lyjx5xcqvifc8lkrj430nvjiwswpf3ghcvl5sls8bf5af"; + rev = "64b28913bfe910b147d6ee16488dbaedb1452ca6"; + sha256 = "0c4c9qa8avqnkd0qp88wdc1jpp674bghma4x0bvbi147g224ybp7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -73686,12 +74017,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170326.1030"; + version = "20170409.2044"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "5043a961215158619199cf03a85a0c063a28c644"; - sha256 = "145v9fvfm1yldr7k02d1lk3sgycs2j8zg9d8zmz7g7b9lghkp6fk"; + rev = "47f37f70f4748e30010b700b5eca39d5cd063616"; + sha256 = "0rl0hd6cwa5jvzi3aixws90hvin4p7ppylc4jn7v8cnhy2hckzjp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -73789,12 +74120,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20170329.1433"; + version = "20170404.2353"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79"; - sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9"; + rev = "6b32dc7a832e6c4883dd434530c8d6d69fe36c15"; + sha256 = "0zx57xhg065hbcisvsryqv2lb34fnzfvzv418nbc6r3yy29yb9ar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -73862,12 +74193,12 @@ yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yoshi-theme"; - version = "20170307.906"; + version = "20170330.0"; src = fetchFromGitHub { owner = "ryuslash"; repo = "yoshi-theme"; - rev = "7ab8df0bd646e0571a4d27cbaa4f62b60f625bad"; - sha256 = "0qh8d14vpaj6hbhxv8zmr7sg85wfjqb2gf30b56lnrvkl783v50b"; + rev = "eab4fb67e8fec47c25c4c1393ac1211f043dbd44"; + sha256 = "01al6pzl9mz04b43a3lwnhdvr5i71qhafz6frl5m9q2k6x1x2n2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme"; @@ -74053,8 +74384,8 @@ src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "3f93de4fd1ed7e989873b556517e018f1436f8ed"; - sha256 = "0rqg3mmh7jxsasai6i8y8r2hngvhnncn38ihvbbylyx4f71h59hi"; + rev = "c7e4d3aa3062aa6c89408720e5b68856a39cd401"; + sha256 = "0yqb9wbq4ava9i02skyvjh6n1gd9lcp7lz1a2skzihc2hmnjw2jg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; @@ -74422,11 +74753,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }: melpaBuild { pname = "zpresent"; - version = "20170326.1630"; + version = "20170409.2251"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "ef1de4ed0def"; - sha256 = "1fb7n64wj1b6s5vm43i9xharbbfx9r97fzshmjfhik8vsjc7k4c5"; + rev = "7b93cb98f370"; + sha256 = "020rp458a3xgxxd2gb091w1xgd78rl10z9f68y81cxi2gnfv91qb"; }; 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 488699f8a793..abb00d1ce33f 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -212,12 +212,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e"; - sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285"; + rev = "c4aab21df64011916039e18094e189533018e115"; + sha256 = "1ac8rw0r4x1plrwy6xwswy5mj5h1r975y8wvx01g2j8an41xhlms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -527,12 +527,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b"; - sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6"; + rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d"; + sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -548,12 +548,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b"; - sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6"; + rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d"; + sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -1031,12 +1031,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "alchemist"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "aa54643c6d64d82c2c8d502bb710e7de87699df1"; - sha256 = "0fbhrri816brh3283q3gisnxnginwzarsydsz881zk24kk2raq1k"; + rev = "34caeed1bd231c7dfa8d2b9aa5c5de2b2a059601"; + sha256 = "1cci0sq568ghx6x7my96m0iiwvqz2f4dh6k3gn3mmfyvi7bmrpww"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1049,6 +1049,27 @@ license = lib.licenses.free; }; }) {}; + alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "alda-mode"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "jgkamat"; + repo = "alda-mode"; + rev = "921b1d39ee1122c0f6935598dc17aaa904e74819"; + sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; + sha256 = "0vpxiw3k0qxp6s19n93qkkyrr44rbw38ygriqdrfpp84pa09wprh"; + name = "alda-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/alda-mode"; + license = lib.licenses.free; + }; + }) {}; alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; @@ -1091,22 +1112,22 @@ license = lib.licenses.free; }; }) {}; - all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: + all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "all-the-icons"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "692ac0816783725600b80b5307bf48a83053a378"; - sha256 = "13l5dqyhsma2a15khfs0vzk6c7rywfph4g9kgq10v89m3kwqich8"; + rev = "4f7c556167e42c02d2f840aec345b8f60b71c477"; + sha256 = "0vhmw6z6q5a3abxphxxq5yd37hz5x9hs61vgx4wfyk2853701ks0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q"; name = "all-the-icons"; }; - packageRequires = [ dash emacs font-lock-plus ]; + packageRequires = [ emacs font-lock-plus ]; meta = { homepage = "https://melpa.org/#/all-the-icons"; license = lib.licenses.free; @@ -1145,12 +1166,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "1799bdbe410dc7dd91b766dddaa6c73e2d077059"; - sha256 = "1gn835ny57cgaijjhifiafannbbnrj6v3g4kc45id52grkd041qk"; + rev = "95fdfab07600171daccb0e9e98fb91c11237fd48"; + sha256 = "0l5h6apjshr6drfak6j66m3rv26hkr2namj85k8isvalmn4dlrj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1540,6 +1561,27 @@ license = lib.licenses.free; }; }) {}; + apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "apache-mode"; + version = "2.0"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "apache-mode"; + rev = "7e79a6602da77b5c3a11dab93d46fef26abc860d"; + sha256 = "0i4kmw0qbnnfbfih7iwfpihv5d6kh1l9k2b062dvc5mx1vvlr8k8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode"; + sha256 = "0f8r3xnnidcm9ahj8c3s1vxk6yqk3ra34nrc19r76xyprbb2sjsm"; + name = "apache-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/apache-mode"; + license = lib.licenses.free; + }; + }) {}; apib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "apib-mode"; @@ -2449,6 +2491,27 @@ license = lib.licenses.free; }; }) {}; + beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "beacon"; + version = "1.3.3"; + src = fetchFromGitHub { + owner = "Malabarba"; + repo = "beacon"; + rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b"; + sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon"; + sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq"; + name = "beacon"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://melpa.org/#/beacon"; + license = lib.licenses.free; + }; + }) {}; beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beeminder"; @@ -3502,12 +3565,12 @@ cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cfengine-code-style"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "dc823da05d6790e9f95e3cb75618b51d6273e303"; - sha256 = "0xfdlzdcccz80qp3jbzv7wr1kwkh8797j9d3lfkh8apl4wkgvwpq"; + rev = "99e8b116e779f97e96866891362817c1c5c6534c"; + sha256 = "1ckk6jvmwrrlfd4ja8n5q99ajasgvbdkzkba9mswhq9dvk6avvn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -4206,12 +4269,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.8.0pre3"; + version = "3.8.0pre4"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "3b7f19a72ff2216b4613fdc8c5edf5d56e74d6fc"; - sha256 = "0da0ywk6bxr78hiy34m7yf0fwvir2v2hvdmspai8n8kcnlcinkyw"; + rev = "9e32b88784e5e0f14258597fde162fcaf6290fea"; + sha256 = "1pg5gc7fbj5fjwz5za2162yrnrvrnd5dp6jd2mm9zjkipwwf2z80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4836,12 +4899,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b"; - sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6"; + rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d"; + sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -4857,12 +4920,12 @@ company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "company-quickhelp"; - version = "2.0.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "d8fd045715ca64bc8cb3e714c05fe70d7eb33f09"; - sha256 = "1fdiz1jqxnrl940vqbq14idrs4ird9dkzgckmyawzznv5yi29fw4"; + rev = "a6eaf04e31af9e0d2f47c4c1439fc586f91d0a62"; + sha256 = "1flb9wzgj0argd10m2l859glpiwzfjyggyrw2zfalkh8c52nywvd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -4902,6 +4965,27 @@ license = lib.licenses.free; }; }) {}; + company-rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-rtags"; + version = "2.9"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936"; + sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; + sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f"; + name = "company-rtags"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/company-rtags"; + license = lib.licenses.free; + }; + }) {}; company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: melpaBuild { pname = "company-sourcekit"; @@ -5241,12 +5325,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330"; - sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3"; + rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; + sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -6079,12 +6163,12 @@ demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demangle-mode"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "b40d7174d5d31ea8bf3442fb054f3c15bf6e979c"; - sha256 = "00aqhzamp1492kn0x1j2h15wywbkwx9m0alm5z82z60wrq7gy9z7"; + rev = "0f9436f98225e0f5a5deecea4680c173e76f0322"; + sha256 = "0n10c45lvdfczhd2mpkciggv4d83mcnbpmjhxzvmnf7n5ar6aw6a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; @@ -7282,12 +7366,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "0.4.1"; + version = "0.5.5"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "8e8dde2ce96c9bf561bffa1ee0886cf9b87db370"; - sha256 = "13jf3rps8s54pyxnmxdrxmza5jnyhzcixmqqw4vp4br3kay7lbrz"; + rev = "65fe2afeb240ff16b6fa0e580e3b03342b388e28"; + sha256 = "0sv4m44zbil54mppqybq5978f3dnn0smjpkl3qw7d4sfh4dwf779"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo"; @@ -7513,12 +7597,12 @@ ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ede-php-autoload"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "stevenremot"; repo = "ede-php-autoload"; - rev = "2a8988d845d5acf9d49d8177a68c3c8863916d25"; - sha256 = "19i746dyshcm2bih82n1m39sf18zx8gi1xaxc9q3pxm4hvn4s8mm"; + rev = "28a989232c276ee7fc5112c9050b1c29f628be9f"; + sha256 = "0kc51bb5jxrsra9ycg43n35dd8kngby321qbcixaj68cksf0whrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; @@ -7784,12 +7868,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "b52ccbd46dee2a1ece1dd6bd9be1224c323262ca"; - sha256 = "1qdznl8z0s2hy3hhls9ccr516wai11qh663630hc0zwv4gwlwp64"; + rev = "0ede9e7ef64017039748b8f47de4df834b0443ed"; + sha256 = "03fm7lhfzrhn4dddlhqx6v1dqfgz6rj352y0znnfdaskzychw1sa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -8057,12 +8141,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192"; - sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz"; + rev = "67c4f07f5b0f942f030848f5d657909a1424b597"; + sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -8078,12 +8162,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192"; - sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz"; + rev = "67c4f07f5b0f942f030848f5d657909a1424b597"; + sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -8674,13 +8758,13 @@ pname = "emms"; version = "4.1"; src = fetchgit { - url = "git://git.sv.gnu.org/emms.git"; + url = "https://git.savannah.gnu.org/git/emms.git"; rev = "c1e1a843c3389fc585908de367ff00fdd6470965"; sha256 = "0q8grh20mzz8yashvzwx8s8hr761xmi6s81mjw8cjqzajm4ky8q3"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms"; - sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; + sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94"; name = "emms"; }; packageRequires = []; @@ -8954,12 +9038,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "2621509bc9811c103d7efc999d4722e9d4c788e9"; - sha256 = "1bq634bimd5ng2jc5d0aglsrdi08jihm0qx2za4vfdqvnn82gxiv"; + rev = "2b4d4cd764b9fa4757738a6dae87f4d1e99686d6"; + sha256 = "0j7zd3qxh4m5gv5s8pvfacad2mkzwwz1xdrvg1sa035xaxahqsyx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -9255,12 +9339,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.3"; + version = "19.3.1"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "a748cafdc7063d9f181ba12088db6458793ced2f"; - sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86"; + rev = "d25ad84195ca42969fbfb017a52aab8c8effc246"; + sha256 = "06jxpypw8i13gjiq006p0ahy0mlkxhmpq8fhn4pp7hi2n4ycnfj1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -9863,12 +9947,12 @@ evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-commentary"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "linktohack"; repo = "evil-commentary"; - rev = "6d9079894da0bdda8a317c03c90481b8754635c7"; - sha256 = "183fdg7rmnnbps0knnj2kmhf1hxk0q91wbqx1flhciq6wq4rilni"; + rev = "8cd9ea799e981b3b5ed3dcdf45d5464096e4abd2"; + sha256 = "1bq8f00dczhlqsp6s7k7cjb9mfpdznykwqm3jn7nj5fn5gdiramx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary"; @@ -11651,22 +11735,43 @@ license = lib.licenses.free; }; }) {}; - flycheck-status-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: + flycheck-rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-rtags"; + version = "2.9"; + src = fetchFromGitHub { + owner = "Andersbakken"; + repo = "rtags"; + rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936"; + sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; + sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4"; + name = "flycheck-rtags"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/flycheck-rtags"; + license = lib.licenses.free; + }; + }) {}; + flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-status-emoji"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "liblit"; repo = "flycheck-status-emoji"; - rev = "1c67e62562a5c30b3a184ef5090bbe50bab4d681"; - sha256 = "1xxvri9ax5cjrkxhjqhs7zqbch9cx8kvrn7sg611frl68qawkjsm"; + rev = "2f323cb210a280fc05061f3fc689c627b40bfcb3"; + sha256 = "0gz18jp5bcwm86w6ir8vyf8rb3l2h524zfvx0jpfk0k1mmxj9cs7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji"; sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p"; name = "flycheck-status-emoji"; }; - packageRequires = [ emacs flycheck let-alist ]; + packageRequires = [ cl-lib emacs flycheck let-alist ]; meta = { homepage = "https://melpa.org/#/flycheck-status-emoji"; license = lib.licenses.free; @@ -11696,12 +11801,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "1.0.8"; + version = "1.1.0"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "ae7b29111cb160774c317997902d7ef29cedd7d9"; - sha256 = "17s34rqxkirb88y8jzl3ybs7j3ylp9ckdfx3sqwfn0cyspnj5f1d"; + rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5"; + sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -13319,12 +13424,12 @@ git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-lens"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "pidu"; repo = "git-lens"; - rev = "be62df785ae14fa8652fe2cdd342d3256f8c0933"; - sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc"; + rev = "2d1d94fd2e8a17025224ae2224c5f44d8482dc64"; + sha256 = "1d0vk8344n4lcdcqxkv44qc7f3753mpy76hmgf8xi60kyajvjrd7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens"; @@ -13925,6 +14030,27 @@ license = lib.licenses.free; }; }) {}; + go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + melpaBuild { + pname = "go-guru"; + version = "1.5.0"; + src = fetchFromGitHub { + owner = "dominikh"; + repo = "go-mode.el"; + rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2"; + sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; + sha256 = "01f0gz65z8d0iv8k49xl2sp6q4qnsvwhd4g8fb2irp7iclb0xmvk"; + name = "go-guru"; + }; + packageRequires = [ cl-lib go-mode ]; + meta = { + homepage = "https://melpa.org/#/go-guru"; + license = lib.licenses.free; + }; + }) {}; go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-impl"; @@ -13949,12 +14075,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "9d94107fae1b1137fb46f8cd7efc7e28f3abf2cb"; - sha256 = "0g0vjm125wmw5nd38r3d7gc2h4pg3a9yskcbk1mzg9vf6gbhr0hx"; + rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2"; + sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -13988,6 +14114,27 @@ license = lib.licenses.free; }; }) {}; + go-rename = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + melpaBuild { + pname = "go-rename"; + version = "1.5.0"; + src = fetchFromGitHub { + owner = "dominikh"; + repo = "go-mode.el"; + rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2"; + sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; + sha256 = "1cd2nfgwnqzylbry11ahahdip8w66w5hnrndrs65ip10s08w2xki"; + name = "go-rename"; + }; + packageRequires = [ go-mode ]; + meta = { + homepage = "https://melpa.org/#/go-rename"; + license = lib.licenses.free; + }; + }) {}; go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-scratch"; @@ -14201,12 +14348,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "b4a3f7a1d0352866c03f42208cddceb53fe12d16"; - sha256 = "1f5bpjzj92ac4jvpbahydf2k894man4v2riv8k7j7fwlaknlvcvj"; + rev = "9bfdc5ce62c0585b48b154cc460f8664dcd124c3"; + sha256 = "0p00s08fjwh106dag9wyhikzrh0vqd4pzb852b2zrmb7zlhigx65"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -15133,12 +15280,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.5.4"; + version = "2.6.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "7a969880e7ea607517dbaa9d98da036fd9fec2fd"; - sha256 = "0y9jg4xidb0f496fi30p1xjr73kg220qsjrzcr1i6p96qxr0qpfd"; + rev = "e86cbf2b23eede65eb453a9a03b0e0823f02fcf2"; + sha256 = "06bw73rfjslk5qb5k7hrwsj1jm47b2cnpzjmgwjckdv9f7dql11w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -15448,12 +15595,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.5.4"; + version = "2.6.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "7a969880e7ea607517dbaa9d98da036fd9fec2fd"; - sha256 = "0y9jg4xidb0f496fi30p1xjr73kg220qsjrzcr1i6p96qxr0qpfd"; + rev = "e86cbf2b23eede65eb453a9a03b0e0823f02fcf2"; + sha256 = "06bw73rfjslk5qb5k7hrwsj1jm47b2cnpzjmgwjckdv9f7dql11w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -16642,6 +16789,27 @@ license = lib.licenses.free; }; }) {}; + hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hide-lines"; + version = "20130623.1701"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "hide-lines"; + rev = "4bfb4c6f4769bd6c637e4c18bbf65506832fc9f0"; + sha256 = "01cy7v9ql70bsvjz3idq23jpyb8jb61bs9ff8vf5y3fj45pc32ps"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/hide-lines"; + sha256 = "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d"; + name = "hide-lines"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/hide-lines"; + license = lib.licenses.free; + }; + }) {}; highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-blocks"; @@ -18031,12 +18199,12 @@ inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "shlevy"; repo = "inherit-local"; - rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063"; - sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i"; + rev = "b1f4ff9c41f9d64e4adaf5adcc280b82f084cdc7"; + sha256 = "1fargashyqn4ga420k3ikc1akf7mw3zcarpg24gh2591p4swa0ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; @@ -18345,12 +18513,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330"; - sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3"; + rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; + sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -18387,12 +18555,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "0.1.5"; + version = "0.2.0"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "ead155b5474b0d5b21d78ae735aea74df1e4c3af"; - sha256 = "1lwb8hwbvalwdj1gybc4aw3w5li81mhxagkpxa0dlwxs08lq7v2y"; + rev = "712f204d242663ca8cdbb2b2d6732b5cf0c411b4"; + sha256 = "1mcl5j3brjsrqsafqpag8b4y8iyp2c8cbaffmv5vfw3b18hss3wf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -18426,22 +18594,22 @@ license = lib.licenses.free; }; }) {}; - ivy-hydra = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330"; - sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3"; + rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; + sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; sha256 = "1xv8nfi6dzhx868h44ydq4f5jmsa7rbqfa7jk8g0z0ifv477hrvx"; name = "ivy-hydra"; }; - packageRequires = []; + packageRequires = [ emacs hydra ivy ]; meta = { homepage = "https://melpa.org/#/ivy-hydra"; license = lib.licenses.free; @@ -18577,13 +18745,13 @@ pname = "jabber"; version = "0.8.92"; src = fetchgit { - url = "git://git.code.sf.net/p/emacs-jabber/git"; + url = "https://git.code.sf.net/p/emacs-jabber/git"; rev = "2999f58619dd9c20cc6cac8060c4c850a504cbbd"; sha256 = "03x93wkd8syj2ybf5ymwcm6khx0h5nhrl8pyync1520294pq6i1i"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cff77a688d51ff2e2f03389593465990089ce83d/recipes/jabber"; - sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jabber"; + sha256 = "0saajvfpzgcsqa7h7aa6l0bns6swr40c46md6s0d90x9lrvwp7ws"; name = "jabber"; }; packageRequires = []; @@ -19243,6 +19411,27 @@ license = lib.licenses.free; }; }) {}; + key-chord = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "key-chord"; + version = "0.6"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "key-chord"; + rev = "8468998946367157830df19a1e92785d22a34178"; + sha256 = "10ldhwp9a21r9g72hzaig1h5yh2zblny0r36nf5nz6gzikfcq0cd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/key-chord"; + sha256 = "1g0jqmnn575h5n4figxbc5xs76zl8b1cdqa6wbi3d1p2rn3g8scr"; + name = "key-chord"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/key-chord"; + license = lib.licenses.free; + }; + }) {}; key-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "key-combo"; @@ -19558,6 +19747,27 @@ license = lib.licenses.free; }; }) {}; + kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "kubernetes"; + version = "0.2.3"; + src = fetchFromGitHub { + owner = "chrisbarrett"; + repo = "kubernetes-el"; + rev = "795ba140104aef6f905aab61bc843596958d97db"; + sha256 = "0l847g5pm8r7y2p0nrryhfdmrqj6h8qp9fmk6bm0xx0xnxpx01xg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb95e7cd186d02c45d14319858044468a14d9f72/recipes/kubernetes"; + sha256 = "0608wkdnbnrq2mhvnq0m2bk50bm3kzr528rvia4hlda1hwbfz867"; + name = "kubernetes"; + }; + packageRequires = [ dash emacs magit ]; + meta = { + homepage = "https://melpa.org/#/kubernetes"; + license = lib.licenses.free; + }; + }) {}; kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; @@ -20240,12 +20450,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.7.1"; + version = "0.8"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "6409991053350ab2d3def61749b92780dd1ed095"; - sha256 = "0phhkg3qgh4q4b7as0a00zx7kcrlmh24by1sjbp7b4dsd0mnz22k"; + rev = "b5cafd1145f22e7beff8ef8ed742bf10af1e6e1c"; + sha256 = "08is4fg94a6am7c2j0d5qd1nkrnik5vpzg3pqkimyxgy5czj764b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -20321,22 +20531,22 @@ license = lib.licenses.free; }; }) {}; - m-buffer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + m-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "m-buffer"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "phillord"; repo = "m-buffer-el"; - rev = "61d1ed99e528840d2eee2ce07946a9d76eb6d814"; - sha256 = "048ls0ca9yppjj0mx6g00f1vwh4ryvv6bckihxs7ynbr2jcydjr7"; + rev = "6eb1d2535a82707a83733173bc400a0d8e520c80"; + sha256 = "1sx76i59razwccvn6x7rx5a124bfyjw9fcbxf4gj7nsg33qiq809"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer"; sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94"; name = "m-buffer"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ seq ]; meta = { homepage = "https://melpa.org/#/m-buffer"; license = lib.licenses.free; @@ -20436,12 +20646,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "74e0343b4152ad5c0d4f77f9f15dd6f1b02de432"; - sha256 = "08mpnj9c43p528iy3hj8yljhzpkpjxkjiaiiss5n2jgyyc64hw9z"; + rev = "ae6250aead8f283eac8d6951a249cfc7d85e0b40"; + sha256 = "0n6dhc92z5w67rcfngjzprzbdn42ja263gdqa7fncqq9p66slccq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -21157,12 +21367,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "1ddaca25ee978736dcb3922bb1952d750c39cd5a"; - sha256 = "09g81d1l5mhji4vbljxgfrgr0051sv7kqy0vwf7awxa4slgl6bnd"; + rev = "b38e0a0333e92f8a14840534a8b8ff8fd715330b"; + sha256 = "0ysjcvbnbc28c8vs7cc18vr4sqffcc4y4p3xzr8d5giccgy9192v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -22098,6 +22308,27 @@ license = lib.licenses.free; }; }) {}; + multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "multi-term"; + version = "1.2"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "multi-term"; + rev = "c9e67edb772f2d9f9da8d887dc746459cfbce244"; + sha256 = "1bn6zx931vz2fa72ab999r33bxv8brn3cqmalvq25x7s4z3q1lyi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/multi-term"; + sha256 = "16idk4nd7qpyrvyspbrdl8gdfaclng6ny0xigk6fqdv352djalal"; + name = "multi-term"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/multi-term"; + license = lib.licenses.free; + }; + }) {}; multi-web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-web-mode"; @@ -22376,14 +22607,14 @@ pname = "navi-mode"; version = "2.0"; src = fetchFromGitHub { - owner = "tj64"; + owner = "alphapapa"; repo = "navi"; rev = "5c979b3b3873b0e67751a1321a9e271d066f2022"; sha256 = "15jh1lsgqfnpbmrikm8kdh5bj60yb96f2as2anppjjsgl6w96glh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a06141b0ee1e10bc3f16fcca35d971dc7e9d07e/recipes/navi-mode"; - sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/navi-mode"; + sha256 = "0pc52iq8lng2g0vpnrhdfxmibc1dx9ksmrjg0303as1yv41fnc69"; name = "navi-mode"; }; packageRequires = []; @@ -22626,12 +22857,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "63bf66630f48403f536f96f8a0d5b5fab46eac9b"; - sha256 = "0qi706xafi05rqpdz87sayqb728f5qisln2i3yicymr0wy93x76i"; + rev = "0227c5eea5b9f3fb056a7ef6052ef6f076371bde"; + sha256 = "0hjb2paylmcc68998cqgfdnw79z43ha5bv1cg91ysbdjcx2lp1x7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -22728,11 +22959,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.24"; + version = "0.24.1"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "e60b44ecf8bd5934959727496c7ef3016ff80cf6"; - sha256 = "1q81ibvhjvnz4hbwmdna3a1xjkik21avy5im89fnkhq068kwac2j"; + rev = "e64fdf889d0f78543557f5b72ebca1571caf497e"; + sha256 = "0vappcyidhzka2za6zqlcygn90a1xm9xrhpr9gvdp258m8qhz6d1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -23291,15 +23522,15 @@ license = lib.licenses.free; }; }) {}; - omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s }: + omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; version = "3.9"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "bcc5d7ba940c1118ab61071783747162f0c927cf"; - sha256 = "05i3z6whvgq81qnrwgvfglhwi214145ksg8h81rc0g4ir54wzsik"; + rev = "93c188938305533ea34ceca51dd53c7841598ada"; + sha256 = "0ynjxf0r9i5yb98pnhrcm55shhv4gqfr0wigfkz83yqzpsjzq6fn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp"; @@ -23315,6 +23546,7 @@ json popup s + shut-up ]; meta = { homepage = "https://melpa.org/#/omnisharp"; @@ -23555,12 +23787,12 @@ org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-board"; - version = "1011"; + version = "1018"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "53469a2f0577924de1c7d887fecea409d17fd588"; - sha256 = "0fg7lkgcr7zwwjald7hbvwgl72m21lqxmz7p8sq31iw3jh42fqgf"; + rev = "405bfd630f1b31bd77158bc8e79aab86812cba65"; + sha256 = "066shdqp0bca2xlds1m0c5ml3yxqfyzsyyy7sy72ybv41n5b11x3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -24657,14 +24889,14 @@ pname = "outorg"; version = "2.0"; src = fetchFromGitHub { - owner = "tj64"; + owner = "alphapapa"; repo = "outorg"; rev = "e946cda497bae53fca6fa1579910237e216170bf"; sha256 = "1v9kx5xr7xcr6i664h2g6j8824yjsjdn5pvgmawvxrrplbjmiqnp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d57762fe51a524731e228c80b4b2d25e827e5858/recipes/outorg"; - sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outorg"; + sha256 = "10jh64d1nalfig69nnsib46915jinv37lvmxa0aj91zymq2szdm9"; name = "outorg"; }; packageRequires = []; @@ -24678,14 +24910,14 @@ pname = "outshine"; version = "2.0"; src = fetchFromGitHub { - owner = "tj64"; + owner = "alphapapa"; repo = "outshine"; rev = "cf1097692b3ea0367d3c821769399fec5831e200"; sha256 = "1v04iyx57w8scw3iqrivii7q0sh8sa7xacswdhd18mw9kvjrbj98"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6dc02a576abb8e115f674a9d896f8bc932b7571b/recipes/outshine"; - sha256 = "1ajddzcrnvfgx3xa5wm0bcll9dax52syg1p521mv0ffkld63jyfl"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine"; + sha256 = "1qqmvs17hq5s047nqplg4sa09xg5ck6zwqyg91xmbh71bx80v28v"; name = "outshine"; }; packageRequires = []; @@ -24760,12 +24992,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "0.1.6"; + version = "0.2"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "edc253b6f7397ac89a3a0b2d2a05e650baa483f8"; - sha256 = "0kvs5kpkly45fqdb7mka1w2yn7pks95gxgiy2ayx12cgvn3inyw6"; + rev = "4cff438a06dce6e6e6a83e3900e90588f9f05b74"; + sha256 = "0i3jbvw34aklfxq8q887l83yl5n13bdqhvjz4ih4yqnzwgcsd74r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -25139,13 +25371,13 @@ pname = "paredit"; version = "24"; src = fetchgit { - url = "http://mumble.net/~campbell/git/paredit.git"; + url = "https://mumble.net/~campbell/git/paredit.git"; rev = "82bb75ceb2ddc272d6618d94874b7fc13181a409"; sha256 = "13wzz5fahbz5svc4ql3ajzzpd1fv0ynwpa5widklbcp5yqncv1vm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d83b5d24db3527e48e3de40c320255bc2dbfccb/recipes/paredit"; - sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit"; + sha256 = "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653"; name = "paredit"; }; packageRequires = []; @@ -26227,13 +26459,13 @@ pname = "po-mode"; version = "0.19.8.1"; src = fetchgit { - url = "git://git.savannah.gnu.org/gettext.git"; + url = "https://git.savannah.gnu.org/git/gettext.git"; rev = "c737bf843616ca984c9416048a2da845e9ad3f50"; sha256 = "0hlvnq3cigpb8f4yxy2llcmmn0b38prlb1awwy6zl5fwwi9ksrwk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; - sha256 = "1hb9vrr2x6mh0yzckmx9fk6535d6r189974n4bizpr1xdikn7dgp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; + sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w"; name = "po-mode"; }; packageRequires = []; @@ -26853,12 +27085,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "593e917c176b5bc5aafa57bf9f6030d749d91cd5"; - sha256 = "120g0bg7ichry74allgmqnh7k0z2sdnrrfklb58b7szzn4zcdz14"; + rev = "b50c9ec1223895973d0e2fa6b6cb74ec3c8f3ce8"; + sha256 = "17drjxry365als0drs56gzdpdjhkhjwg9jwvrhmq5dp9ly0rb2f4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -28278,22 +28510,22 @@ license = lib.licenses.free; }; }) {}; - rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "fd0f056a5912caeeb2d4f668969d9df81c9e22db"; - sha256 = "1lig93lj5mnm2fjvwac42kfw8bhq8ggs4jfc73fmclm6s5dg8661"; + rev = "32fc22b192cbad03fca3835f29c36ab4a90e50a0"; + sha256 = "168p4h7h9ik1f56cw0zr8brbn53d5jglv9r7i9zqh80zzhljw4xv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; name = "rg"; }; - packageRequires = [ cl-lib s ]; + packageRequires = [ cl-lib emacs s seq ]; meta = { homepage = "https://melpa.org/#/rg"; license = lib.licenses.free; @@ -28541,8 +28773,8 @@ sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; - sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; + sha256 = "0s5m4zjvnc1k4gkkizbs4ysvzzbfh45717pksg9bnyzwx5lcw5yd"; name = "rtags"; }; packageRequires = []; @@ -29158,6 +29390,27 @@ license = lib.licenses.free; }; }) {}; + sentence-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sentence-highlight"; + version = "0.1"; + src = fetchFromGitHub { + owner = "sbelak"; + repo = "sentence-highlight"; + rev = "6f2bc989207ec8cf641e44924ef530a2e436eedb"; + sha256 = "0740swhm3kzjx58a6nr9992p05q4kzvyham8g7kds4ydd7xsd9am"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/531ec8b371465d916f332818c04359dc66009a42/recipes/sentence-highlight"; + sha256 = "0pr8f3b6hcflk400fq6j7fi8iv7r2drzdg19rbx3w7n3xwipwjf0"; + name = "sentence-highlight"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sentence-highlight"; + license = lib.licenses.free; + }; + }) {}; servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }: melpaBuild { pname = "servant"; @@ -29515,6 +29768,27 @@ license = lib.licenses.free; }; }) {}; + showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "showtip"; + version = "0.1"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "showtip"; + rev = "930da302809a4257e8d69425455b29e1cc91949b"; + sha256 = "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/showtip"; + sha256 = "1d5ckka2z0ffwyk9g3h91n3waijj2v7n8kvdks35gcr2yl3yk780"; + name = "showtip"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/showtip"; + license = lib.licenses.free; + }; + }) {}; shpec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shpec-mode"; @@ -30232,12 +30506,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "327c168febbde24c2b39cc10d26c9cfc9189e130"; - sha256 = "1jlv8sr2g3i335h7hp8y39b77wla9hac1b0bk2imalr14lz04vly"; + rev = "15803162483e635f3e22b2efea33ccad725e0535"; + sha256 = "1nc8xp22i57kf89x0qh69dspl9hl710m01gdr35ph5gl8ycmyir5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -30733,6 +31007,27 @@ license = lib.licenses.free; }; }) {}; + sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sr-speedbar"; + version = "20140914.2339"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "sr-speedbar"; + rev = "4f816528a32eb421197a768d6dcf3a05de83f642"; + sha256 = "1x9wizd0fzcmpf8ff7c3rcfxk64diy9jmzzvxa7d5a3k8vvpdhg3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/sr-speedbar"; + sha256 = "1v90jbqdw39yrfcsnyqas8c5g09rcf1db65q2m2rw7rik8cgb052"; + name = "sr-speedbar"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sr-speedbar"; + license = lib.licenses.free; + }; + }) {}; srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "srefactor"; @@ -30988,13 +31283,13 @@ pname = "stumpwm-mode"; version = "0.9.8"; src = fetchgit { - url = "git://git.savannah.nongnu.org/stumpwm.git"; + url = "https://git.savannah.nongnu.org/git/stumpwm.git"; rev = "4d0603e52b5bab993b3be63e3654c74f641e677d"; sha256 = "0pn3xjz433b0djcys25a8fv775yqmj3qgg0hyghgxjpzsh6k2a4f"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3a1e6358c529e3b9e51bcfa6e2e294acbf662882/recipes/stumpwm-mode"; - sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/stumpwm-mode"; + sha256 = "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf"; name = "stumpwm-mode"; }; packageRequires = []; @@ -31321,12 +31616,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330"; - sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3"; + rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; + sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -32181,12 +32476,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "2.1.5"; + version = "2.2.2"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "bd89d93d9803319ba86eff0173821deb978ae2ac"; - sha256 = "1a736r1igq66hn6ig4l7c5xaxcyk2kxvj26laphakk1xg8j5x52k"; + rev = "eabcad4dbebb705d4e366f90344ea543068d2dc4"; + sha256 = "1ykxsr8q9gwx2d8b0v2xf4glchwg3ikcx60a5r4phw1nlwff8gg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -32286,12 +32581,12 @@ tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tox"; - version = "0.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "tox.el"; - rev = "5c1a7c18cb7f2fd2da2386debf86012e6953e15d"; - sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39"; + rev = "7655eb254038d5e34433e8a9d66b3ffc9c72e40c"; + sha256 = "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08a7433e16f2a9a2c04168600a9c99bc21c68ddf/recipes/tox"; @@ -32579,12 +32874,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "abc0751c0e3f316a0064fc7342ffb89b49b02e15"; - sha256 = "0lgsyqzfjqhygs8a3icnfsp6y20h2rqrk4wbyc1xfmkbahs7qk8y"; + rev = "f25f4751fea12298905c811a1f469a6b0a169ef1"; + sha256 = "1s4qzhi8bd45l824pwzh97i9npf7j4ai6wkbhf28q2nd1hiv29hw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -32726,12 +33021,12 @@ unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unfill"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "purcell"; repo = "unfill"; - rev = "99388d79f971db70c5d18dab4257301f750ed907"; - sha256 = "1qy0q1fp7cmvmxynqrb086dkb727lmk5h1k98y14j75b94ilpy0w"; + rev = "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8"; + sha256 = "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill"; @@ -32897,22 +33192,22 @@ license = lib.licenses.free; }; }) {}; - uptimes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uptimes"; - version = "3.1"; + version = "3.3"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "5e321692bf5ccdc286f4831fa8fe55467c1c56aa"; - sha256 = "04n4bryfid6scma43whw156wcza77ij7szgc5f73d98j9fji6lay"; + rev = "2be31db3508513478d3f27f4eff2ff1094786b4e"; + sha256 = "177d1h84w9rr6x3hsq9z7sbr8s8pippgy0l99gpdhycbff6a7cwg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h"; name = "uptimes"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/uptimes"; license = lib.licenses.free; @@ -32942,12 +33237,12 @@ utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "utop"; - version = "1.19.3"; + version = "1.20"; src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "ee81ce49bab31757837bed35a182d29cbd54dfcb"; - sha256 = "1p2vjxw0y6py5hly6vjl4gxm171n9pr4rkimxd0rg3dl1npvn99z"; + rev = "46355e96f35fc6c3373cf8268e5e531cc3748644"; + sha256 = "1jc16vki0d20vwgkf4ns6hn5s1dzfa4x5kf2925s1489f223ski3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -33359,6 +33654,27 @@ license = lib.licenses.free; }; }) {}; + w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "w32-browser"; + version = "235"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "w32-browser"; + rev = "a8126b60bf18193e8e4ec6f699b5694b6f71a062"; + sha256 = "13wjvzsas7in8f09sc2qj17dz25wizg1l0r2krgp1zymy92p8f97"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/w32-browser"; + sha256 = "16sp0gn4yv7iaa55i2kvfsqw3610gr3x31l9lqa14r9xmfhda1rn"; + name = "w32-browser"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/w32-browser"; + license = lib.licenses.free; + }; + }) {}; wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wacspace"; @@ -34016,8 +34332,8 @@ version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "c5c0bb98b281"; - sha256 = "0gxvx2n6xza17qf1p4v0nbcqfkkhrmg9a56c5d126b4vgmg3bf9v"; + rev = "e85aef10521f"; + sha256 = "012h652i35vq3ygh62yr82mcvkmflqbxvz701c9px9i4kgyvhzdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 839f537843d0..a7ac367f048a 100644 --- a/pkgs/applications/editors/idea/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -63,6 +63,10 @@ with stdenv; lib.makeOverridable mkDerivation rec { makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ --prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + # Some internals want libstdc++.so.6 + stdenv.cc.cc.lib + ]}" \ --set JDK_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ --set ANDROID_JAVA_HOME "$jdk" \ diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/jetbrains/default.nix index e298385f793e..26b4d3833f31 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf +{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf , coreutils, gnugrep, which, git, python, unzip, p7zip , androidsdk, jdk }: @@ -6,10 +6,12 @@ assert stdenv.isLinux; let - mkIdeaProduct = callPackage ./common.nix { }; + mkJetBrainsProduct = callPackage ./common.nix { }; + + # Sorted alphabetically buildClion = { name, version, src, license, description, wmClass }: - (mkIdeaProduct rec { + (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "CLion"; meta = with stdenv.lib; { @@ -24,72 +26,77 @@ let }; }); - buildIdea = { name, version, src, license, description, wmClass }: - (mkIdeaProduct rec { + buildDataGrip = { name, version, src, license, description, wmClass }: + (mkJetBrainsProduct { inherit name version src wmClass jdk; - product = "IDEA"; + product = "DataGrip"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/idea/"; + homepage = "https://www.jetbrains.com/datagrip/"; inherit description license; longDescription = '' - IDE for Java SE, Groovy & Scala development Powerful - environment for building Google Android apps Integration - with JUnit, TestNG, popular SCMs, Ant & Maven. + DataGrip is a new IDE from JetBrains built for database admins. + It allows you to quickly migrate and refactor relational databases, + construct efficient, statically checked SQL queries and much more. ''; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ loskutov ]; platforms = platforms.linux; }; }); - buildRubyMine = { name, version, src, license, description, wmClass }: - (mkIdeaProduct rec { + buildGogland = { name, version, src, license, description, wmClass }: + (mkJetBrainsProduct { inherit name version src wmClass jdk; - product = "RubyMine"; + product = "Gogland"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/ruby/"; + homepage = "https://www.jetbrains.com/go/"; inherit description license; - longDescription = description; - maintainers = with maintainers; [ edwtjo ]; + longDescription = '' + Gogland is the codename for a new commercial IDE by JetBrains + aimed at providing an ergonomic environment for Go development. + The new IDE extends the IntelliJ platform with the coding assistance + and tool integrations specific for the Go language + ''; + maintainers = [ maintainers.miltador ]; platforms = platforms.linux; }; }); - buildPhpStorm = { name, version, src, license, description, wmClass }: - (mkIdeaProduct { + buildIdea = { name, version, src, license, description, wmClass }: + (mkJetBrainsProduct rec { inherit name version src wmClass jdk; - product = "PhpStorm"; + product = "IDEA"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/phpstorm/"; + homepage = "https://www.jetbrains.com/idea/"; inherit description license; longDescription = '' - PhpStorm provides an editor for PHP, HTML and JavaScript - with on-the-fly code analysis, error prevention and - automated refactorings for PHP and JavaScript code. + IDE for Java SE, Groovy & Scala development Powerful + environment for building Google Android apps Integration + with JUnit, TestNG, popular SCMs, Ant & Maven. ''; - maintainers = with maintainers; [ schristo ]; + maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; }); - buildWebStorm = { name, version, src, license, description, wmClass }: - (mkIdeaProduct { + buildPhpStorm = { name, version, src, license, description, wmClass }: + (mkJetBrainsProduct { inherit name version src wmClass jdk; - product = "WebStorm"; + product = "PhpStorm"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/webstorm/"; + homepage = "https://www.jetbrains.com/phpstorm/"; inherit description license; longDescription = '' - WebStorm provides an editor for HTML, JavaScript (incl. Node.js), - and CSS with on-the-fly code analysis, error prevention and - automated refactorings for JavaScript code. + PhpStorm provides an editor for PHP, HTML and JavaScript + with on-the-fly code analysis, error prevention and + automated refactorings for PHP and JavaScript code. ''; - maintainers = with maintainers; [ abaldeau ]; + maintainers = with maintainers; [ schristo ]; platforms = platforms.linux; }; }); buildPycharm = { name, version, src, license, description, wmClass }: - (mkIdeaProduct rec { + (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "PyCharm"; meta = with stdenv.lib; { @@ -115,47 +122,101 @@ let propagatedUserEnvPkgs = [ python ]; }; - buildDataGrip = { name, version, src, license, description, wmClass }: - (mkIdeaProduct { + buildRider = { name, version, src, license, description, wmClass }: + lib.overrideDerivation (mkJetBrainsProduct rec { inherit name version src wmClass jdk; - product = "DataGrip"; + product = "Rider"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/datagrip/"; + homepage = "https://www.jetbrains.com/rider/"; inherit description license; longDescription = '' - DataGrip is a new IDE from JetBrains built for database admins. - It allows you to quickly migrate and refactor relational databases, - construct efficient, statically checked SQL queries and much more. + JetBrains Rider is a new .NET IDE based on the IntelliJ + platform and ReSharper. Rider supports .NET Core, + .NET Framework and Mono based projects. This lets you + develop a wide array of applications including .NET desktop + apps, services and libraries, Unity games, ASP.NET and + ASP.NET Core web applications. ''; - maintainers = with maintainers; [ loskutov ]; + maintainers = [ maintainers.miltador ]; + platforms = platforms.linux; + }; + }) (attrs: { + patchPhase = attrs.patchPhase + '' + # Patch built-in mono for ReSharperHost to start successfully + interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) + patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen + ''; + }); + + buildRubyMine = { name, version, src, license, description, wmClass }: + (mkJetBrainsProduct rec { + inherit name version src wmClass jdk; + product = "RubyMine"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/ruby/"; + inherit description license; + longDescription = description; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; + }); + + buildWebStorm = { name, version, src, license, description, wmClass }: + (mkJetBrainsProduct { + inherit name version src wmClass jdk; + product = "WebStorm"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/webstorm/"; + inherit description license; + longDescription = '' + WebStorm provides an editor for HTML, JavaScript (incl. Node.js), + and CSS with on-the-fly code analysis, error prevention and + automated refactorings for JavaScript code. + ''; + maintainers = with maintainers; [ abaldeau ]; platforms = platforms.linux; }; }); + in { + # Sorted alphabetically + clion = buildClion rec { name = "clion-${version}"; - version = "2016.3.3"; + version = "2017.1"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1zziyg0y51lfybflq83qwd94wcypkv4gh0cdkwfybbk4yidpnz05"; + sha256 = "00fc023ca56f2781864cddc7bd5c2897d837d1db17dd8f987abe046ed4df3ca5"; }; wmClass = "jetbrains-clion"; }; - clion1 = buildClion rec { - name = "clion-${version}"; - version = "1.2.5"; - description = "C/C++ IDE. New. Intelligent. Cross-platform"; + datagrip = buildDataGrip rec { + name = "datagrip-${version}"; + version = "2017.1"; + description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; - sha256 = "0ll1rcnnbd1if6x5rp3qw35lvp5zdzmvyg9n1lha89i34xiw36jp"; + url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; + sha256 = "91ee6a1e43d75a45ae51829835e457da85262410d89e617324d0239ba5625dfa"; }; - wmClass = "jetbrains-clion"; + wmClass = "jetbrains-datagrip"; + }; + + gogland = buildGogland rec { + name = "gogland-${version}"; + version = "171.3780.106"; + description = "Up and Coming Go IDE"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/go/${name}.tar.gz"; + sha256 = "cbe84d07fdec6425d8ac63b0ecd5e04148299c1c0c6d05751523aaaa9360110b"; + }; + wmClass = "jetbrains-gogland"; }; idea14-community = buildIdea rec { @@ -172,12 +233,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.1"; + version = "2017.1.1"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0pfsf7ykwixvljcmrv4gldaaflf13brch70cd6xpax0m89vm22vm"; + sha256 = "1222xkw7n424ihqxyjk352nnx9ka6as7ajwafgb2f27hfiz8d3li"; }; wmClass = "jetbrains-idea-ce"; }; @@ -208,50 +269,38 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.1"; + version = "2017.1.1"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "1858jhmyyb7nhx08yxbn5bfgx9m32r8yqwjxjw17rf8gnfvs8225"; + sha256 = "18z9kv2nk8fgpns8r4ra39hs4d2v3knnwv9a996wrrbsfc9if8lp"; }; wmClass = "jetbrains-idea"; }; - ruby-mine = buildRubyMine rec { - name = "ruby-mine-${version}"; - version = "2016.3.2"; - description = "The Most Intelligent Ruby and Rails IDE"; - license = stdenv.lib.licenses.unfree; - src = fetchurl { - url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1fqlrvhlk09z8nx68qv4nqs5n8ldia3lixsl6r04gsfyl1a69sb6"; - }; - wmClass = "jetbrains-rubymine"; - }; - - ruby-mine7 = buildRubyMine rec { - name = "ruby-mine-${version}"; - version = "7.1.5"; - description = "The Most Intelligent Ruby and Rails IDE"; + phpstorm = buildPhpStorm rec { + name = "phpstorm-${version}"; + version = "2017.1"; + description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l"; + url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; + sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm"; }; - wmClass = "jetbrains-rubymine"; + wmClass = "jetbrains-phpstorm"; }; - ruby-mine8 = buildRubyMine rec { - name = "ruby-mine-${version}"; - version = "8.0.4"; - description = "The Most Intelligent Ruby and Rails IDE"; + phpstorm10 = buildPhpStorm rec { + name = "phpstorm-${version}"; + version = "10.0.4"; + description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a"; + url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; + sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm"; }; - wmClass = "jetbrains-rubymine"; + wmClass = "jetbrains-phpstorm"; }; pycharm-community = buildPycharm rec { @@ -278,28 +327,52 @@ in wmClass = "jetbrains-pycharm"; }; - phpstorm = buildPhpStorm rec { - name = "phpstorm-${version}"; + rider = buildRider rec { + name = "rider-${version}"; + version = "171.3655.1246"; + description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/resharper/riderRS-${version}.tar.gz"; + sha256 = "90f9f8f1919e0f1dad42387f1a308483448323b089c13c409f3dd4d52992266b"; + }; + wmClass = "jetbrains-rider"; + }; + + ruby-mine = buildRubyMine rec { + name = "ruby-mine-${version}"; version = "2017.1"; - description = "Professional IDE for Web and PHP developers"; + description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm"; + url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; + sha256 = "6c27f43ddc385ffba2cb2f011b80ab46d9b128d0fccf3b4ea43272fe36401a3a"; }; - wmClass = "jetbrains-phpstorm"; + wmClass = "jetbrains-rubymine"; }; - phpstorm10 = buildPhpStorm rec { - name = "phpstorm-${version}"; - version = "10.0.4"; - description = "Professional IDE for Web and PHP developers"; + ruby-mine7 = buildRubyMine rec { + name = "ruby-mine-${version}"; + version = "7.1.5"; + description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm"; + url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; + sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l"; }; - wmClass = "jetbrains-phpstorm"; + wmClass = "jetbrains-rubymine"; + }; + + ruby-mine8 = buildRubyMine rec { + name = "ruby-mine-${version}"; + version = "8.0.4"; + description = "The Most Intelligent Ruby and Rails IDE"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; + sha256 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a"; + }; + wmClass = "jetbrains-rubymine"; }; webstorm = buildWebStorm rec { @@ -337,16 +410,4 @@ in }; wmClass = "jetbrains-webstorm"; }; - - datagrip = buildDataGrip rec { - name = "datagrip-${version}"; - version = "2016.3.2"; - description = "Your Swiss Army Knife for Databases and SQL"; - license = stdenv.lib.licenses.unfree; - src = fetchurl { - url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "19njb6i7nl6szql7cy99jmig59b304c6im3988p1dd8dj2j6csv3"; - }; - wmClass = "jetbrains-datagrip"; - }; } diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix new file mode 100644 index 000000000000..ae4f1e6ad525 --- /dev/null +++ b/pkgs/applications/editors/jucipp/default.nix @@ -0,0 +1,73 @@ +{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx, + boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, + libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, + coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, binutils, ctags }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "juicipp-${version}"; + version = "1.2.3"; + + meta = { + homepage = https://github.com/cppit/jucipp; + description = "A lightweight, platform independent C++-IDE with support for C++11, C++14, and experimental C++17 features depending on libclang version"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ xnwdd ]; + }; + + src = fetchgit { + url = "https://github.com/cppit/jucipp.git"; + rev = "refs/tags/v${version}"; + deepClone = true; + sha256 = "0xp6ijnrggskjrvscp204bmdpz48l5a8nxr9abp17wni6akb5wiq"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ + dbus_libs + openssl + libxml2 + gnome3.gtksourceview + at_spi2_core + pcre + epoxy + boost + libXdmcp + cmake + aspell + libgit2 + libxkbcommon + gnome3.gtkmm3 + libpthreadstubs + gnome3.gtksourceviewmm + llvmPackages.clang.cc + llvmPackages.lldb + gnome3.dconf + ]; + + + lintIncludes = let + p = "arguments.emplace_back(\"-I"; + e = "\");"; + v = stdenv.lib.getVersion llvmPackages.clang; + in + p+llvmPackages.libcxx+"/include/c++/v1"+e + +p+llvmPackages.clang-unwrapped+"/lib/clang/"+v+"/include/"+e + +p+glibc.dev+"/include"+e; + + preConfigure = '' + sed -i 's|liblldb LIBLLDB_LIBRARIES|liblldb LIBNOTHING|g' CMakeLists.txt + sed -i 's|> arguments;|> arguments; ${lintIncludes}|g' src/source_clang.cc + ''; + cmakeFlags = "-DLIBLLDB_LIBRARIES=${stdenv.lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so"; + postInstall = '' + mv $out/bin/juci $out/bin/.juci + makeWrapper "$out/bin/.juci" "$out/bin/juci" \ + --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake binutils llvmPackages.clang ]}" \ + --set NO_AT_BRIDGE 1 \ + --set ASPELL_CONF "dict-dir ${aspellDicts.en}/lib/aspell" + ''; + +} diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 4590939b516a..067aff5ee69b 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -3,25 +3,20 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "kakoune-nightly-${version}"; - version = "2017-02-09"; + name = "kakoune-unstable-${version}"; + version = "2017-04-12"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "9ba1665e58ee84b6596d89e6ef75f7c32e7c6c14"; - sha256 = "1l25mzq64a481qlsyh25rzp5rzajrkx4dq29677z85lnjqn30wbi"; + rev = "7482d117cc85523e840dff595134dcb9cdc62207"; + sha256 = "08j611y192n9vln9i94ldlvz3k0sg79dkmfc0b1vczrmaxhpgpfh"; }; buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ]; - buildPhase = '' - sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' src/Makefile - substituteInPlace src/Makefile --replace "boost_regex-mt" "boost_regex" + postPatch = '' export PREFIX=$out - (cd src && make ) - ''; - - installPhase = '' - (cd src && make install) + cd src + sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' Makefile ''; meta = { diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 68f5e14891fa..74a83c1278af 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, zlib, glib, alsaLib, makeDesktopItem +{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify }: diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index f3a5a27bd366..bfc3b7c79faf 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "1hjxr0kgq3q1fcns9y4lj0dbhjf33j3pa2wayrb3p3c8v3sbrh8m"; + sha256 = "02vdnv30ms2s53ch5j4ldch5sxwjsg3098zkvwrwhi9k6yxshdg9"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; @@ -36,15 +36,6 @@ in stdenv.mkDerivation rec { --sysconfdir=/etc ${optionalString (!enableNls) "--disable-nls"} ${optionalString enableTiny "--enable-tiny"} - '' - # Unclear why (perhaps an impurity?) but for some reason it decides that REG_ENHANCED is available - # during configure but then can't find it at build time. - + optionalString stdenv.isDarwin '' - nano_cv_flag_reg_extended=REG_EXTENDED - ''; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace src/text.c --replace "__time_t" "time_t" ''; postInstall = '' diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 89ae2e04eac0..52223dafeb7f 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -2,16 +2,17 @@ stdenv.mkDerivation rec { pname = "texstudio"; - version = "2.11.2"; + version = "2.12.4"; name = "${pname}-${version}"; altname="Texstudio"; src = fetchurl { url = "mirror://sourceforge/texstudio/${name}.tar.gz"; - sha256 = "1p6ja5y5902y814f3f5mafh0y8vj682ghrarx1pbm4r5ap8x9z82"; + sha256 = "03917faqyy0a1k6b86blc2fcards5a1819ydgkc4jlhwiaym4iyw"; }; - buildInputs = [ qt4 qmake4Hook poppler_qt4 zlib pkgconfig ]; + nativeBuildInputs = [ qmake4Hook pkgconfig ]; + buildInputs = [ qt4 poppler_qt4 zlib ]; qmakeFlags = [ "NO_APPDATA=True" ]; @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { LaTeX editing with completion, structure viewer, preview, spell checking and support of any compilation chain. ''; - homepage = "http://texstudio.sourceforge.net/"; + homepage = http://texstudio.sourceforge.net; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ cfouche ]; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index b6734d09d0e7..3d710296219c 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile }: let - version = "1.11.1"; + version = "1.11.2"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "14wdblh7q3m5qdsm34dpg5p7qk6llrbqk60md8wd0fb4chpvrq94"; - "x86_64-linux" = "0rmzvaiar3y062mbrggiwjbwxs7izcih5333rn208ax4jxmbk4pc"; - "x86_64-darwin" = "1f3zdwsz0l6r7c2k25a7j5m0dl78219jzg4axcmbfa2qcs2hw0x6"; + "i686-linux" = "0cd3iwd5aizixfxc6ayrpvx6k1zk8nsfhd8i3rgz4p4zzfnx6ri5"; + "x86_64-linux" = "1y3qgm7p1vchh02mqgn8d8pxxnifxfs6hbv01q8zjw3gb7m4anw3"; + "x86_64-darwin" = "1v8x466080rpm0rfiv1mr2adbpia6j5v9pbsspwm0ndc7ly0h71k"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 1a80c1466d46..68ab287f1a65 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -11,12 +11,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "2.2.3"; + version = "2.2.4"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1b33859585bf283577680c61e3c0ea4e48214371453b9c17a86664d2fbda48a0"; + sha256 = "1n7rddkxwcifc3kcdlnar9w562xv4h78fqkkn27jihqzp3b4am5x"; }; buildInputs = diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 00c0da7a78e3..f11791016923 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -29,6 +29,7 @@ , libgphoto2 , libkipi , liblqr1 +, libqtav , libusb1 , marble , mysql @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { libgphoto2 libkipi liblqr1 + libqtav libusb1 marble.unwrapped mysql @@ -99,6 +101,7 @@ stdenv.mkDerivation rec { "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" + "-DENABLE_MEDIAPLAYER=1" ]; fixupPhase = '' diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 85c0f58174a4..2b0dde210c58 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig -, djvulibre, qt4, xorg, libtiff }: +, djvulibre, qt4, xorg, libtiff +, darwin }: stdenv.mkDerivation rec { name = "djview-${version}"; @@ -12,7 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ djvulibre qt4 xorg.libXt libtiff ]; + buildInputs = [ djvulibre qt4 xorg.libXt libtiff ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AGL ]; passthru = { mozillaPlugin = "/lib/netscape/plugins"; diff --git a/pkgs/applications/graphics/tesseract/4.x.nix b/pkgs/applications/graphics/tesseract/4.x.nix new file mode 100644 index 000000000000..577bff91e353 --- /dev/null +++ b/pkgs/applications/graphics/tesseract/4.x.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkgconfig +, leptonica, libpng, libtiff, icu, pango, opencl-headers + +# Supported list of languages or `null' for all available languages +, enableLanguages ? null +}: + +stdenv.mkDerivation rec { + name = "tesseract-${version}"; + version = "4.00.00alpha-git-20170410"; + + src = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tesseract"; + rev = "36a995bdc92eb2dd8bc5a63205708944a3f990a1"; + sha256 = "0xz3krvap8sdm27v1dyb34lcdmx11wzvxyszpppfsfmjgkvg19bq"; + }; + + tessdata = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tessdata"; + rev = "8bf2e7ad08db9ca174ae2b0b3a7498c9f1f71d40"; + sha256 = "0idwkv4qsmmqhrxcgyhy32yldl3vk054m7dkv4fjswfnalgsx794"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook autoconf-archive ]; + buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; + + # Copy the .traineddata files of the languages specified in enableLanguages + # into `$out/share/tessdata' and check afterwards if copying was successful. + postInstall = let + mkArg = lang: "-iname ${stdenv.lib.escapeShellArg "${lang}.traineddata"}"; + mkFindArgs = stdenv.lib.concatMapStringsSep " -o " mkArg; + findLangArgs = if enableLanguages != null + then "\\( ${mkFindArgs enableLanguages} \\)" + else "-iname '*.traineddata'"; + in '' + numLangs="$(find "$tessdata" -mindepth 1 -maxdepth 1 -type f \ + ${findLangArgs} -exec cp -t "$out/share/tessdata" {} + -print | wc -l)" + + ${if enableLanguages != null then '' + expected=${toString (builtins.length enableLanguages)} + '' else '' + expected="$(ls -1 "$tessdata/"*.traineddata | wc -l)" + ''} + + if [ "$numLangs" -ne "$expected" ]; then + echo "Expected $expected languages, but $numLangs" \ + "were copied to \`$out/share/tessdata'" >&2 + exit 1 + fi + ''; + + meta = { + description = "OCR engine"; + homepage = http://code.google.com/p/tesseract-ocr/; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 1f1da9a389f2..14335a4c2a9d 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchFromGitHub, pkgconfig, leptonica, libpng, libtiff -, icu, pango, opencl-headers +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, leptonica, libpng, libtiff, icu, pango, opencl-headers + +# Supported list of languages or `null' for all available languages +, enableLanguages ? null }: stdenv.mkDerivation rec { name = "tesseract-${version}"; - version = "3.04.01"; + version = "3.05.00"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - sha256 = "0h1x4z1h86n2gwknd0wck6gykkp99bmm02lg4a47a698g4az6ybv"; + sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30"; }; tessdata = fetchFromGitHub { @@ -20,12 +23,35 @@ stdenv.mkDerivation rec { sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; LIBLEPT_HEADERSDIR = "${leptonica}/include"; - postInstall = "cp -Rt \"$out/share/tessdata\" \"$tessdata/\"*"; + # Copy the .traineddata files of the languages specified in enableLanguages + # into `$out/share/tessdata' and check afterwards if copying was successful. + postInstall = let + mkArg = lang: "-iname ${stdenv.lib.escapeShellArg "${lang}.traineddata"}"; + mkFindArgs = stdenv.lib.concatMapStringsSep " -o " mkArg; + findLangArgs = if enableLanguages != null + then "\\( ${mkFindArgs enableLanguages} \\)" + else "-iname '*.traineddata'"; + in '' + numLangs="$(find "$tessdata" -mindepth 1 -maxdepth 1 -type f \ + ${findLangArgs} -exec cp -t "$out/share/tessdata" {} + -print | wc -l)" + + ${if enableLanguages != null then '' + expected=${toString (builtins.length enableLanguages)} + '' else '' + expected="$(ls -1 "$tessdata/"*.traineddata | wc -l)" + ''} + + if [ "$numLangs" -ne "$expected" ]; then + echo "Expected $expected languages, but $numLangs" \ + "were copied to \`$out/share/tessdata'" >&2 + exit 1 + fi + ''; meta = { description = "OCR engine"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 39f3a12b90aa..8d34a126daaf 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.82.0"; + version = "2.83.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "073iarhjsapqf1g8ji1w835biixybqq869flq58vkz37wjmray8k"; + sha256 = "1ar6hkcl50lhgwccss759201cqgnwasqmhw9japgnz04fj66w5ln"; }; patches = [ @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; + enableParallelBuilding = true; + nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/pkgs/applications/misc/dbvisualizer/default.nix index f6dd06e6c896..7aa19ffb3017 100644 --- a/pkgs/applications/misc/dbvisualizer/default.nix +++ b/pkgs/applications/misc/dbvisualizer/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, jre, coreutils, makeWrapper }: stdenv.mkDerivation { - name = "dbvisualizer-9.5"; + name = "dbvisualizer-9.5.7"; src = fetchurl { - url = https://www.dbvis.com/product_download/dbvis-9.5/media/dbvis_unix_9_5.tar.gz; - sha256 = "1bdc03039b50807206fd72ecf8ba0b940f5bb0386f483e10b7c0b2fa75cac021"; + url = https://www.dbvis.com/product_download/dbvis-9.5.7/media/dbvis_unix_9_5_7.tar.gz; + sha256 = "1xv4fw7cji2ffvv7z8vjl5lap512pj60s2ynihirrqld7pmklnyr"; }; buildInputs = [ makeWrapper ]; - + installPhase = '' mkdir -p $out/bin cp -a . $out - ln -sf $out/dbvis $out/bin + ln -sf $out/dbvis $out/bin wrapProgram $out/bin/dbvis --set INSTALL4J_JAVA_HOME ${jre} ''; - + meta = { description = "The universal database tool"; homepage = https://www.dbvis.com/; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 68c9246c24b1..d6da900656cc 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -22,9 +22,13 @@ stdenv.mkDerivation rec { sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp src/GoldenCheetah $out/bin wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" + + runHook postInstall ''; meta = { description = "Performance software for cyclists, runners and triathletes"; diff --git a/pkgs/applications/misc/gpsbabel/clang-4.patch b/pkgs/applications/misc/gpsbabel/clang-4.patch new file mode 100644 index 000000000000..6bd19ae60440 --- /dev/null +++ b/pkgs/applications/misc/gpsbabel/clang-4.patch @@ -0,0 +1,22 @@ +diff --git a/bushnell.cc b/bushnell.cc +index 8fa844d..40707c4 100644 +--- a/bushnell.cc ++++ b/bushnell.cc +@@ -135,7 +135,7 @@ bushnell_get_icon_from_name(QString name) + name = "Waypoint"; + } + +- for (t = bushnell_icons; t->icon > 0; t++) { ++ for (t = bushnell_icons; t->icon != 0; t++) { + if (0 == name.compare(t->icon, Qt::CaseInsensitive)) { + return t->symbol; + } +@@ -147,7 +147,7 @@ static const char* + bushnell_get_name_from_symbol(signed int s) + { + icon_mapping_t* t; +- for (t = bushnell_icons; t->icon > 0; t++) { ++ for (t = bushnell_icons; t->icon != 0; t++) { + if (s == t->symbol) { + return t->icon; + } diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 6c248bc4dfa5..ace89cd8a21b 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, zlib, qt4, which }: +{ lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }: stdenv.mkDerivation rec { name = "gpsbabel-${version}"; @@ -12,13 +12,15 @@ stdenv.mkDerivation rec { }; patches = [ + ./clang-4.patch (fetchpatch { url = https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip; sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr"; }) ]; - buildInputs = [ zlib qt4 which ]; + buildInputs = [ zlib qt4 which ] + ++ lib.optionals stdenv.isDarwin [ IOKit ]; /* FIXME: Building the documentation, with "make doc", requires this: @@ -40,11 +42,11 @@ stdenv.mkDerivation rec { patchShebangs testo substituteInPlace testo \ --replace "-x /usr/bin/hexdump" "" - '' + ( + '' # The raymarine and gtm tests fail on i686 despite -ffloat-store. - if stdenv.isi686 then "rm -v testo.d/raymarine.test testo.d/gtm.test;" - else "" - ); + + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;" + # The gtm, kml and tomtom asc tests fail on darwin, see PR #23572. + + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test"; meta = with stdenv.lib; { description = "Convert, upload and download data from GPS and Map programs"; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index edc8bbc3f77e..5b977d13796a 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,27 +1,31 @@ -{ stdenv, fetchFromGitHub, qmakeHook }: +{ stdenv, fetchFromGitHub, qmakeHook, qtbase, qttools, makeQtWrapper }: stdenv.mkDerivation rec { name = "gpxsee-${version}"; - version = "2.17"; + version = "4.3"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1422kgj972ydasqqm0k02qf3v2py7if2ibri7yjg8awqilacy6by"; + sha256 = "15f686frxlrmdvh5cc837kx62g0ihqj4vb87i8433g7l5vqkv3lf"; }; - nativeBuildInputs = [ qmakeHook ]; - - patchPhase = '' - sed -i '/lang\/gpxsee_cs.qm/d' gpxsee.qrc + nativeBuildInputs = [ qmakeHook qttools makeQtWrapper ]; + + preConfigure = '' + substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee + lrelease lang/*.ts ''; preFixup = '' - mkdir -p $out/bin - cp GPXSee $out/bin + install -Dm755 GPXSee $out/bin/GPXSee + wrapQtProgram $out/bin/GPXSee + + mkdir -p $out/share/gpxsee + cp pkg/maps.txt $out/share/gpxsee ''; - + meta = with stdenv.lib; { homepage = http://tumic.wz.cz/gpxsee; description = "GPX viewer and analyzer"; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 05a4db7a2500..57b844de97b8 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.18.1"; + version = "0.20.2"; goPackagePath = "github.com/spf13/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "spf13"; repo = "hugo"; rev = "v${version}"; - sha256 = "1nmabcrq96b339in2yr2zwcd41nadr4bha3rlpyaxlzbyyhz2f81"; + sha256 = "1dvd9kiqp87cbf027kvyqb282pxs8qm16r1dk74l5drranfvkszy"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 0a95b083c0b8..e2e2d093dded 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -1,353 +1,380 @@ [ { - goPackagePath = "golang.org/x/sys"; + goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; - sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + url = "https://github.com/BurntSushi/toml"; + rev = "99064174e013895bbd9b025c31100bd1d9b590ca"; + sha256 = "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9"; }; } { - goPackagePath = "gopkg.in/yaml.v2"; + goPackagePath = "github.com/PuerkitoBio/purell"; fetch = { type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"; + sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; }; } { - goPackagePath = "golang.org/x/crypto"; + goPackagePath = "github.com/PuerkitoBio/urlesc"; fetch = { type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "5bd2802263f21d8788851d5305584c82a5c75d7e"; + sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp"; }; } { - goPackagePath = "github.com/gorilla/websocket"; + goPackagePath = "github.com/bep/gitmap"; fetch = { type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "a622679ebd7a3b813862379232f645f8e690e43f"; - sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + url = "https://github.com/bep/gitmap"; + rev = "dcb907b39a0690430d435eb8f63cd8811961231f"; + sha256 = "0bw4spyiidrvd8rls9g57mwxykfmv57qi9mcnjadbqrpv92br856"; }; } { - goPackagePath = "github.com/inconshreveable/mousetrap"; + goPackagePath = "github.com/bep/inflect"; fetch = { type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; - sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"; + url = "https://github.com/bep/inflect"; + rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69"; + sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3"; }; } { - goPackagePath = "github.com/kardianos/osext"; + goPackagePath = "github.com/chaseadamsio/goorgeous"; fetch = { type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; - sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + url = "https://github.com/chaseadamsio/goorgeous"; + rev = "42b0ec184e93fc9fd2c0402f099a4939aba68407"; + sha256 = "00mlv64q34d0vdq7p88hlsck4lsnk2pnxghx1jzy99r7wvs34am3"; }; } { - goPackagePath = "github.com/hashicorp/hcl"; + goPackagePath = "github.com/cpuguy83/go-md2man"; fetch = { type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "54864211433d45cb780682431585b3e573b49e4a"; - sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa"; + sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6"; }; } { - goPackagePath = "github.com/hashicorp/go-multierror"; + goPackagePath = "github.com/dchest/cssmin"; fetch = { type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "56912fb08d85084aa318edcf2bba735b97cf35c5"; - sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; + url = "https://github.com/dchest/cssmin"; + rev = "fb8d9b44afdc258bfff6052d3667521babcb2239"; + sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; }; } { - goPackagePath = "github.com/BurntSushi/toml"; + goPackagePath = "github.com/eknkc/amber"; fetch = { type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; - sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + url = "https://github.com/eknkc/amber"; + rev = "9be5e8aae85904f63d505e0c00e5e0881d44ef4d"; + sha256 = "1hmsqxwajgpmg1svzjqxf4n81qy7qs6m39cjv69jkhz9lpwc305j"; }; } { - goPackagePath = "github.com/mitchellh/mapstructure"; + goPackagePath = "github.com/fortytw2/leaktest"; fetch = { type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "281073eb9eb092240d33ef253c404f1cca550309"; - sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + url = "https://github.com/fortytw2/leaktest"; + rev = "0db74e8cd5adacfcc982838c6e185789e4b44e14"; + sha256 = "11s04f1pliqw185ai1dbpqn5rahc3yzv2fp5zdanjvql4168499m"; }; } { - goPackagePath = "golang.org/x/text"; + goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { type = "git"; - url = "https://go.googlesource.com/text"; - rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; - sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "4da3e2cfbabc9f751898f250b49f2439785783a1"; + sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3"; }; } { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + goPackagePath = "github.com/gorilla/websocket"; fetch = { type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; - sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; + url = "https://github.com/gorilla/websocket"; + rev = "adf16b31781325cbd41085c5be901d95b4d1f33d"; + sha256 = "0f93k3igbqqwsl734lxnkbfajc4lcyzg4szg15vb26qn939b5ccx"; }; } { - goPackagePath = "github.com/russross/blackfriday"; + goPackagePath = "github.com/hashicorp/hcl"; fetch = { type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "d18b67ae0afd61dae240896eae1785f00709aa31"; - sha256 = "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"; + url = "https://github.com/hashicorp/hcl"; + rev = "80e628d796135357b3d2e33a985c666b9f35eee1"; + sha256 = "0l85a7ir60hycb3mqsxmrz18f1kax03k55afsahr8xf46pjp5pyb"; }; } { - goPackagePath = "github.com/yosssi/ace"; + goPackagePath = "github.com/inconshreveable/mousetrap"; fetch = { type = "git"; - url = "https://github.com/yosssi/ace"; - rev = "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d"; - sha256 = "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; }; } { - goPackagePath = "github.com/spf13/viper"; + goPackagePath = "github.com/kardianos/osext"; fetch = { type = "git"; - url = "https://github.com/spf13/viper"; - rev = "ec4eb2fa8549869ae7a2accd4fcc83d1c0555c15"; - sha256 = "018niqyrg09andj3g08jalflq2ypz9bp7qb1mbk50kfly29lkih7"; + url = "https://github.com/kardianos/osext"; + rev = "9b883c5eb462dd5cb1b0a7a104fe86bc6b9bd391"; + sha256 = "0cyhbgsxwdfnwy57pdfivvjfy951gxbg9qlsjbwm6vs3gfws07mr"; }; } { - goPackagePath = "github.com/spf13/pflag"; + goPackagePath = "github.com/kr/fs"; fetch = { type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "b83537d79690b75cac5e021b036ae16792bf0f20"; - sha256 = "19blhq00rnynv11nnvixisx4h1429rp5bik13k661ixw0421qqyx"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; }; } { - goPackagePath = "github.com/spf13/jwalterweatherman"; + goPackagePath = "github.com/kyokomi/emoji"; fetch = { type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "33c24e77fb80341fe7130ee7c594256ff08ccc46"; - sha256 = "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z"; + url = "https://github.com/kyokomi/emoji"; + rev = "7e06b236c489543f53868841f188a294e3383eab"; + sha256 = "1q2j0k5a8qqka1syc9zwmf1cvm6k628kf2g1nmghp2kdr7q1xmyb"; }; } { - goPackagePath = "github.com/fsnotify/fsnotify"; + goPackagePath = "github.com/magiconair/properties"; fetch = { type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; - sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; + url = "https://github.com/magiconair/properties"; + rev = "9c47895dc1ce54302908ab8a43385d1f5df2c11c"; + sha256 = "0497bacr3gc7352gcwb07wyw7vb9m04xfd82mw0hpnzzw3kfnav3"; }; } { - goPackagePath = "github.com/magiconair/properties"; + goPackagePath = "github.com/miekg/mmark"; fetch = { type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "c265cfa48dda6474e208715ca93e987829f572f8"; - sha256 = "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3"; + url = "https://github.com/miekg/mmark"; + rev = "2d4f1dd6f87cad351b9323bbaa6f6c586f0c4bee"; + sha256 = "1ak54nvmryx73g16q6qaac9x0klhbxxmk1j6zlnfvvibnkj2pa90"; }; } { - goPackagePath = "github.com/bep/inflect"; + goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; - url = "https://github.com/bep/inflect"; - rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69"; - sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "bfdb1a85537d60bc7e954e600c250219ea497417"; + sha256 = "141kkh801jyp1r6hba14krydqg1iivp13j12is70j0g05z9fbji8"; }; } { - goPackagePath = "github.com/eknkc/amber"; + goPackagePath = "github.com/nicksnyder/go-i18n"; fetch = { type = "git"; - url = "https://github.com/eknkc/amber"; - rev = "91774f050c1453128146169b626489e60108ec03"; - sha256 = "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis"; + url = "https://github.com/nicksnyder/go-i18n"; + rev = "4df9b06c0c1ffd8538a3cfa9d888f8f52985b302"; + sha256 = "1cbbvq9l822p7vrscvaah3zybsj5yxcsq9fgvgsg062njbb0x41f"; }; } { - goPackagePath = "github.com/spf13/afero"; + goPackagePath = "github.com/pelletier/go-buffruneio"; fetch = { type = "git"; - url = "https://github.com/spf13/afero"; - rev = "1a8ecf8b9da1fb5306e149e83128fc447957d2a8"; - sha256 = "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw"; + url = "https://github.com/pelletier/go-buffruneio"; + rev = "c37440a7cf42ac63b919c752ca73a85067e05992"; + sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; }; } { - goPackagePath = "github.com/spf13/cast"; + goPackagePath = "github.com/pelletier/go-toml"; fetch = { type = "git"; - url = "https://github.com/spf13/cast"; - rev = "27b586b42e29bec072fe7379259cc719e1289da6"; - sha256 = "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x"; + url = "https://github.com/pelletier/go-toml"; + rev = "fee7787d3f811af92276f5ff10107092e95b7a1d"; + sha256 = "0srx5hr35f9qzn5dnqqa0msyjknwn7vcq0jmlkvfxgaq0ygd6s3r"; }; } { - goPackagePath = "github.com/spf13/cobra"; + goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "bc81c21bd0d8be5ba2d6630a505d79d4467566e7"; - sha256 = "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r"; + url = "https://github.com/pkg/errors"; + rev = "248dadf4e9068a0b3e79f02ed0a610d935de5302"; + sha256 = "03l80r0i9bxl0vz363w62k4a8apzglgbrz6viwym3044sxkl1qks"; }; } { - goPackagePath = "github.com/dchest/cssmin"; + goPackagePath = "github.com/pkg/sftp"; fetch = { type = "git"; - url = "https://github.com/dchest/cssmin"; - rev = "fb8d9b44afdc258bfff6052d3667521babcb2239"; - sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; + url = "https://github.com/pkg/sftp"; + rev = "4d0e916071f68db74f8a73926335f809396d6b42"; + sha256 = "0l4n4ld0lx53s0hgz5rhk8gn7kr51adsr0cs6wlqm296xlcfp52h"; }; } { - goPackagePath = "github.com/spf13/fsync"; + goPackagePath = "github.com/russross/blackfriday"; fetch = { type = "git"; - url = "https://github.com/spf13/fsync"; - rev = "cb2da332d00cbc04e4f3f677520dc3e7cc11874b"; - sha256 = "03ib2xj80cbz77hx2baanyi50qr40akrybg49fzdvdm3lv9x100z"; + url = "https://github.com/russross/blackfriday"; + rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70"; + sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k"; }; } { - goPackagePath = "github.com/cpuguy83/go-md2man"; + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; fetch = { type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599"; - sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2"; + sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg"; }; } { - goPackagePath = "github.com/miekg/mmark"; + goPackagePath = "github.com/spf13/afero"; fetch = { type = "git"; - url = "https://github.com/miekg/mmark"; - rev = "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a"; - sha256 = "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa"; + url = "https://github.com/spf13/afero"; + rev = "9be650865eab0c12963d8753212f4f9c66cdcf12"; + sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34"; }; } { - goPackagePath = "github.com/spf13/nitro"; + goPackagePath = "github.com/spf13/cast"; fetch = { type = "git"; - url = "https://github.com/spf13/nitro"; - rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"; - sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; + url = "https://github.com/spf13/cast"; + rev = "ce135a4ebeee6cfe9a26c93ee0d37825f26113c7"; + sha256 = "1a2ahiyynn1kdjznqvzjfm5g5bc098gfw857bw9qikhdljvsnjiy"; }; } { - goPackagePath = "github.com/PuerkitoBio/purell"; + goPackagePath = "github.com/spf13/cobra"; fetch = { type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3"; - sha256 = "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb"; + url = "https://github.com/spf13/cobra"; + rev = "7be4beda01ec05d0b93d80b3facd2b6f44080d94"; + sha256 = "0jd2ya8kn763z16c3q5jl1x6raw2f3xq3vbaf4ppiy70zqzscmyg"; }; } { - goPackagePath = "github.com/pkg/sftp"; + goPackagePath = "github.com/spf13/fsync"; fetch = { type = "git"; - url = "https://github.com/pkg/sftp"; - rev = "d4c18e7ffdc496a38de67dde6e29b2f364afc472"; - sha256 = "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj"; + url = "https://github.com/spf13/fsync"; + rev = "12a01e648f05a938100a26858d2d59a120307a18"; + sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv"; }; } { - goPackagePath = "github.com/kr/fs"; + goPackagePath = "github.com/spf13/jwalterweatherman"; fetch = { type = "git"; - url = "https://github.com/kr/fs"; - rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; - sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66"; + sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8"; }; } { - goPackagePath = "github.com/kyokomi/emoji"; + goPackagePath = "github.com/spf13/nitro"; fetch = { type = "git"; - url = "https://github.com/kyokomi/emoji"; - rev = "17c5e7085c9d59630aa578df67f4469481fbe7a9"; - sha256 = "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp"; + url = "https://github.com/spf13/nitro"; + rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"; + sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; }; } { - goPackagePath = "github.com/pkg/errors"; + goPackagePath = "github.com/spf13/pflag"; fetch = { type = "git"; - url = "https://github.com/pkg/errors"; - rev = "494e70f7620561491c2ca11e185bbef4b70060da"; - sha256 = "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9"; + url = "https://github.com/spf13/pflag"; + rev = "9ff6c6923cfffbcd502984b8e0c80539a94968b7"; + sha256 = "0mfrxzyl8x7araa126lh8l3sihbbgfbzgkrg3v3cx7y4n3wrsqvn"; }; } { - goPackagePath = "github.com/PuerkitoBio/urlesc"; + goPackagePath = "github.com/spf13/viper"; fetch = { type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587"; - sha256 = "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni"; + url = "https://github.com/spf13/viper"; + rev = "7538d73b4eb9511d85a9f1dfef202eeb8ac260f4"; + sha256 = "0i4q715bjp018zw1b52zgx79j4s7s8l26dyrw8cslshibkx0frnl"; }; } { - goPackagePath = "github.com/nicksnyder/go-i18n"; + goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; - url = "https://github.com/nicksnyder/go-i18n"; - rev = "e6c90c3ceece7f43060f843b495c3c9c031f5575"; - sha256 = "1i1hqvq05lk12wnrhayca66pvfbyjnj7dm0lr0hn5qhb2i8k84kd"; + url = "https://github.com/stretchr/testify"; + rev = "4d4bfba8f1d1027c4fdbe371823030df51419987"; + sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp"; }; } { - goPackagePath = "github.com/pelletier/go-toml"; + goPackagePath = "github.com/yosssi/ace"; fetch = { type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "45932ad32dfdd20826f5671da37a5f3ce9f26a8d"; - sha256 = "1rs25xqlpz2j9gqii144qnkvhsgzhwgy9ild7yvxhnbs2mybgix7"; + url = "https://github.com/yosssi/ace"; + rev = "ea038f4770b6746c3f8f84f14fa60d9fe1205b56"; + sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f"; }; } { - goPackagePath = "github.com/pelletier/go-buffruneio"; + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; - url = "https://github.com/pelletier/go-buffruneio"; - rev = "df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d"; - sha256 = "0jwn2g4jfdb3wvpqisd8h055099pwx6c5i3bb4zxk5l9vybg1c5f"; + url = "https://go.googlesource.com/crypto"; + rev = "453249f01cfeb54c3d549ddb75ff152ca243f9d8"; + sha256 = "0akybbzgi3v507a39bgnkk79rfhj8gflr7538g5a0177z5i9ygwa"; }; } { - goPackagePath = "github.com/bep/gitmap"; + goPackagePath = "golang.org/x/net"; fetch = { type = "git"; - url = "https://github.com/bep/gitmap"; - rev = "a1a71abe12823e27ae7507189fe2e914ba9626ac"; - sha256 = "0qfhb72y6wbypaqv6dkl42syifnhps3qcy1karpd6ziw4pxak18g"; + url = "https://go.googlesource.com/net"; + rev = "906cda9512f77671ab44f8c8563b13a8e707b230"; + sha256 = "0aa33n5a2zzrm2pnjyc3xkdmf8hq2qpafgdp8v6fxfb0swqjl2n3"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "075e574b89e4c2d22f2286a7e2b919519c6f3547"; + sha256 = "1p38siwqcbd592lphaqpigl7scshkfy67k6jcwscbcsl6akw51km"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "0ad425fe45e885577bef05dc1c50f72e33188b16"; + sha256 = "1jz0i8iagfd703flx5z006kisjixpm8iy4hiwywgbh31wypsxxyl"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a3f3340b5840cee44f372bddb5880fcbc419b46a"; + sha256 = "1djb53a8ikwgkfpf8namgf4d8pq1mq6q9q2c7q0z8x4dxf3whxj7"; }; } ] diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 6dd0f532f183..753d27b33767 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "11639"; + version = "11826"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1xq074jfk58gh5xmm8s9sjbcbnl34dpx7wsgq9n60phciya90sfb"; + sha256 = "0x59n6klkxkaqcqgbkscdynyp0grfxdil2fxmg710yp8vkzg0zk2"; }; phases = [ "installPhase" ]; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index a5defaf5c29b..e103f62fd3c9 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassx-community-${version}"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "1zamk3dc44fn61b880i3l1r0np2sx2hs05cvcf2x4748r3xicacf"; + sha256 = "1znnw2xpv58x0rbpmm4y662377mbmcilhf8mhhjsz8vhahms33a8"; }; cmakeFlags = optional (withKeePassHTTP) [ "-DWITH_XC_HTTP=ON" ]; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 8792a07e3e9b..cdde0beb8270 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,26 +1,33 @@ -{ stdenv, lib, cmake, plasma-framework, fetchFromGitHub }: +{ stdenv, lib, cmake, xorg, plasma-framework, fetchFromGitHub, kdeWrapper }: -let version = "0.5.98"; in +let version = "0.6.0"; -stdenv.mkDerivation { - name = "latte-dock-${version}"; + unwrapped = stdenv.mkDerivation { + name = "latte-dock-${version}"; - src = fetchFromGitHub { - owner = "psifidotos"; - repo = "Latte-Dock"; - rev = version; - sha256 = "0z02ipbbv0dmcxs2g3dq5h62klhijni1i4ikq903hjg0j2cqg5xh"; - }; + src = fetchFromGitHub { + owner = "psifidotos"; + repo = "Latte-Dock"; + rev = "v${version}"; + sha256 = "1967hx4lavy96vvik8d5m2c6ycd2mlf9cmhrv40zr0784ni0ikyv"; + }; - buildInputs = [ plasma-framework ]; + buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { - description = "Dock-style app launcher based on Plasma frameworks"; - homepage = https://github.com/psifidotos/Latte-Dock; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = [ maintainers.benley ]; - }; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Dock-style app launcher based on Plasma frameworks"; + homepage = https://github.com/psifidotos/Latte-Dock; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.benley ]; + }; + }; + +in kdeWrapper { + inherit unwrapped; + targets = [ "bin/latte-dock" ]; } diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index aceaf43ac976..026a1289fb61 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -21,11 +21,11 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { name = "polybar-${version}"; - version = "3.0.4"; + version = "3.0.5"; src = fetchgit { url = "https://github.com/jaagr/polybar"; - rev = "1f31870d43f5cd87a5529a55b1d2d3e64105e0af"; - sha256 = "1nhj4npqhs6zy161931sbdi52gz6163lik0wri9wr122sjf90jas"; + rev = "4e2e2a7a5e0fe81669031ade0f60e1d379b6516d"; + sha256 = "1iiks9q13pbkgbjhdns18a5zgr6d40ydcm4qn168m73fs6ivf1vn"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index f202aee38283..581a45da3d8c 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "25.0.0.127"; + version = "25.0.0.148"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1gf0ncclkk3h4vj9kkhbqj1nnnm54gwm5mdcs4p4pl8i339scs14"; + sha256 = "1888n0mbzhbvi95kq19fzw310p7nr9h3g5d3nyzq5fnvj0lcfxsf"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 176784ea7a42..2800a3ed5d21 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1rpmi9dl98948a2ll7q0sagyx8v27mmwa2j6fmvfx6r1mwpvbrgz"; - sha256bin64 = "1xj1fl0k0ck4pxl4q0cdhi55sqfmwbb1vcjj70idlz166ll8lpxh"; - version = "58.0.3029.19"; + sha256 = "1q9iqmq5amzfw03jiw18g1w285b6x2qckn8gc60r5m3xx1hbivv2"; + sha256bin64 = "1ddhhcydcwwc2pkwm4c8rlr60968zy5vda410g4bwx0v5q7p22q9"; + version = "58.0.3029.68"; }; dev = { - sha256 = "1rpmi9dl98948a2ll7q0sagyx8v27mmwa2j6fmvfx6r1mwpvbrgz"; - sha256bin64 = "1wx5r3vmmki419llki0ls6y4z6r93zm66v2h4vnxswjb77svl578"; - version = "58.0.3029.19"; + sha256 = "0zvnj9n2p057fxx7n4d1qc0nw34qhlsvrx20fwigq96blamckvd8"; + sha256bin64 = "1s1r3h7x49bp64lzzphm4jcg7g68l0x7mr3airj3hqii58dvndm0"; + version = "59.0.3067.0"; }; stable = { - sha256 = "1r495ffcwxsd4pxn5akfr7k9iiv1dj0zq6w9i6xxii8knf8a40va"; - sha256bin64 = "04ig9q8j4xbgq749qprfddlgpm6g28jjvwwnqmvinymnrh4vc7cn"; - version = "57.0.2987.110"; + sha256 = "1xwchazqqx0cs9rd15r80kw6p918zp9libx34qlcj8p5lxq1f0bh"; + sha256bin64 = "0ggn5rljch36sx0i37qzp6ldcy3ibdj0z9217lqzjq3r7ixsfqja"; + version = "57.0.2987.133"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 01cd7a1df380..5bd275ba31d5 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib + alsaLib.dev atk cairo curl diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index abc314f85699..32d3a8e1540f 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildEnv, fetchurl, patchelf, bash +{ stdenv, fetchurl, patchelf, bash # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk2, gdk_pixbuf, gcc +, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -47,13 +47,14 @@ let glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb alsaLib libXdamage libXtst libXrandr expat cups - dbus_libs gtk2 gdk_pixbuf gcc + dbus_libs gdk_pixbuf gcc systemd libexif liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap - ] ++ optional pulseSupport libpulseaudio; + ] ++ optional pulseSupport libpulseaudio + ++ (if (versionAtLeast version "59.0.0.0") then [gtk3] else [gtk2]); suffix = if channel != "stable" then "-" + channel else ""; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 72a1f171dec6..bf0b91544ad0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -60,7 +60,7 @@ let arch = - if stdenv.system == "x86_64-linux" then + if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "i686-linux" then "i386" @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "25.0.0.127"; + version = "25.0.0.148"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0d37rwbqszl593pggph8pm8jwn05fppys7q8vk1jrk9jaz262iva" + "1jxxnbd357ndw8b64lw4pwkg9j0shy0ns7xw0f36awimq7bclr8d" else - "0lhngdx1q51kfpw3a961h9p9n1fnspk9pmg21i069hvd0h143arx" + "1k0zyy4mz307r7ph4pnmyqaa0fdw2f52apala6dbrys0wdl05yfg" else if arch == "x86_64" then - "1yasj9xzmb6ly9209b1hmrqrzxrr1bafsfjszsr3yf994hql6nzn" + "0n77a2z0928vd4bjgx69igzxvn8l9wrfh79j6knygdpnsbr3pybj" else - "02vs12cm6fpl2fif1lij9y15m89wk6aizc8sbjiw6w59wixn3p9d"; + "1cb1h37av4icfhl4vjngsa3nfcrcdvzliwxdg22rshimlkfgr7vx"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 178b86b61c66..4d65a7e9a629 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -49,15 +49,13 @@ let arch = - if stdenv.system == "x86_64-linux" then + if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then - "i386" else throw "Flash Player is not supported on this platform"; in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "25.0.0.127"; + version = "25.0.0.148"; src = fetchurl { url = @@ -67,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "07a8x1n997lmkxj74bkygh60shwzxzcvfxpz07pxj1nmvakmin51" + "1pkzpip8d3m92kyzap00xxq40yilgmaqnc47nak3i7gnbic8fa2r" else - "0rzxfcvjjwbd1m6pyby8km4g5834zy5d5sih7xq3czds9x0a2jp2"; + "0xxsbxnkf9xnljy6sn61jqx9xd1w0lm5mbw4ca7xk5rkc84ik91z"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ab010653c644..ed07225dd8df 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -10,16 +10,16 @@ }: let - version = "1.6"; - build = "689.34-1"; + version = "1.8"; + build = "770.56-1"; fullVersion = "stable_${version}.${build}"; info = if stdenv.is64bit then { arch = "amd64"; - sha256 = "0wn98nzlhppmm3g797kiqr9bxxff8l7l110f1w1fnfl93d325hrm"; + sha256 = "1f9cwr41rl0mqwg3xn2nfb5xnr0h0vc4wiz8367bd67zf4an61d2"; } else { arch = "i386"; - sha256 = "0agybibfwk5n1gxi8g4rbvvmlq5963df5arz4fyi4a1hcayllaz0"; + sha256 = "1240w3gqn5rbvkb0v1g66syrc92r1vzk82fkmvy92qsnx0d5z7nn "; }; in stdenv.mkDerivation rec { @@ -47,7 +47,8 @@ in stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.is64bit) - (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs) + + ":$out/opt/vivaldi/lib"; buildPhase = '' echo "Patching Vivaldi binaries" diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 3347af83585f..6a8fe2834912 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler +{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler , ruby, libxslt, libxml2, sqlite, openssl, docker , dataDir ? "/var/lib/panamax-api" }@args: diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index aad5d1a80326..76984fed3404 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -49,20 +49,9 @@ in { sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb"; }; - terraform_0_9_2 = generic { - version = "0.9.2"; - sha256 = "1yj5x1d10028fm3v3gjyjdn128ps0as345hr50y8x3vn86n70lxl"; - - patches = [ - (fetchpatch { - url = "https://github.com/hashicorp/terraform/pull/13237.patch"; - sha256 = "03c2nq12gvqqp12znvl3lmiviwsqksx4nrplv09fns2kz2gyfnbm"; - }) - (fetchpatch { - url = "https://github.com/hashicorp/terraform/pull/13248.patch"; - sha256 = "0awj8gaic0j7a69is95f2rll3yip4n6avai1jh20b1x7dybdrp5m"; - }) - ]; + terraform_0_9_3 = generic { + version = "0.9.3"; + sha256 = "00z72lwv0cprz1jjy0cr8dicl00zwc1zwsxzjssqnq0187sswkxw"; postPatch = '' rm builtin/providers/dns/data_dns_cname_record_set_test.go diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 28fc7fcc6662..7ed2cef0e3ba 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.11.0"; + version = "0.11.1"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "gruntwork-io"; repo = "terragrunt"; - sha256 = "0i0ds6llkzrn6a0qq53d2pbb6ghc47lnd004zqfbgn3kwiajx73b"; + sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index 31f9f9a2b703..b98a38f8352c 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -1,12 +1,12 @@ -# This file was generated by go2nix. +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 [ { goPackagePath = "github.com/aws/aws-sdk-go"; fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "78568b07950e5e7948496878fe99b9436add41d4"; - sha256 = "0qi3q9qx8k055i2hlc6n8agl7nw1hzcw7aqqykla6z0hjv2hq0c3"; + rev = "c790b8046767d9c773ad83c327ab988312f85a94"; + sha256 = "0bhk7j088r8hhf05l70gpfnprxk7vzgb1fql9brk065hw2xnplsr"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-getter"; - rev = "c3d66e76678dce180a7b452653472f949aedfbcd"; - sha256 = "0ykpkiszcwp3hnvnnyl95zdrsziwrzr989ynyvbfkgpnkqfdhfy7"; + rev = "e48f67b534e614bf7fbd978fd0020f61a17b7527"; + sha256 = "0dlmirfi0pfbwylcjf2mggzav5r7bzdy19m3by6dgarn6izx6g7i"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "db1efb556f84b25a0a13a04aad883943538ad2e0"; - sha256 = "1pl1rwc9q3kz0banwi493cyhmn5mlc4mb97sx68jkdz6pck7fy0h"; + rev = "53818660ed4955e899c0bcafa97299a388bd7c8e"; + sha256 = "10gdkk8gcjv0lg15ajy68dwgvfkjhawk08ccs9x9ym1adp6l2ycs"; }; } { @@ -95,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "9e5b04886c4bfee2ceba1465b8121057355c4e53"; - sha256 = "18jx6ypc1w02ha37rsx6hhmdwqmnybajd6l54qm07bdb850ip9db"; + rev = "8ba6f23b6e36d03666a14bd9421f5e3efcb59aca"; + sha256 = "01s53ny3p0fdx64rnwcnmjj4xpc5adihnh6islsfq5z1ph2phhnj"; }; } ] diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index bb4a4a710094..b491f287e701 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,25 +1,27 @@ { fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper }: stdenv.mkDerivation rec { - name = "davmail-4.7.2"; + name = "davmail-4.8.0"; src = fetchurl { - url = "mirror://sourceforge/davmail/4.7.1/davmail-linux-x86_64-4.7.1-2416.tgz"; - sha256 = "196jr44kksb197biz984z664llf9z3d8rlnjm2iqcmgkjhx1mgy3"; + url = "mirror://sourceforge/davmail/4.8.0/davmail-linux-x86_64-4.8.0-2479.tgz"; + sha256 = "0e650c4a060d64fd2b270ddb00baa906aac617865d5e60c9f526a281cdb27b62"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - meta = { + installPhase = '' + mkdir -p $out/share/davmail + cp -R ./* $out/share/davmail + makeWrapper $out/share/davmail/davmail.sh $out/bin/davmail \ + --prefix PATH : ${jre}/bin \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} + ''; + + meta = with stdenv.lib; { + homepage = http://davmail.sourceforce.net/; description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; - maintainers = [ stdenv.lib.maintainers.hinton ]; - platforms = stdenv.lib.platforms.all; - homepage = "http://davmail.sourceforce.net/"; - license = stdenv.lib.licenses.gpl2; + maintainers = [ maintainers.hinton ]; + platforms = platforms.all; + license = licenses.gpl2; }; - - installPhase = '' - mkdir -p $out/bin - cp ./* $out/bin/ -R - wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} - ''; } diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 44caf615205c..93d2ec93aca8 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "23.4.17"; + version = "23.4.19"; sha256 = { - "x86_64-linux" = "047i6afghb2nphwwc8sd6dxcbfi9cdyb1w4ssvwfkmbf3mznpfrh"; - "i686-linux" = "186z540iv4gq2gmis3mjly070y09lsfwvk9ygmjrh6y7pd9dqa5n"; + "x86_64-linux" = "09vjic4yi6g6rbliz4b56swqdpjgw0m7gs2n40xhvbqfd35prafs"; + "i686-linux" = "0i2x2s7p1lq315z8198wjlfqr5lqj3mxdcqxz44skrbkmqfd9hab"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix new file mode 100644 index 000000000000..f39fac2605a4 --- /dev/null +++ b/pkgs/applications/networking/gdrive/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gdrive-${version}"; + version = "2.1.0"; + rev = "${version}"; + + goPackagePath = "github.com/prasmussen/gdrive"; + + src = fetchFromGitHub { + owner = "prasmussen"; + repo = "gdrive"; + sha256 = "0ywm4gdmrqzb1a99vg66a641r74p7lglavcpgkm6cc2gdwzjjfg7"; + inherit rev; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/prasmussen/gdrive; + description = "A command line utility for interacting with Google Drive"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.rzetterberg ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix new file mode 100644 index 000000000000..781a4a18b9cc --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchgit, qtbase, qtquickcontrols, cmake, makeQtWrapper }: + +stdenv.mkDerivation rec { + name = "quaternion-git-${version}"; + version = "2017-04-15"; + + # quaternion and tensor share the same libqmatrixclient library as a git submodule + # + # As all 3 projects are in very early stages, we simply load the submodule. + # + # At some point in the future, we should separate out libqmatrixclient into its own + # derivation. + + src = fetchgit { + url = "https://github.com/Fxrh/Quaternion.git"; + rev = "c35475a6755cdb75e2a6c8ca5b943685d07d9707"; + sha256 = "0cm5j4vdnp5cljfnv5jqf89ccymspaqc6j9bb4c1x891vr42np0m"; + fetchSubmodules = true; + }; + + enableParallelBuilding = true; + + buildInputs = [ qtbase qtquickcontrols ]; + nativeBuildInputs = [ cmake makeQtWrapper ]; + + cmakeFlags = [ + "-Wno-dev" + ]; + + postInstall = '' + wrapQtProgram $out/bin/quaternion + + substituteInPlace $out/share/applications/quaternion.desktop \ + --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" + + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = with stdenv.lib; { + homepage = https://matrix.org/docs/projects/client/quaternion.html; + description = "Cross-platform desktop IM client for the Matrix protocol"; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; + inherit version; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix new file mode 100644 index 000000000000..0dfda79e767c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchgit, qtbase, qtquickcontrols, qmakeHook, makeQtWrapper, makeDesktopItem }: + +stdenv.mkDerivation rec { + name = "tensor-git-${version}"; + version = "2017-02-21"; + + src = fetchgit { + url = "https://github.com/davidar/tensor.git"; + rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; + sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; + fetchSubmodules = true; + }; + + enableParallelBuilding = true; + + buildInputs = [ qtbase qtquickcontrols ]; + nativeBuildInputs = [ qmakeHook makeQtWrapper ]; + + desktopItem = makeDesktopItem { + name = "tensor"; + exec = "@bin@"; + icon = "tensor.png"; + comment = meta.description; + desktopName = "Tensor Matrix Client"; + genericName = meta.description; + categories = "Chat;Utility"; + mimeType = "application/x-chat"; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 tensor $out/bin/tensor + install -Dm644 client/logo.png \ + $out/share/icons/hicolor/512x512/apps/tensor.png + install -Dm644 ${desktopItem}/share/applications/tensor.desktop \ + $out/share/applications/tensor.desktop + + wrapQtProgram $out/bin/tensor + + substituteInPlace $out/share/applications/tensor.desktop \ + --subst-var-by bin $out/bin/tensor + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = https://matrix.org/docs/projects/client/tensor.html; + description = "Cross-platform Qt5/QML-based Matrix client"; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; + inherit version; + }; +} diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 92d1a3446c0d..8eb1169b5a24 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -20,11 +20,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "1axdcylyv0p194y6lj1jx127g5yc74zqzzxdc014cjw02bd1x125"; + sha256 = "1b8dggq5x1b77a9i9250b3jhv2iddfzhr9rix1yfzckdms65mr8b"; }; patchPhase = optionalString (openssl != null) '' diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 212d366facb3..7c48075704e3 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -97,10 +97,11 @@ stdenv.mkDerivation rec { ''; dontGzipMan = true; # already compressed - meta = { + meta = with stdenv.lib; { description = "Mail indexer"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ chaoflow garbas ]; - platforms = stdenv.lib.platforms.unix; + homepage = https://notmuchmail.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ chaoflow garbas ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix index 6d08ad724b27..410e5e10ceb6 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; description = "Mutt support for notmuch"; - homepage = http://notmuchmua.org/; - license = with licenses; mit; + homepage = https://notmuchmail.org/; + license = with licenses; gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 46d7aa32e8a9..1b42957f908e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -1,595 +1,595 @@ { - version = "52.0"; + version = "52.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ar/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ar/thunderbird-52.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "83418f9890becd869c878f4ccb5f2ac9dc57103ac12818e4ff010b0ca1efc85b712692e81e458a59fdea8f878d8c8c77d7e11dd116d045db67a0aef278aab6f9"; + sha512 = "1543d3b17ac8a6a437b34df0b3d33081b86554107321716b534471c86415a80fd4cb7f35fb60be7482a7476bdc4d2c5f9fe29dbd8381ff841e1f0daf2007e8a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ast/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ast/thunderbird-52.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "7c97616d16f9ce706e878307fe11ace62f87e227c9f588bbeb6eda8c6ba51bdee280014c7c831629ca39c6fdae537506100a82ccc801887df8dfeb35ba336141"; + sha512 = "b7b9543253530cb3f166d155465d320d30138542974e71cc92e5c3be6efe12014ff2db5b63372297f7cd3bf72cd1a866606f1bbb288504b6a272e7820ada1bdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/be/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/be/thunderbird-52.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "cb7a99fd462c6b685cba2f95029f7d4225c0dcc95101523a9d3d807f8abc458cc4c0a035a8111d5655e7b47baef1d3b974b4a785fe1803eb09431b7f36129429"; + sha512 = "f9283894e7c9bbeafb8fa6dbd2aeb1756b8d2456fe06c4278741c79171197b505d9a3d4b8e1cc3b18cf22be71555e1eded616ef0ed2648958b0d4d07f9d96654"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/bg/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/bg/thunderbird-52.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "f1b2f0001359bcecd3cc1c884ec089c4386fa6679521863b449e2e1cc90a70b06e2c555e18640695c9b5d1d5bd45952bbf489ac3d65bc0adcdfb02b1bfceac4e"; + sha512 = "486e2b3e149b73d3bc272546f7cc55b9d8da97d48808ca5aa0c3fc12d5bc0ea49c353f8b2c95ca398cc6938e67087f8ace8bd9bbbffe75712fe64b05994937e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/bn-BD/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/bn-BD/thunderbird-52.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "b08b572359340e813b71643d3f13b755143a8481343134cbdf49ba7fda1290c48f628c445d57cb254e87650844fe04e9eabf4e4340ec30465d82872aa3eb3cbc"; + sha512 = "da54a9b78deb56de84623e71e60083aaa53dd8180f6d63f6ecc5133af846e5f773e63ce9131dc751178210994765a4e3daf68c582e180dd25f26d4f8e95e9646"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/br/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/br/thunderbird-52.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "7bc083526e8aa4a9c6b59adfe237b25d468c4bf07abfb1a7f76d419e62b887978616337efa814f125d06e6f61361ff0a79ce1c2792ddd5723d7dacbb1f54efd8"; + sha512 = "b647bc0aa73ca1d4deca50f70d5cb78bc95663c7c1668464c1b2d6d0e944f69ad73de28dd3868a6ac3461c5e64e74e206d508569d52ae8aa2a1da8f1164c4d94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ca/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ca/thunderbird-52.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "06e73de3a64b80ba3fab93e08c8b8968d0e84c3f49896bec1c38b2fc35d3c52f5547f5d4ea21f9d2c335e202a078c1c18830e1ccc986823c58e351a85f4337ac"; + sha512 = "3c9562e14e20d90d76e6c8b39ef3047899fa094a5639ddffd716b687adb484a97cb6036e3228cdfb207086b28917b74fc44eca07408e7882f45941e50dfbfed6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/cs/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/cs/thunderbird-52.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "ec8bd4f3f2a6c0e695ab75ddb1d73723472df2a5a2e141a812860c1a20956ffac4a119de737d0adb766ba1f2c664d12cde40158fbffe555c94a77c8054e4e7cd"; + sha512 = "ed20a0b054d4e86ed1577c8a2672aa692ef47345243716f6dc840910b29cd915df75f8be9ac05bef385afb5721739fb08276c4bf48a51178fa46033c1131c1be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/cy/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/cy/thunderbird-52.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "e21599c17c21c6d425c9da5ce5998c7b6be36040e0437bd742506c8cad93fbbe15ec5dd7b840b085f3f484d4b6bb99bdcb1a6a28a2610c13411b13a18b1bcb53"; + sha512 = "2dcc1d221db9bb647f5bf454a767f692e5eb592d1c6af52e144c55cfc81f0e3e05ddc2e3c4cb66b0031e09531641716009d062f340a5948233165564a3d5a5d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/da/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/da/thunderbird-52.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "1fff0b5ed313a1c404f86a41dcdc94a0787f01f5fda836713de5713697788274619520e40f48ad559e485e1144b898df338373f3ddc85662a95deb8c39fa66ee"; + sha512 = "1046c0ecf657a9c5b30e99175f6200e541bb5f33031f1a440b26d12d6de0c558e15f8c2f965a05e59f83c46849944e010bcbdeb6fe100672d97acf0d4038febc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/de/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/de/thunderbird-52.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ee7f739d8237d7d5f5936e3f520de7d572bbfd0ff19aca140381daf4b2353a42a7b6b79680440bc2a62321c8089619114bce99bc48a88aa6346228ef8d08012a"; + sha512 = "10842eafd14068ae5d2447fc2d3aa35066af97a6e49b88d38bcf37be1e754d2403b1c039dc09f418128cd9369da6e0afee278914dd41a2ce48cb4872a7d4d18c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/dsb/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/dsb/thunderbird-52.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "9439bdeb224ee48adc0af5bc882d3dcb2fdcb988502f9ede03d2ede67261c8007336414a6935f86690e622d70ddf933efe14ca9ef3640be3de46b6c2eba090bc"; + sha512 = "f7e6b05dfc94f64c988c761877d02ad3c66a7cc47e2818d267d7839d0b1fa7688ecfac8fd3af98e9e9318806a78e4559d6cfe45de0d96b7f5f8d411c6f6cf051"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/el/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/el/thunderbird-52.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "aa8a94bb35c36c0913f8b76944370ac839cbe1c16021f83b3b8c317e03cc1013e35fa502af3293611f7fc89f30513bb24dfc4d89e745364e85d674afe66a0d33"; + sha512 = "0ac5a23a38987a5af15bbb8e458a89df378b89fdd8721063d6df16a3658201ef1fb4f2d04b6272e1d9d43c1d2273df4cc0fc79b7d374f1fdaf7335c77fdd9381"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/en-GB/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/en-GB/thunderbird-52.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "01b79fa4b147fc7ebc07e29582e9fb567c4b0de565d4fd13a71279ee3946b9e182e086c6c3b1b4c413688cc3dc19979e89e5dda87ce10a181be0cb252ca69f4a"; + sha512 = "73f42d30f8fea9063e984d9b44c82aac545a20833133cead89ea147e92595e66da2a1f3d3bd0c09bd1584482474607e6856ba17ff80edff51b169aaba03bdfac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/en-US/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/en-US/thunderbird-52.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "a7e76f80e701b8c1cb1ef190d083d463b9e806ee77a467848caf0425b65bd19c51ea4a137bb59b36334fda129816eb26c9de753b4261cbd8f7040ff63bfe9464"; + sha512 = "51eafcc7466a2136ddad110fc43640c578d69758e53eace8da52a11ea86869b5d05e537b6132c3c49eb6bc6fc5bad77f2967a472c160963a41775b34600b7582"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/es-AR/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/es-AR/thunderbird-52.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "c2df311f50945e103bfa390413d8b0a4ac307f658aacb10b37e69eb6742756b8cac5221e27de5b96ec07e4f657851c17928f8e3dc0100b300ca97f9f643d05ee"; + sha512 = "b57cbef7843364917632605dafc056323adeb9d06da7e53a65a4450e009fa1f2c54cb5380ed886db4530e845bd6f39cd160ac90f19f99d63ca1f85af09ed77fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/es-ES/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/es-ES/thunderbird-52.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "3d54d936ce165eaf9edfe676a42eb4cb257fa8d18cdd98e4027ac8ac76d9264a2676f39ae37459915b17d7b2473057f076bea0a28a0e68570ad8d1bf8b25c520"; + sha512 = "408adb2ef60bbad16152ceaebc8f26c62fb829960e941dc5fc2814b183b780bd0fe79847351395321026a0ef53f703b72b6f4bdc233b3284d050e8bde35c0beb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/et/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/et/thunderbird-52.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "966d12756cea32951a38cacdcc2f9854f88f8d5bc6f07677274e5ab1e9b74c875995dfc226a6df61c8ea1901d14cc7971012a9152f6bc37e4def57166be84312"; + sha512 = "3186c5a026029e7b7b4dec47079b69b7f33398b2cf276b9bbf0b726d64709f176e45e31e0abb74c4302d693aae0ecafcde945c78da097cc2b0c1499481c78ea0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/eu/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/eu/thunderbird-52.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "ac1beb19aadbb0b0b15f53f8778e2b8109eb42913e8ec4b5817dcc31e8dfa8a6d40beb9e0c61a05507cde5d553c7af03587194129d20e388344c4d469a3b1b08"; + sha512 = "c60d3e2ab30e84628158ac65dc5c58ffe5a7b9dc7c3d5e5135456ac4be4d4734a4f4dc7d65c15f400dacc55fddc739934f3978f6184a93a662466b759938d1c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/fi/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/fi/thunderbird-52.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "5efda4136cc8152367e36a5c460a4f31c8287441599264aa4b5243173fc925475633529564c357385e511d2ac9faddd04c8bba5fa9c1ecfd2ff8e22fb002a025"; + sha512 = "14aadef508eabbaaf81a2304934f3848e3831f9d8df2413a49002be36f951c87355e1954d84d58509086c1b0e0aa1de5865edb733d0a07b655942830c83ffa18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/fr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/fr/thunderbird-52.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "75368ffdf22424aa919fd35f47813e13a80197345504c17b4e03673d1666431d4e455d1bc76a8f69fbc25853828d2f6a0b57b705bfd37cf12ca5a3095c075916"; + sha512 = "0711ff8a5955ef185678b27e8e43704c652d9024ab4b8558eddfc2c94f87dd24603f144f391f35580c3fd512cd44ca729253501495860e6799440e56c4895c67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/fy-NL/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/fy-NL/thunderbird-52.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "58edaef7cb314a54feb5367a931314e5a0dc1b308f92372a815c7b1407ea783cddf84f0ebb0c8c59c217b3f6a9ad97873ba85641735db9a2503ddd76c26f7b7a"; + sha512 = "99e49dcc4085db1895b0e2ec2e7a769fb608415135d550485fea03ccc99f325771682f725c78578944c82b2f18aeb207c8abceb86db5390056d27c291f19556d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ga-IE/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ga-IE/thunderbird-52.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "dd3aae859b04cb9b945083bbe6fb17ba11fb8b218fe8547c6cd4a0d3adb85051f72bfe2adbdf80ec07066ce1aa03e825b2eb153509a0614d98eca8b5565b2755"; + sha512 = "f0bc291e1b3dc2e226aaa48e5b87c1e6690ccd04b4b62b36fc654e86173c9dc6ef47170524ceffbb59093bd4188a3cb01a894469daa4bf49a0a8895034d17645"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/gd/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/gd/thunderbird-52.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4230cd99c7aa2a9024e76fe52f438574384e682807c09981db24f30cf60dd76ed907f38b212e78b6250f8ee68727e91dcd20fc3b4ce74cd3ad303b9700818091"; + sha512 = "65388bee6e5f8255779f319eb0d47310762ac6d3ff6b61f3accb151e52dfff8e079aa16be714fe4a89bd722bf72b65f930384d555d68016a27b71bd236388f7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/gl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/gl/thunderbird-52.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "d393b4b18458ba2fac188c63bfdccc8e9247b860069606ce21e0533a8316bca15117086216408ae86df18fa3ccfc5605e8de51b80989beed38b55ed7b98bf6ad"; + sha512 = "64c439a0d2a75a3b9a460966c585913656884da7cf7f81f58e612c9f2523ac690a8585bca61e60fe31e13ed6f07d484e3dab6bff876fa247dc1488f084d8a6b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/he/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/he/thunderbird-52.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "3d41e16926d986129b1d7a717464956a8ae27c75a709789eeca4d8be4875627a740f995ca9e00072e12887e5caca4d3df8ba435a60494f84aa321a99bd15c4d2"; + sha512 = "7b20a5d996164daca9ce2d6af03a987eb67394eba01c942b29aca3009ee062f0c57cc011baede67c09a7b0dba63e029a5fb5753d18edc34c87926fd16651e208"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/hr/thunderbird-52.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6d8698dcb0d2ced2e893aec1221086dabd7f4f351639281c521110e24c4177f5b79360a1324843c431b7535aa59d222ae52797710c7ad41143f4fb73fcc0eb5e"; + sha512 = "4419fac97644cf895021bd974e15466936b45babab7634e35855ddecb2575a43cf9be65cbf83c1c27648b58b656c9f6b4e8d454be901b479cdf86180f244a646"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hsb/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/hsb/thunderbird-52.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "0298d90aa6cedf21002df84bf753b59addb072d187b0ea3170f85c041298591994f7f842a8d86db12374e5f00abd4178820168afee738a07ed886f27ac46e9f1"; + sha512 = "0f31903823ee2cada852aefa8d19b64ef9ee9e9f80fb709481c155a7a4c97169703a35e7de1f2b805fd91d98321dad81fe0321775c4bf9af5f01d38ab75c70a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hu/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/hu/thunderbird-52.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "be3dc6926a5ce25a6942a5b33c6d3604c74a0d54b5ae1b4974732cc1fbc4718100fad6f5a6ad77706055c5d9d2c8c2fa52d766bd758e59f44da9db727aadd326"; + sha512 = "a2972f056d54b7d22ff090e43144ee16f38b01a1d6ba76dcebeebfdae086bde752008fdc89650947944bc80c82078f94995db8bf8daf339ec0a8fa5475435477"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/hy-AM/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/hy-AM/thunderbird-52.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "001726c9b817c9b5c34778e0e6f31deca7d11d4887dfe5707e7e386bc0ef8dd9acb20f5008711d7d51902fc114590712d0264ba229934859b0089a8993deadbf"; + sha512 = "47e80c575adae2327cecb5c41ed747c9d4da5ecc9e9ff8afc5dd35764b039050aa07dcbdb79d50fd7a4d8eff6f233f1a3cac3365e6a4db26e0058030d82a0f6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/id/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/id/thunderbird-52.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "df01723f6fda8f38241683972283c6d1ebf548251d5deb4f061e47d294d67271c72c05cac8aeb2e84afeb4a1af5ea29bbe6293a6a1c4654d597fff2e77b167e8"; + sha512 = "3d8f7a87727e772aa9435bf0e381703003f9a1fee98d71dd7f3fdb7add574a0c5245dcf8903895fa858ec2afbb9823d658db4fd800427d29c71ca93546adcd8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/is/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/is/thunderbird-52.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "12112dc6a40579f16bb9d7d0628a31cdb815d7da0484983be95a1ea6aa456f8690d8c0392b164cd365c94900f0b32acdf4a9a247e795a572da9c024d5fd56470"; + sha512 = "5ba20b28c08cf19f12acf887b92959a09cfb471776ab1805feda15ec4d406a23ab9c6c719a64ad2a65684f9e1bad00dd2f321285bfa85bf8e2f5aea5ffcc26e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/it/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/it/thunderbird-52.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "7dc5c3a52204e4c77f7cb16c40c583eb1617d952c8f887f918479ba3268a006e13cb8d3cf21379b53b217ce7cdc4295876eb9f7e6108760d6d283538fb455bf4"; + sha512 = "127471777e937b3b02f07bd66366680eea194171554bf7f11659331fcba414b49d0ce07457d754f5131084ea89d90d6e9d4e62929fe3d7c8c4a3d58b1b34b72c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ja/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ja/thunderbird-52.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "43d500330ca83420787adad7de1510a6acaa958f82a265e631191d1305ccb70c0ab118c78c1948cb466603b88d023268aa32900fec2e1d81ffc29050227d2c72"; + sha512 = "aa013a6c50d660a150b2b4247eaee467ca1a1a232d268121a8e8113386c9575e2667f4cf75c1e7ae77458869a9bd4d2f7972c5cb2aa919296bbf3aca44d48093"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/kab/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/kab/thunderbird-52.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "609464c5c9a86b7c645049c2c3ac63a936a0670250599290d3f6676414a112f43036bd2867bff462f8c1ba89de053041cba887f5568e519d553e0adbbfc42283"; + sha512 = "6f4f4b27c658103dd6c4a9d2c9cfdca09097539eef1e123bda9f11d185a25f0cb944e96d37e9a2c36664700948c4b052a5eaf463e4fb045fe6def4773b19a8c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ko/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ko/thunderbird-52.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "c3f3d2d5a981a8756a3b76048be1627076e6a822f1cd81c24bfc496ee6de2865744ef50715411d3ffd4db4389e72a1760130d63b421e65c8761a7bb673ce5f3d"; + sha512 = "4efbc262f563e03ec78a10658772c9c3b446e5c378159d35a68b432d1b582dac589723525a26e337a2739c0ea116cbaadfe8fae110ad172fd7268a7c5e76c50f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/lt/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/lt/thunderbird-52.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "cb746e1fbf5929225c91c2989d33b260fd768348ebf6c232586bd27b46e964f94443659270a6bf6017bba48abb93f533f8428ffda52996597ec8959f8efa3026"; + sha512 = "b1f1cbdd9642e283144200d716783a212948bec80e1b5d27046e80c22349e8b103e98f31bbbe392f4a1467805bbb28801b0f8c597808f03bc6fdc9110cef2900"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/nb-NO/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/nb-NO/thunderbird-52.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "67d93508be6d5651707ff7109b5e80fad9db5fe442d05f34834c0c05610cee9aa8b3f2b61dae8705a1ab5b5b5addc089a52928ff5655b93d4c0870dcb9dcaeb6"; + sha512 = "51e675ca839bb7d205121b7023244a9716eb4b7f400c534f6b3a3275aceaf827262a816b790492d3cf01b6f01d64b7cb0c1f2385d1ecc74dad0f450f8d1b26dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/nl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/nl/thunderbird-52.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "6b40414449c75856280987b49cf3abe6f3725b89c2a53df3c11c942523d32e8cb3195ee49bae9dbe19d507473ac6b91588ed1e75df7aa1e1418a8ac0f69e326d"; + sha512 = "866a4d117196834fc415e6dc394c82a9cef6747c838068abf0efef5cb5e03f26d65f5c3e9ccd90fe7229a8785817736ee574d73424ac50633650bfe6c9848633"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/nn-NO/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/nn-NO/thunderbird-52.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "65eff88f0b0f8672bd587693c1e7d55aded95d308f624e9dfd8731b2dec948cb7ee9ffaf484b35130a63fb6d9314ef8f044363c6b41f70f3e540876b109caa41"; + sha512 = "664d8941c433fc04fa836f1dbec12ad73ce3cf9d19d898c8cd6b6c9fc283380e7af27a0ab949881f5b6151595a6c584f938aee6f88e5239fa2de0403813c3388"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pa-IN/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/pa-IN/thunderbird-52.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "0d4ac412f5d64aac841a1fb0dbdecfa80ff282aa8472df3e9e65419dac486e3086d954c17d1a535904b61b7907fc55d02376fb7a4c46dbc53f48f427673bce8c"; + sha512 = "4dfb57686154b3542fef873d08037fb86f7574260884494872433496b82f0b58a14710931fdd0bd5dbe7372658691b2e953a4fd794378a993f97fd6c8c9ac496"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/pl/thunderbird-52.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "6ded5f995084a9fcee1a49f3204e2342216c9e04b5b7560e52283bb33bfe15fadadecbe9cbb6bc8643a3fc114b44dbe6c53af1b8f31ad3e3a53653f1fef944a0"; + sha512 = "47041481a2cc660bd6de4a018aa77ee4f8217fc7091b37ab8c26d1ec1dcb0678ea80130ee84289dcacd6266431da4532a66b041faba56f1bd8746e991c748a82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pt-BR/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/pt-BR/thunderbird-52.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "7199ebcaf1c206fb93fa0c42118876e2e416fdeee9907c6f43ef0244a950a13ddb74282898b52b85cc2fee3f8fa7077512f3414a916fe1a839243b5823aba7f7"; + sha512 = "3001331547a05bf5b76620886096fb80cc594c625a335fc613408da5c43075c15abb0a6803cc34c740cef5d7ed9339e21c2db3a8a736901350674ab3b1024514"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/pt-PT/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/pt-PT/thunderbird-52.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "e6290824e68970d66bbe1787c18062e7638989550f5303c5e42464416a74cdcd95c6005746fcb1ed1a4703fe53032eec1fda92cd0107ca244ee9b8dbc7ee6d50"; + sha512 = "402dc645810068339fb9fc18d6e3f025c48013281e3604e9a3da8228ee6cdd304ad3d2c10781dedbae9dbba3737fb122a3fd5abc3c856d1afaaaed2d7e23042e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/rm/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/rm/thunderbird-52.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "7a7abb88f8cf6d40adfd96c2173a8ecb1f2b4eec4e12111bd6af71837b6ed154086376164c0d3fff56eccf4039c3459e275d1fbcddb42fe6efc5c837816f1f3f"; + sha512 = "4789cbabb8ba897a508e9dff91fcf838eae8fb4d330f500bb7f545cf46efbffd978801016898bc89bd6f9fc558df2737c427c16e2ec40c0a7866301abd7450c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ro/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ro/thunderbird-52.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "27fd6ec6be3a876f2ef65f6cc65284609e03f07d71081c967bdd4aa789602cf3ac29885ca2fd710fd8f93491006f4d1e51e8106bae112cfe1b662e13c24b80b7"; + sha512 = "fbeb8ae935f69efe85b1fb45969b8142b197d340293034c088ed50cdb563466128e305f8ad2c1586c9c18c2fd5fd4042b95ac15aa9e2783fcda2c67a6aa941b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ru/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ru/thunderbird-52.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "19ca3df78354d2c6dbbfdbde975608b73bb4277351fd5d19f15183fc55b8daec2e8eb86edc7f59fe27ef8871497d54b30bf468d2f4f781dc1ec51ef77047feb9"; + sha512 = "a0a21b2ea3720b776b3a7944c1a9030ab80451a4405afd87f49b424326cfa69769e7e9bb54071c7747f4fe4af8f18fc3a9f8db73a848c554d9d4f3eded8cb9f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/si/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/si/thunderbird-52.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "28acca4bb30e303b063c88ebaf320799172421db9c859c3fec5b0bd1f02efd76e52cb82586d577fc73de5f2ee6464ff99dcb32351345d7d1aa28bb14fd856638"; + sha512 = "bb919c3b00f4122cfaefad1a88a68d3dcc88f09bc6db717cee14ba3ab76adc4b4c1ff32dcbbe0babe7336856c31153eb69e2297d88ca60f9e561aab083344710"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sk/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sk/thunderbird-52.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "f62ea125270243a9f09a2b3b57fdeca752da12788301efd89cb3a3ddb72b8bf4e8befe123ed843a6e70aa42c32b14e5fab8e323bc70383be0517082101dc5f05"; + sha512 = "c6e1e049a264bac92fc103b3242fa36dc38caecfe22b909c41ac86e570d7f3c9a7b39ad9d8f9f918fafb60f91e0e3fcd925a598c9f7deb6f7874a92436de6ec6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sl/thunderbird-52.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "bda98cb38a8334b1612ed72a286cc5df7d4310cc0a4f2a0bad9742a66a898c11f393b3fee48bef3996680ec32d7217e5b2b216ea8201d72fac234c3fad0a0bcd"; + sha512 = "7af3e5a875077f94ef0e7aefd1b170d8f8285fe99b9c59ef568c055253f812949127a37557b88f2097282de8f1615d272abdee51713b30f376b08300c29bc814"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sq/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sq/thunderbird-52.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "704a118df4a6279383e62c1a7a09e24ab5073540736979ceb69f57d2d5a4de39e7ec58ddb2384cf48a2924c4424fef2a405a4b5745b54ff63ed56d93a3fc31a1"; + sha512 = "ff37ad0845c95ff043c906bf80b7221a541a1eb038ee2be63d7b2d8d1cc8ecf26698b2fed0433334454203e09c98d4166e972e07968fa32e17d826811687613d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sr/thunderbird-52.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "9457f07c9a91a163927d1cd536e6b918fa7acaec4333a9b22ac1fb8d26bc528cd34346494184bc4d4172110620bd59faab3a2e036afd3a0f6bd871e4a8efdee2"; + sha512 = "487c92ecc4123607466a0e758a16dd87537be32750b12a206129281ec42afc8fc672cebdf948b3233850b8b31338abc829ef60f8a10187eab6bedcc11cd6e11e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/sv-SE/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/sv-SE/thunderbird-52.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "d9a2e8c1f76600cd9c8e2c1992269ce6a43891e58a9d870b2e2085beadcb46d7af322fa304a99c48dea2c91a68b5adc84094e179efd39034901d1f2c68686e53"; + sha512 = "e0eb86726198982cc14db6bf1c2b7fda2b60492ed318978c6c9349ad7514eb0a35798a3179ba1cc71c84f3219439068c957c38bc87207e5ad81c200378f5ea1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/ta-LK/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/ta-LK/thunderbird-52.0.1.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "68f61602b4a6a277639df162cc404c4ee2f433daf7bc5b1ad51372e5ba1a469b111d66837be27db3f42e56239f2c34d632a8ccd92fdaea58a6306da822070ab0"; + sha512 = "7a3ab20a071e8cd1728104c31260e3b443cf5c88e116240ce4575c544708fcd5ba386385c72d38b98c1ad76c1d58ff3553828d547e1e64e179521edbe5d31388"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/tr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/tr/thunderbird-52.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "511eb1a4dc9629b5dc7aee5fc47ea2610e367ac871814c6746094cf0250498db59da74b4e3ac84c54a26b4647d3c08b3e5252b6546421d071e203559abe942da"; + sha512 = "6ffd911857ecc23c6a41181b684cb9cf9eadc7a76ecb1cade7ae1a5cedca1cff5b18660d76d6b10d722f28493a618417ccf31037229a1af62281c04360a986a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/uk/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/uk/thunderbird-52.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "07e8b6be8081069ae6a33e30c936ea26faa1dd9018fe78bc0d8783c7e9f4aec35a7ee8ea8fa6fa0763348423f11b4a60fa34c4f64cce1cb45d470512a7b889f1"; + sha512 = "751b43543f7ec4684f4f71450aa301e5f63ea252901cec77593ff637fbb054a578d7fc13a58ba05247af46e86af11f1ec7f0151ab49eb4f824fb11c03c15c6cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/vi/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/vi/thunderbird-52.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "1fb6aa8661adeecbd3fde91e1158f102573e847a88b5ac2e2e79502c292a200edd4a93393fd5e44cccaaf2f91d7195722eb5e0df768fcabcaddb1681d85b5a48"; + sha512 = "9aa955924e9a7cf6dbf9f9ad94e9d8cff9f91cda4da5ddb8a1e9d2719081ba5adce1cdb57ec55a76473679c63dddc9ac95589503adfa5d4ad00afae6002ff4fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/zh-CN/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/zh-CN/thunderbird-52.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "807459ac5666d19595b2095c78116921b046f0cf3c7a4958d56fce8e92e81ac34cb62137a199b7489c72aef1226d29b0c39f34fb9e30c03b1ece12668a00ce1e"; + sha512 = "3bf34fb329ea1bceab24b0249c138e82c3725569ac82023a33d70c8a94e559f9d930b277bfb8df34571e4e2195293ee997de95c6dc22285be9e3ef15bd145ebf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-x86_64/zh-TW/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-x86_64/zh-TW/thunderbird-52.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "f233f514a91b558b9b792d2c72fa725f1232786797c52d37d49974562f360b5bd94a02efad1aef751ab74d94fd18de389b6dae416497bb764b474c2dcf90fb18"; + sha512 = "f8928de4dce61b52fd69305023ff4893e35cfba2aa712dc34dc7deb024a36cd7c12a662a497a21e7f647b14779216a3aa2b6a01f84751860dea04b388b265c6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ar/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ar/thunderbird-52.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "cb89eb4eb32ac39202cf651aecc963ca0a1b215f5bda3e23fbade26da7c760e3e0ff06184f963904441c8db5ce4f12b34d5d28a6f119c80a5a20305478ed8b54"; + sha512 = "1a5f8a3da90724b1a85b63b7fee31d104e4ba1620b25e6823fa556d8f675335f3c25dce0499defbf8277c3fb6db98c58500aa6ec1460a194715d2d87942a35ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ast/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ast/thunderbird-52.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "4cd5cdeea7420f5cc7f1dc2aac10f8db743fcac080a3ecd2b0af33403d364ff6ed711d4307b5126686e06f7d0e759c9f2ebcc69bd21b2eb297a3052a66f483ce"; + sha512 = "a4f5994657846378b0a472deb03d87fc30d27b35d9787c8fa53a7b428dbd4f3b0bef988863894606dc9b6c2370965353bba4b54140602a5acb7f3da433822f72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/be/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/be/thunderbird-52.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "cf4306a2fee98805722391e32f11e230b6b9c400cda8e555900126f6f19e03ef8e45268fbedc81b05a1a2b408b82e740c601ec1d315d3a34257a7513d400726e"; + sha512 = "2c029ac149cfab2eef9e1812dfaf755692265df49bc564f665e34308a1124f749a47850cfc19d1b15a16ee63aaa319ffce97e7025e894aa4a94c91cf81998f28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/bg/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/bg/thunderbird-52.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "0ac427d9b8967316e5b9fe434ac20d019e93fdc4a59f4f0914069d9b9b2fb4238f9f80d030df0b1d07893a0332fd400c2359fcc6dc7bfa728774adfd098fe25e"; + sha512 = "ece638e2a33645df20d4c59b157efc57650b591b78e774dc5f82174495faa6afe9e80aac62e5fa106feb29d5cd7369313e3a182adc65e7c9f870a7d0e9e796e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/bn-BD/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/bn-BD/thunderbird-52.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "035d95bedde2b80451c03412bc3b732f2485931421f0581c8b9d20b543fdd0237334e46e819d98762097dfe321ecd4e872495e6d7478c4632cbf793839a369ce"; + sha512 = "8c799ded0a1d090bc8a82044dbbe843f737d9e0481db6ddf33b1609e19b0f7535249677b22a53d71a3f7cf430adeb86421eb2383cad5c73317da71c2c15e50b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/br/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/br/thunderbird-52.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "156ded085c9800dd6413950e2fa26a2de67834ff48712a3a893e284ff8ec6e18f2eef02031c3962d72b171dda432ac679e6a31b2ffa0f766af1ae8ff6d6ebd20"; + sha512 = "9417121f1d26d5be82e4857b87283857b072e433e0d90c191902a118489f165add64a5241309934a0b91cb21128c92326a4ce98622a2b2444e55d5bf7ddf57ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ca/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ca/thunderbird-52.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "7affe51b4e92dc04569affea1165bbcfeb66468d7c1c1056ce03013c924af3de6c8d979ccb898c9985b0ae076bb662d692d11d7bbbd82e59a9b3bfaf0ca8c584"; + sha512 = "0b0e29ac69055336f5e157bb48d86316f36d86f0e984a11a000e4c4518478e8198cd4eb2d6815c1c6456d17c6047d92ff5ae0f6ef4f26a96bd172b8c0a8c308d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/cs/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/cs/thunderbird-52.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "0c5aaeb88985ac6167c0f28f4115eb3a95be16900677ccf0cf55fa99c7194997939f141ff2bf2d497bce9260628eb2a76083c7e3a1d81511dafb829fac2a91b4"; + sha512 = "6124454cd4ded6cecf953beab5fff1ed6105ba881624b83fef6c0d8798bab161a63abc3b0dd9a94fff5ed850f638feb95f5de4b9268b9ea71b9fb5eb52618407"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/cy/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/cy/thunderbird-52.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "0776b21cfc88061b9550ca9a0c3d77a791dcb403f7355235611d4d5861c36a1cd0f64a8ae1de3e5d76bbc560f76f2d6819ca53dc57be5d0fd2a3ebca81d7007b"; + sha512 = "b1f0c7dae07a7130f1e9f2abfeff12008ce40f7486ef14964c17c7e665c3b4ceb52e48d504965da78993117f5bb12e14853c2a740b00a71c03574445f1129db9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/da/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/da/thunderbird-52.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f22f9601cacfcb440a8657a810ad903000b1541930df88766098e1621c883e8f320c13fd09ca7958ce134d93f7aedd22f659b27fd7c50329e67659820034ef41"; + sha512 = "5b1e6fd39cfd1d206a1a670a25df98ea73f490be5880a5190ab918b9ffc852000085c0ad89dec1dcea25c101a7ccc43bbc531f63a5dae95a515e0152dd2eee21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/de/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/de/thunderbird-52.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "6537e54372558d8a65f54e34aa5012b01d637f309ade5708ab040a345ec7c22cc07646caf0f84e68b5d926d24e9dd3d39fd121578ddd7027b2542b93005199f1"; + sha512 = "5690e0d91c4969f36805e21348fd5d868cf02dc524f24081b4af9afde85ec053a76f4b7a7746c591514973cf18b0e153b9e54112393aeea501e7696b3f63b0ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/dsb/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/dsb/thunderbird-52.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "a913816a013a3209a071c9666a92e7a876e601bf22af4f3ad6b331788b4693967d5e7a9059dfcd23fa797c7222a303e6708ec3bc39e3f4acaa9650688a2bf4fb"; + sha512 = "8b5663ccb6402578181d84ae92a823d86c243fcdb77a25c69e6be660d137fadde4fae5ca5385bc393d9809ae06bb9b57c68791c8d06c864e710e9f33ab2183e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/el/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/el/thunderbird-52.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "81e8308d1911d45fc1b4da582fee526d52245e96b4935119da542f53434abcfc9d7319acf902b706d667e03e05f4e39c8fe6b5424fd2077c862bff102eab49eb"; + sha512 = "0cbf7aeb360ac59d4d4dcac603194c03082e37325c0aa08e79a872f819f5cb25484f0cd7577333194d12a80260ac665fc964b4300c49c2f96c6a6e885cc8b8c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/en-GB/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/en-GB/thunderbird-52.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "e93fe34674f8cb02e9fb2b2b2695c402e2a4cb35f7b4bfbe96c41cf27e6dd0130647d236a918c9595dedac0b7450aab4c8acfb9e2f18a99979b7099353447507"; + sha512 = "fd565d48ceeaddca038265577fef52643218afdcaeda5d022ea125012ed565628670aeb6db3822830a39b43b8372d843129dbeaabaabe7904e93a2389c03957c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/en-US/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/en-US/thunderbird-52.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "a71b372f1404b1de310494bef37b3d511318d050ce24109fc56749718cdc19a3812323529e9a4a9cb6e9d81794c600c62d5f4487595e4db3a1df444a40d97066"; + sha512 = "a0c4dbb1f39e9bacf8fdd7660d280142c072ab709204f02a2ea4eb7dab9a4475a121551c98fedb4cac2f1700b0adace7e7af04decd8c2d65bb14a4bc58bf8b59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/es-AR/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/es-AR/thunderbird-52.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "bb38d967c613da3122ee421b95d5fa633581193f4899407125403f13d754f1061f78770d342bdeff0e597e1ce813283b25ecb6556aa5bd095f40386fb4e6b563"; + sha512 = "205893ac76ba91d29ed6f169da01b0ac548e03985eae64955c5493969060c7eb31b6fe0557ecf17301576e1a4b637f2615818ef38322f91bb366c747530dfe22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/es-ES/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/es-ES/thunderbird-52.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "77c8da8cd474ea74b0313efdea0bb428bfe164c243178fafe75075b71df8eaba764d7ae9258d00ce02fce3ed4648ce839c46f3f9e431e0123bd41bf313954fb4"; + sha512 = "6ffbb09840acf9033a7f1f1b19e81d6d51cb90f2578c741c42a81f2e7413d4e9f47afbf756a7b317dd7e7d66ffd025c0d2af31c765c7a8318a291e63d4eeb8a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/et/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/et/thunderbird-52.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "323bee6b4005c78c95f1621e9a89d9faa95da44316ce01792e7488b00562d1d64ac23dcf7974d5162e52bff4b9327cfdcff0a85524869cacc4431fe6b1450436"; + sha512 = "79907c40de73a6761bc94b72395eddfd44cac795c6ab0614e764f467f59eb506829c9957ac3fa338feea8a900134195fe549c6b4568655078904337755319523"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/eu/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/eu/thunderbird-52.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d90d4364e891794147ad447f3248444218422f6140e7a202554f25a494a2fdc399823f83ce85edf496753125076b83e19a28987b2dab3aff582d1e860a238d73"; + sha512 = "dd799f923143380e7a639a9ba313e24dc4457e6a0ec9d6b266103e64c606db2ee702f56fca746049972b2fb63f03713307ee7a19ca7b3dcb93ac6d6cabc897db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/fi/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/fi/thunderbird-52.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b0c9a426eb74f9a8ef3972f40d4a5d73a1eefadf402e65a137043ecdb9f4e0b79c4e84f78c03afaa3d6f0d455b62ecece1861bc289091f5c2354a226c7e10ffd"; + sha512 = "1aed6627a6a0a72d5e0d52b1831d4f756205d92aadccff43a1b9543d0d426b2cea3b9d20ca1829f29b1c9a1a832a43a7cbe9b870aab138df3133c2e886d826c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/fr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/fr/thunderbird-52.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "9e44644cdc545e52e230e440e2277db6b465a5b36d00c7a7fdd65bf8a141e98444682dc1ab8ce2c85d15ef82e739fe3fc7225c551643244d565a06e883227dca"; + sha512 = "c3d1fc74da5379825e180c3a3d0569c83a3f0098eeb396fd73eb3470d054207317506fead5b116a32b7a3e2a4c7c98431da9eb16548daef3baab052d53f432ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/fy-NL/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/fy-NL/thunderbird-52.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "f3885565bf6bd223494c2169655844023732207172808d8768f148416d8e56eeba3a154e4b9526bd5799cf400369c7f25e41a5a1b78d17d2fd266f6c1de6bb38"; + sha512 = "c557220187979d06f1697511a69dac852c3f6662e6474b9d8bd0f0d49b5211d5963b1b6dc75a0e3f831bc724f3e28e0548da7cd67e8ab90c29901e07ec802f03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ga-IE/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ga-IE/thunderbird-52.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "f23f42508eb4f4deff3e5b7f39e5ff5e54bf2c973c56a9800036cc1add4b64b0c597babd60a045ed51cae86c025f8455dfb11ad0c1ecf1b774529810519c4ebd"; + sha512 = "02b3ba15ab86764cf41d275aea8d39310455e74e0f00418c91151bfea623385efe0c59202dc499a7f3e72cb6c64c7c30ce35663c1fe69a761a1761865f7852a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/gd/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/gd/thunderbird-52.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "05b37eddcb7d8f78c0676bf918483144d98d935736b562c9fa4b60d1bf290ead4cc9328198da86379d8ed3055d4ed36170897567b3f1273824f7242925d8f55c"; + sha512 = "24086d6f92611b0b8a9e3b79e42a5494dca7147bf8597df33d5d3ff745a1bac41ce39156f7df43bd6c21b4e845474ca085f9082cf4207cfec982c50a88fc6c16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/gl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/gl/thunderbird-52.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "59fab273843a9f1fba78c19d63bd61c0cac0fb28ecc78549dcf4d52955dc108b5e4bd963e49652c4a7e8e4b6c66ce9e62d24a8db6b67b76b234c860d889942d2"; + sha512 = "66b9b1f073b352a6c3147e44631b88cd79e1985a4d6dabea142170871cb795778edcf2e7c2f0d4b94dbf35b24783b26e30534402d2a5e05cf2587609183820f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/he/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/he/thunderbird-52.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "63ad6fd03ce2503431d759d56f3ca92168a7eaf1d23aeaa7c9be5206c94d51813f3ddc06489f2e47d2a182e8dac425e35031b9ddafdc8de34a31f0b69d4c8771"; + sha512 = "b52223e1314043ea50a70184e7812533b389cc58c6e0442daa96975955645478ee161e60f4a8e4f517164efac83e0157bfe6a88d25d056f3849ebd3652b39d56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/hr/thunderbird-52.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "3184f7e69c48ee4972aeb4ff7c59bd5db99e5afbab54c82271059c9c2a5d6d42fee1f31030ca7c92812486d9e4c457bb35984a1dc5c055ecf9f7ad9f8e34a986"; + sha512 = "010c2ae0a21e167613b88c110ed93e6e60920e8343c6ef22159dddd116f2cdaec18a6545132bac87d828ea717d6090979ad88483093cc280f9f97292fae1e456"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hsb/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/hsb/thunderbird-52.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "4b8a847889b02b04e80301756e403e0c1d8c38db7ad5c74d843e25f29ffbca1e7449d9e6a4ccb55042f868e3c8018ab00f6f4cd53c86518b3b922618c34b6e7c"; + sha512 = "1f7b6864a4760ad77c3b93f56eaa80f07c89cfbbf03523c71c74f7677c4a3b7b54505cc720990308477316d7e30839916b1c51cff8d3cd5c9af99919df8a3f38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hu/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/hu/thunderbird-52.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "e0887449cd5668bd06101c637a235d989c93fc831f98b09c7cee031de439d7db9b0a8bb50c1b4fce47bc6c9ef8769d84824e211c7812fa40fb962f88120b9cf1"; + sha512 = "5ef71ed0803dfbc0c4ecb28de017969e40b9df3c6099866863004914fff1804a010f721d779f43e6b240d7b309b7877664b5d96ea2c5dfef6fe0403b3592c359"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/hy-AM/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/hy-AM/thunderbird-52.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "f00f3d7c58eedffd39d012391c9464d8e0411fd557d1e52191e635503fa5610bb01137c062c455d9174ee83268f81218f9dff9272f4ade078c003f352a16e4d7"; + sha512 = "2271c6d528dfd2e61c98dc976a0aadc20d39bd8d1e7cdeefe7cdebd9e0eedcfc17e6503c8b204d560b2b9bdd05b5a87de5b0422268e39ef8fc1a31874a7807e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/id/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/id/thunderbird-52.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "7e0fcd2d2773a8f765c21b00b1d1945113219ad6834763aa491fcc570c5c536ebe0089c0f0495794d36a2691674fdcb8b22bd95de5a5dbef2f1426024b2bbce4"; + sha512 = "6469eed9762451392ff88ef76a4811b4122413050c4eb5b7f7ccc97e34ae0ce5c00ac8ccd41aeda92a9478d335f62bc2055e7200d1bae5217cc7370275ff72e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/is/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/is/thunderbird-52.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "48d7879aef3e4528c4db7a86cc28dccf31087d171e103ed9b7bfbcab8fb07ace3353a259edd11ae20bf86ddacb31f2c11d96d460a2a2a8ca3c3935fd6d8c5df1"; + sha512 = "6b46c946d456408152f7058540a1247f278b0d228717f089582f11a2e6c8221834fb09da48c93aa8ccd68fab537719d0f8ec3b16cd043ce6b59113cce75d1018"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/it/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/it/thunderbird-52.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4a3437fc5e64ac4e0ed674072ff8311548cb0da1c29bed28d7d47c935aa906905e0d153d00ae434899f281d5efac9c306b2456b58c131369ff993f405491265a"; + sha512 = "2fa1ad4d939fd916e29d3f76bbc55f2eef4823225d32bf2292e03fc59c81d24657aabdd228df092e4039ddd555e7ea3a39c840bec58154f10c8535a79a2d3814"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ja/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ja/thunderbird-52.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d148936fce3b77cfe79c3acd195bc837eba485d6600dd2a19a9d76765435ac6fc6688473eb8572d4bf40461dbca5562cee4baefc9c98aaddb03679748ca4c36c"; + sha512 = "c4ad832486169e0bbbc1a14a7da399e0149b236a8ad9b71ec723a6c9098c4c90446e0c2c8ae0e4ccd78a48fdf8096f6b0290b0f6ab74469a53b8259358e6ea03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/kab/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/kab/thunderbird-52.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "64e1f2044f8dbb1664d8d4ba85514ed17b3c49a16770c4b64e10873e092a9424d939e7fe6bb8d6d1df5f9f3663e259206fe83149f45de16aadf6fb16a8b04755"; + sha512 = "9cfafbe2030610fa01901600c6661af69f9bd66f10c76ab227da966cc860e4a1ab9c07a80b3901d72ee440762536ddd0c1d478539f1087215dfe130e507df79a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ko/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ko/thunderbird-52.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "886566909754431b806bef2f314cc3fcd7330e2df5119c2bf65f5f48a9cf7bc378253c4e1f1b8b6cfa409962d6a801bd6547bf2071738ee1b20306fe64318748"; + sha512 = "640c0f3466aebfb43b88e8a580797661a2eb016f4eea4d9dd081009f4bdb17008bbcae1759a2d70d8dda3159f024813ee943b2a88a0c21a97f14f4079dc7744a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/lt/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/lt/thunderbird-52.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "24377735d80a0d23ceee9b5594cd37c277141b7ad33b146c7a304fa1de66326adf76443966e17fbb1995848d41374cc44137a8b2956e1254744d50a643e4db82"; + sha512 = "9a5c403ea9456d2f27b77c7a46120f45eddad60fc2d93617b246d5b7b7cc59a93698d00dfc35b33997cac5ff71ffb036469f63e8553cf8cc6a73de8959b76b9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/nb-NO/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/nb-NO/thunderbird-52.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "d53d4089bc057a66cd785e263272962765b2c02eebce6e0830c84748a17cdf09d478f329b486532fbbcfea13967060d2ea2e758b07a8a6cb0a6b56c0a95d611d"; + sha512 = "c485347ea4518875bcc384259bbb63b1bf2b6c1e5fb76e7540bea9ac664c0f6b517c563144489ce6ce3a65fc6aa9736088040020e073627fca032ae53c3c6e2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/nl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/nl/thunderbird-52.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "2d23cacfa1166315e5b30562e620bb8f2fedefe62b3478d12ea4bd2a3f9bd24b29022df9c14f76756cca05eae7edc134c505faae8549f701074481d7ad3bb5ae"; + sha512 = "fab94d96dd0a0cd8370c336acda2049c58c73b7f22f7975d8304a33d81950ebf82a14a335dbea02d8e78a63512b4bac041965516948812d9ee833342fd54c951"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/nn-NO/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/nn-NO/thunderbird-52.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "518f61379d62f38a1b496221bc898108a693c3378488e7b450c3fb4b133317d9ca92e17e93cf502a8e79b8a3254763aaa0f6b1513487089da514e8c153c432c1"; + sha512 = "63917ddf88f0731c228bf04513a753216c9393f2a9eef685ef36d0d6d442491e6eddcbf4e77cc87c4b588878667aec08c4346f3418a148af77585b0b037285b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pa-IN/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/pa-IN/thunderbird-52.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "7ede43d3c8e60529df4ffe62a1f3ebe3c6420f8601c7838afceafe0ca553ac80328f78d82fc04ba68a5af69b71671722509697e9c73ebaa9603f6de0bc42ada4"; + sha512 = "c49d476f02431e3ef23680ffb3dd58dc226e5b6c25003df7a98bebf69a0bb0167d60edc0ff764c9e36aeb9e7a06f19fec4651bee293f986b30688cec2f6d1d9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/pl/thunderbird-52.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "18a211aa55724882f3531a8bd588bc418d5d136eef5ad027c18c5b00bac7d0bff6ebf4fef8d3a1d49cf46adfa10040b2cae1e5f039e817067319c66e5af6715a"; + sha512 = "3764defe3440f4c283d9c9e806c05653017f70921d84778a40d71bfc4028d146b8aff5114631050fb3eca8c9f1b33e40f5440c647fadf238ce36dc0eb5245a27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pt-BR/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/pt-BR/thunderbird-52.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d5f65af63813b27454d21df094c5b709a1f590144853e9082814ca525ee75f56f1d8aeb9df09bc49c7eeb41eebab6acd46bbc086db4f70c54b8e7be3f9939fdb"; + sha512 = "3c016085676d2fb8b98685d7785f4163ebe4382f051760f2596e072f37c8d5121cdf87b5a90448a1360213fe2f6c1c369be04d744c22d39f7ce4dc6135fe458b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/pt-PT/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/pt-PT/thunderbird-52.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "66677c8d8e2c9c38b7efefad3ddb14586f6bdeef74087239c7a16e66062afeb719b928a29a516bd720a716d1b05c4e8bcf21cd84f641140acc96ec1ab85165e1"; + sha512 = "79ee1c273c74993b5e98ad9fb3c8434284e414dd14a70028525d214454f83ee1a1475531dd001d1b34ec37eb903f12f9675b388e7728c51c52164020e5cda0db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/rm/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/rm/thunderbird-52.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "2692412244a2153ea701cdc5d6b41caabea82440d5f9eed85ff1024973d287fd0c60066503c8f5336bfe36a9726a0a4df8e30c2181b7d66206c6b3a23a32582c"; + sha512 = "f150d1652924fc6a5f3ab9116a1000c08c99cc597fb433c3c27a4b4008768cd63034ccf6ed75870fa4444af02cbad33d0d11433017a3df461d98af59c1d6c8d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ro/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ro/thunderbird-52.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "3592cb39b622983758c8513a977a2acbd168699ccaee5fb8b6e7cc1714334e4cc48bb48712a764c4a6954d8fbebfa5a1156a89cf41b488026fc2713934a06319"; + sha512 = "524f5266679084fa3d3dd97daa66d2c1c729c70e9d1a77dbb6565e0d8e15dba507f33c4ce4e4ab11a31f69dfafcb67b0d7ef2b20c21b8d98608d242f63313e2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ru/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ru/thunderbird-52.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "df0ad7e0248a0471130faca0fe09f28725352927f362e906365918939d19d0d18a86fa84058463f59376ffbe4f66d574a10823b5e88be3eed8ec39d17c2e2a7a"; + sha512 = "fdc15364d34e676db345189247033b25a6b7cff4cf6b0096845a672e0ecb4d5ae41105b139c6814f359c5f4c2cdb2165faccca1028fe085bca1dd165920030e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/si/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/si/thunderbird-52.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "67c3c007ab101d5528613913a75f512befedb6d1cf1f105c19ffb78a5906c2fc6ab01408a290da58cd04667b6c851219aee0a0df7b9a42d1d7f82b244e046d42"; + sha512 = "d6782f94a20cc654801f3f17cc0b01fef195423b83c4f0ee9582de6af4f7fca97ec12649ae0de432d9ca2f3f1519b399a82609e70f101cea30f85e377dbabd4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sk/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sk/thunderbird-52.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "9113fb1d2150c191abe647b761eed5747341ff779e1a02b724f604fe1193b845130cda9585adb8fd4e8f23f9a3f22a5c8c90f9acd5b3381d3f26eb95e5a74259"; + sha512 = "0c3072655ebffc0527f678a1b68cf56b117ea7b247891e12b80c22f2a4936ae087dafe17144d58a406d5b5bf38d2e6090c5146b6d3d34fa5b3ccd911cc960e58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sl/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sl/thunderbird-52.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "1ae92f74625a1fc54b0cf2073c8c687fe853dbdc318cc10a2e997f4b6e8062b500f5761128a228987a81f86a2f501163e5fbce5fde05c41a3e2ce0d74c2fc14b"; + sha512 = "439dd725c83bf40b258712385ef8a5286e92b10dc77996c16c6cd22589f7ea276ced47788bae29a6ecc3d2d785f25ce99c98a18fd4f9e0330478645803cc0944"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sq/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sq/thunderbird-52.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "45312d0b18565df69734178eb03b58cd0ea813d7ae099edc03d871a763f715483d9d6a4c375c4f4e6a081d59809beb789c01f0efbe047a6a5d7af40f3280a517"; + sha512 = "59b342d58a04cd4b71f1ae67ba66e3d10f4f464612f6e072c838fa5cf3479ada72fa7be09a10508dcc62da10983cd284f20ca6e4e6874fc92433337332733d51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sr/thunderbird-52.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "61756439561a7395b7f9bd55dbf16e73def6e55469a2e4bdc84207bb9aae5761002411900ed8e31e1a32c2f854b95c9ce0f35f17d15fba673b4e61e07a9675e9"; + sha512 = "1cb49257c91ba6afa41aeaa60380b812017210ea102dec90e405fa80ba48fbf8df70d4128c6c0bbab3bfabf81ee21b06c8180f38cbd87715093ae872f4c941e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/sv-SE/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/sv-SE/thunderbird-52.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "94cecbfb7d6f6ac060fd2b2aabdb3e049832055c969fa7d3ff518a91b3ccb39f9902910bd282c2d8796e16ea641d6443e4a87545c2328e34e6b567ce6cd2dad1"; + sha512 = "28c6554e85186f5eefd79f63c9d0b3d258ce76c29156e70c1badbfc71e201ee82889223d7c60a98e3fd44644937378892725136781e9a1644007c80207ba1cb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/ta-LK/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/ta-LK/thunderbird-52.0.1.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "05b4d35f6288944f0fc527c0338ab5cb204d5746b86265638fe66a1921297ad2a6de166782fd5948006d6d71a70c62735afd4936a87b3691d975813fc4ee0be5"; + sha512 = "9f04041814a6f806b9b24aceedb9a7e608384b65a9b607994eded3813af83467c4ab8d85beb972775da7daaf0a86ab55bd74bbdda2a499323b6761550f568a61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/tr/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/tr/thunderbird-52.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "98e5f9e9d2f90c6d5b05555f6977bf00179fd8dab49afc2aa157f36ec1c58a5e87043de85de90ee03c7db985f00855ee83d30537b2e514518e90ab782031b426"; + sha512 = "bceaae576db6d1f49c40e9e361b77580f5bf142945ebf20b3cf38b0b61d8a68a2b9478b5a1dfea114daec363aec5934fbcef4ae88638626fe3ff93a28f07ccd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/uk/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/uk/thunderbird-52.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "1495bad171ef4cb4f32e5b02c63c7cc2b8032485192adf5e5d8d8bb8fed897e98e6ead1bf1c71f131178e0059905c82296fb2ab4275c5c979cd963c4176246e6"; + sha512 = "e88f4f496e3dd19655e76a3b79e4519a05e76390fb3acf05d194a300bc459a1e66b082a6150b9f4ec82308c881de402b30474764f946f81f55c1ea6e483e4161"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/vi/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/vi/thunderbird-52.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "23f96b086356818ee9d451651514c84212e98b0616021789e9215dee2a97cc43d06373162860def7fbe00514651b6fa0395ccebf4823a7e5622d432467dd0365"; + sha512 = "1c361e41b1ba06d9a08cfbb5532619311d81e3a7717eb0dd2d289195f198be7fea2558df707f97a49846fe073a0c775cfae610ed3fabeaa2cedbb1fa7c21d8ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/zh-CN/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/zh-CN/thunderbird-52.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "129cf69e007ea57550ee0eafcd086050ad3c70ef6671f7e56f12679bd9fafd40916e206aa932fb339bb361c4d4894bb6aff8199334c21894d48e01bdbe2a9bd5"; + sha512 = "fabe94285cbc1ca40e398dd41747fcfb0a51aaefe3346835ac6e3946d5d8ce1610d39c55276e2c6e02f7a1424af46a06529d5533aeb83b8448aff0dd9183a6b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0/linux-i686/zh-TW/thunderbird-52.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.0.1/linux-i686/zh-TW/thunderbird-52.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "3fcac7432ce9e1ef4edea97719628374d50173dbb0623866c9bc6aa9644a4d1cebbd640e7dae969b3a7bd067cd29a6d4ff1fb58c18f3eaf3e12c1f9d87f222ce"; + sha512 = "f4764c8fae1231d1e10c30baf99583c534fb403ff03ca9a61a472d932645590ee863b56feb13df13438a7eef83e55445be196a9f62078a0e18961edb043bbec9"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 661d499d34e6..bb82cac0e84d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -7,6 +7,7 @@ , autoconf213, which, m4 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl , enableGTK3 ? false, gtk3, wrapGAppsHook +, enableCalendar ? true , debugBuild ? false , # If you want the resulting program to call itself "Thunderbird" instead # of "Earlybird" or whatever, enable this option. However, those @@ -18,11 +19,11 @@ stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.0"; + version = "52.0.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "215de8ae386f6f12d7a4338bb03bac956410be0dd4de5cca218e12241e3948c8c2540756e149bfde597cd10e399b4cb4db86619a2aa50a368ba323b413c1f93c"; + sha512 = "7b8324a230a10b738b9a28c31b195bfb149b1f47eec6662d93a7d0c424d56303dbc2bca6645b30323c6da86628d6e49de359e1067081a5d0bd66541174a8be48"; }; # New sed no longer tolerates this mistake. @@ -77,6 +78,7 @@ stdenv.mkDerivation rec { "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}" ] + ++ lib.optional enableCalendar "--enable-calendar" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] else [ "--disable-debug" "--enable-release" "--disable-debug-symbols" diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index adcfa656eb98..3ec24bb20226 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -123,14 +123,14 @@ let }; gitSource = rec { - version = "1.3.0-git-2016-04-10"; + version = "2017-04-16"; qtVersion = 5; # Needs submodules src = fetchgit { url = "https://github.com/mumble-voip/mumble"; - rev = "0502fa67b036bae9f07a586d9f05a8bf74c24291"; - sha256 = "07c1r26i0b5z7i787nr4mc60799skdzsh764ckk3gdi76agp2r2z"; + rev = "eb63d0b14a7bc19bfdf34f80921798f0a67cdedf"; + sha256 = "1nirbx0fnvi1nl6s5hrm4b0v7s2i22yshkmqnfjhxyr0y272s7lh"; }; }; in { diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 288fa4383610..5c9e96c65277 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -9,7 +9,7 @@ let mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]); - deps = ps: (with ps; [ dbus alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst ]); + deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]); tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux); tvldpath64 = lib.makeLibraryPath (deps pkgs); in @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { rm -R \ $out/share/teamviewer/logfiles \ $out/share/teamviewer/config \ - $out/share/teamviewer/tv_bin/{xdg-utils,RTlib} \ + $out/share/teamviewer/tv_bin/xdg-utils \ $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh} ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin @@ -57,13 +57,13 @@ stdenv.mkDerivation rec { sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop - for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do + for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/* RTlib/libQtCore.so.4; do echo "patching $i" - patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${tvldpath32} $i || true + patchelf --set-interpreter $(cat ${ld32}) --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true done - for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so; do + for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so RTlib/*.so* ; do echo "patching $i" - patchelf --set-rpath ${tvldpath32} $i || true + patchelf --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true done ${if stdenv.system == "x86_64-linux" then '' patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64 @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ jagajaga ]; + maintainers = with maintainers; [ jagajaga dasuxullebt ]; }; } diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix index 72f6c5de8a19..70d5180191e9 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/applications/office/beancount/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchhg, pkgs, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "2.0b13"; + version = "2.0b15"; name = "beancount-${version}"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/b/beancount/${name}.tar.gz"; - sha256 = "16gkcq28bwd015b1qhdr5d7vhxid8xfn6ia4n9n8dnl5n448yqkm"; + sha256 = "1dvnpgja4v4k5zagfsmdjavlib0z3r9r4z197yvj86szhzs0z86k"; }; buildInputs = with pythonPackages; [ nose ]; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index a246c7290a56..437a0cbbd133 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,17 +1,19 @@ { stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }: python3Packages.buildPythonApplication rec { - version = "1.2"; + version = "1.3"; name = "fava-${version}"; - src = fetchurl { - url = "https://github.com/beancount/fava/archive/v${version}.tar.gz"; - sha256 = "0sykx054w4cvr0pgbqph0lmkxffafl83k5ir252gl5znxgcvg6yw"; + src = fetchFromGitHub { + owner = "beancount"; + repo = "fava"; + rev = "v${version}"; + sha256 = "0g0aj0qcmpny6dipi00nks7h3mf5a4jfd6bxjm1rb5807wswcpg8"; }; assets = fetchzip { - url = "https://github.com/beancount/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz"; - sha256 = "1lk6s3s6xvvwbcbkr1qpr9bqdgwspk3vms25zjd6xcs21s3hchmp"; + url = "https://github.com/beancount/fava/releases/download/v${version}/fava-${version}.tar.gz"; + sha256 = "0yn2psbn436g1w5ixn94z8ca6dfd54izg98979arn0k7slpiccvz"; }; buildInputs = with python3Packages; [ pytest_30 ]; diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix new file mode 100644 index 000000000000..a45e5df2f528 --- /dev/null +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, cmake, gcc, zlib }: + +stdenv.mkDerivation rec { + name = "diamond-0.8.36"; + + src = fetchurl { + url = "https://github.com/bbuchfink/diamond/archive/v0.8.36.tar.gz"; + sha256 = "092smzzjcg51n3x4h84k52ijpz9m40ri838j9k2i463ribc3c8rh"; + }; + + patches = [ + ./diamond-0.8.36-no-warning.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib ]; + + meta = with stdenv.lib; { + description = "Accelerated BLAST compatible local sequence aligner"; + longDescription = '' + A sequence aligner for protein and translated DNA + searches and functions as a drop-in replacement for the NCBI BLAST + software tools. It is suitable for protein-protein search as well as + DNA-protein search on short reads and longer sequences including contigs + and assemblies, providing a speedup of BLAST ranging up to x20,000. + + DIAMOND is developed by Benjamin Buchfink. Feel free to contact him for support (Email Twitter). + + If you use DIAMOND in published research, please cite + B. Buchfink, Xie C., D. Huson, + "Fast and sensitive protein alignment using DIAMOND", + Nature Methods 12, 59-60 (2015). + ''; + homepage = https://github.com/bbuchfink/diamond; + license = { + fullName = "University of Tuebingen, Benjamin Buchfink"; + url = https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING; + }; + maintainers = [ maintainers.metabar ]; + }; +} diff --git a/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch b/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch new file mode 100644 index 000000000000..a16d475c5564 --- /dev/null +++ b/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch @@ -0,0 +1,20 @@ +diff -u -r diamond-0.8.36/src/dp/scalar_traceback.h diamond-0.8.36-patched/src/dp/scalar_traceback.h +--- diamond-0.8.36/src/dp/scalar_traceback.h 2017-02-06 16:32:05.000000000 +0100 ++++ diamond-0.8.36-patched/src/dp/scalar_traceback.h 2017-02-23 15:13:24.000000000 +0100 +@@ -19,6 +19,7 @@ + #ifndef SCALAR_TRACEBACK_H_ + #define SCALAR_TRACEBACK_H_ + ++#include <cmath> + #include <exception> + #include "../basic/score_matrix.h" + +@@ -31,7 +32,7 @@ + template<> + inline bool almost_equal<float>(float x, float y) + { +- return abs(x - y) < 0.001f; ++ return std::abs(x - y) < 0.001f; + } + + template<typename _score> diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 7656668f0564..8a3645705ab5 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,18 +1,18 @@ -{ fetchurl, stdenv, cmake, perl, ruby, boost, lua5_1, graphviz, libsigcxx -, libunwind, elfutils +{ fetchurl, stdenv, cmake, perl, ruby, boost, lua5_3, graphviz, libsigcxx +, libunwind, elfutils, python3, doxygen }: stdenv.mkDerivation rec { - version = "3.11.1"; + version = "3.15"; name = "simgrid-${version}"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/33686/${name}.tar.gz"; - sha256 = "0mkrzxpf42lmn96khfl1791vram67r2nqsgmppd2yil889nyz5kp"; + url = "https://gforge.inria.fr/frs/download.php/36621/${name}.tar.gz"; + sha256 = "1s595wc4z8hkvim3ypfdxy16pply6ckjg10v84cc0lx9pz6i3r6i"; }; - buildInputs = [ cmake perl ruby boost lua5_1 graphviz libsigcxx libunwind - elfutils + buildInputs = [ cmake perl ruby boost lua5_3 graphviz libsigcxx libunwind + elfutils python3 doxygen ]; preConfigure = @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # Enable more functionality. export cmakeFlags="$cmakeFlags -Denable_tracing=on -Denable_jedule=on -Denable_latency_bound_tracking=on -Denable_lua=on - -Denable_ns3=on -Denable_gtnets=on + -Denable_ns3=off -Denable_gtnets=on " ''; @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { do sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g' done + patchShebangs ./tools/ ''; # Fixing the few tests that fail is left as an exercise to the reader. diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 281a39149867..6e0338da9194 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -30,6 +30,8 @@ rec { diff-so-fancy = callPackage ./diff-so-fancy { }; + ghq = callPackage ./ghq { }; + git = appendToName "minimal" gitBase; # The full-featured Git. @@ -68,6 +70,8 @@ rec { git-octopus = callPackage ./git-octopus { }; + git-open = callPackage ./git-open { }; + git-radar = callPackage ./git-radar { }; git-remote-hg = callPackage ./git-remote-hg { }; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix new file mode 100644 index 000000000000..4ba86a2a0866 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "ghq-${version}"; + version = "0.7.4"; + + goPackagePath = "github.com/motemen/ghq"; + + src = fetchFromGitHub { + owner = "motemen"; + repo = "ghq"; + rev = "v${version}"; + sha256 = "0x2agr7why8mcjhq2j8kh8d0gbwx2333zgf1ribc9fn14ryas1j2"; + }; + + goDeps = ./deps.nix; + + buildFlagsArray = '' + -ldflags= + -X=main.Version=${version} + ''; + + postInstall = '' + install -m 444 -D ${src}/zsh/_ghq $bin/share/zsh/site-functions/_ghq + ''; + + meta = { + description = "Remote repository management made easy"; + homepage = https://github.com/motemen/ghq; + maintainers = with stdenv.lib.maintainers; [ sigma ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/ghq/deps.nix b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix new file mode 100644 index 000000000000..ec54803a6e76 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/ghq/deps.nix @@ -0,0 +1,38 @@ +[ + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; + sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + }; + } + { + goPackagePath = "github.com/motemen/go-colorine"; + fetch = { + type = "git"; + url = "https://github.com/motemen/go-colorine"; + rev = "49ff36b8fa42db28092361cd20dcefd0b03b1472"; + sha256 = "1rfi5gggf2sxb52whgxfl37p22r2xp27rndixbiicw6swllmml9l"; + }; + } + { + goPackagePath = "github.com/daviddengcn/go-colortext"; + fetch = { + type = "git"; + url = "https://github.com/daviddengcn/go-colortext"; + rev = "805cee6e0d43c72ba1d4e3275965ff41e0da068a"; + sha256 = "0z0ggqnprqchnd8zyrz99w53kr4sgv372lyx12z5nsh9q342pmyf"; + }; + } +] diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix new file mode 100644 index 000000000000..6b696821f1c9 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -0,0 +1,32 @@ +{stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}: + +stdenv.mkDerivation rec { + name = "git-open-${version}"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "paulirish"; + repo = "git-open"; + rev = "v${version}"; + sha256 = "005am4phf7j4ybc9k1hqsxjb7gv2i56a3axrza866pwwx1ayrhpq"; + }; + + buildInputs = [ makeWrapper ]; + + buildPhase = null; + + installPhase = '' + mkdir -p $out/bin + cp git-open $out/bin + wrapProgram $out/bin/git-open \ + --prefix PATH : "${stdenv.lib.makeBinPath [ git xdg_utils gnugrep ]}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/paulirish/git-open; + description = "Open the GitHub page or website for a repository in your browser"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.jlesquembre ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index f953bbad48ba..99c1dcb281c0 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,20 +1,29 @@ -{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 -, readline, makeWrapper, git, libiconv +{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 +, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs }: stdenv.mkDerivation rec { - name = "tig-2.2"; - - src = fetchurl { - url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; - sha256 = "0k3m894vfkgkj7xbr0j6ph91351dl6id5f0hk2ksjp5lmg9i6llg"; + pname = "tig"; + version = "2.2.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "jonas"; + repo = pname; + rev = name; + sha256 = "09xiwm57df0vzk8r2hx5p1hwy5f9q8frmdf96aba2ia9837zn3av"; }; - buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ] + nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs ]; + + autoreconfFlags = "-I tools -v"; + + buildInputs = [ ncurses readline git ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; - preConfigure = '' - export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' + # those files are inherently impure, we'll handle the corresponding dependencies. + postPatch = '' + rm -f contrib/config.make-* ''; enableParallelBuilding = true; @@ -30,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://jonas.nitro.dk/tig/"; + homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; maintainers = with maintainers; [ garbas bjornfor domenkozar qknight ]; license = licenses.gpl2; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 134e6998670c..b9848f45aabb 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -4,11 +4,11 @@ with rustPlatform; buildRustPackage rec { name = "pijul-${version}"; - version = "0.4.1"; + version = "0.4.4"; src = fetchurl { url = "https://pijul.org/releases/${name}.tar.gz"; - sha256 = "e492fde1bea839f474f5b91bb762a0fab5ff6a9bc2b8f20eb91a253ca6feda5a"; + sha256 = "8f133b7e14bfa84156c103126d53b12c6dfb996dcdebcf1091199ff9c77f3713"; }; sourceRoot = "${name}/pijul"; @@ -18,7 +18,7 @@ buildRustPackage rec { doCheck = false; - depsSha256 = "17n66clr31s49gbbcsii0f31s63rncc9mmz4wwdi0yl4r6ykv9h7"; + depsSha256 = "1zdvnarg182spgydmqwxxr929j44d771zkq7gyh152173i0xqb20"; meta = with stdenv.lib; { description = "A distributed version control system"; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index f62e274874c1..7d0cfb455306 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -23,14 +23,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.3"; + version = "1.0.7"; name = "handbrake-${version}"; src = fetchFromGitHub { owner = "HandBrake"; repo = "HandBrake"; rev = "${version}"; - sha256 = "1r8yzs0xih03p5ybx5096zkvlwxhcmg34047awmda1wq3z3rdjh5"; + sha256 = "1pdrvicq40s8n23n6k8k097kkjs3ah5wbz1mvxnfy3h2mh5rwk57"; }; nativeBuildInputs = [ @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; + enableParallelBuilding = true; + preConfigure = '' patchShebangs scripts @@ -85,6 +87,11 @@ stdenv.mkDerivation rec { cd build ''; + # icon-theme.cache belongs in the icon theme, not in individual packages + postInstall = '' + rm $out/share/icons/hicolor/icon-theme.cache + ''; + meta = with stdenv.lib; { homepage = http://handbrake.fr/; description = "A tool for ripping DVDs into video files"; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 9c421e0c8280..10656af4ef40 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -43,6 +43,15 @@ let url = "https://github.com/xbmc/FFmpeg/archive/3.1.6-${rel}.tar.gz"; sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81"; }; + # Usage of kodi fork of libdvdnav and libdvdread is necessary for functional dvd playback: + libdvdnav_src = fetchurl { + url = "https://github.com/xbmc/libdvdnav/archive/981488f.tar.gz"; + sha256 = "312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d"; + }; + libdvdread_src = fetchurl { + url = "https://github.com/xbmc/libdvdread/archive/17d99db.tar.gz"; + sha256 = "e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b"; + }; in stdenv.mkDerivation rec { name = "kodi-${version}"; version = "17.1"; @@ -92,8 +101,8 @@ in stdenv.mkDerivation rec { --replace "/bin/bash" "${bash}/bin/bash -ex" cp ${ffmpeg_3_1_6} tools/depends/target/ffmpeg/ffmpeg-3.1.6-${rel}.tar.gz ln -s ${libdvdcss.src} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz - ln -s ${libdvdnav.src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz - ln -s ${libdvdread.src} tools/depends/target/libdvdread/libdvdread-master.tar.gz + cp ${libdvdnav_src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz + cp ${libdvdread_src} tools/depends/target/libdvdread/libdvdread-master.tar.gz ''; preConfigure = '' diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 3232e9c089bc..656ec1163dc2 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -1,39 +1,33 @@ { stdenv, fetchFromGitHub -, doxygen, python3Packages, ffmpeg, libopenshot -, qtbase, qtmultimedia, makeQtWrapper }: +, doxygen, python3Packages, libopenshot +, makeQtWrapper, wrapGAppsHook, gtk3 }: -with stdenv.lib; -stdenv.mkDerivation rec { +python3Packages.buildPythonApplication rec { name = "openshot-qt-${version}"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "0dg4fkkci1rz49yrdd4fa1whv10c1pgm3cl4i49452ckqa7qg037"; + sha256 = "10j3p10q66m9nhzcd8315q1yiqscidkjbm474mllw7c281vacvzw"; }; - - buildInputs = - [ python3Packages.python ffmpeg libopenshot qtbase qtmultimedia ]; - - nativeBuildInputs = - [ doxygen makeQtWrapper ]; - - installPhase = '' - mkdir -p $(toPythonPath $out) - cp -r src/* $(toPythonPath $out) - mkdir -p $out/bin - echo "#/usr/bin/env sh" >$out/bin/openshot-qt - echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt - chmod +x $out/bin/openshot-qt - wrapQtProgram $out/bin/openshot-qt \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH" + + nativeBuildInputs = [ doxygen wrapGAppsHook ]; + + buildInputs = [ gtk3 ]; + + propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5 sip httplib2 pyzmq ]; + + + preConfigure = '' + # tries to create caching directories during install + export HOME=$(mktemp -d) ''; doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = http://openshot.org/; description = "Free, open-source video editor"; longDescription = '' diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index dd1410431695..b45460c426cc 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libopenshot-${version}"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "0slszl6w96rhxhi6agw85dc4gmpab2qw03mq32g4qrirz68anz6f"; + sha256 = "1mqci103kn4l7w8i9kqzi705kxn4q596vw0sh05r1w5nbyjwcyp6"; }; patchPhase = '' diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 462d74c9672f..163218c0478b 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,17 +1,19 @@ -{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump }: +{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "0.3.0"; + version = "0.5.0"; name = "streamlink-${version}"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = "${version}"; - sha256 = "1bjih6y21vmjmsk3xvhgc1innymryklgylyvjrskqw610niai59j"; + sha256 = "08q7f1fnm3zhs1knrkl6npr4yvpblqbiwa0m9r186ny11jq2dyib"; }; - propagatedBuildInputs = (with pythonPackages; [ pycrypto requests2 ]) ++ [ rtmpdump ]; + buildInputs = with pythonPackages; [ pytest mock ]; + + propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests2 iso-639 iso3166 ]) ++ [ rtmpdump ffmpeg ]; meta = with stdenv.lib; { homepage = https://github.com/streamlink/streamlink; @@ -25,6 +27,6 @@ pythonPackages.buildPythonApplication rec { ''; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.dezgeg ]; + maintainers = with maintainers; [ dezgeg zraexy ]; }; } diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 810803866890..fec3ae631328 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -1,22 +1,29 @@ { stdenv, fetchurl, pkgconfig, perl, autoconf, automake , libX11, inputproto, libXt, libXpm, libXft, libXtst, xextproto, libXi -, fontconfig, freetype, readline +, libXrandr, fontconfig, freetype, readline }: stdenv.mkDerivation rec { name = "ratpoison-${version}"; - version = "1.4.8"; + version = "1.4.9"; src = fetchurl { url = "mirror://savannah/ratpoison/${name}.tar.xz"; - sha256 = "1w502z55vv7zs45l80nsllqh9fvfwjfdfi11xy1qikhzdmirains"; + sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr"; }; outputs = [ "out" "contrib" "doc" "info" ]; + configureFlags = [ + # >=1.4.9 requires this even with readline in inputs + "--enable-history" + ]; + + nativeBuildInputs = [ pkgconfig autoconf automake ]; + buildInputs = - [ pkgconfig perl autoconf automake - libX11 inputproto libXt libXpm libXft libXtst xextproto libXi + [ perl + libX11 inputproto libXt libXpm libXft libXtst xextproto libXi libXrandr fontconfig freetype readline ]; postInstall = '' diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index 296de4e1e253..146bd7e1438b 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2, libXmu }: +{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }: stdenv.mkDerivation rec { - name = "trayer-1.1.6"; + name = "trayer-1.1.7"; - buildInputs = [ pkgconfig gdk_pixbuf gtk2 libXmu ]; + buildInputs = [ pkgconfig gdk_pixbuf gtk2 ]; src = fetchFromGitHub { owner = "sargon"; repo = "trayer-srg"; rev = name; - sha256 = "0mmya7a1qh3zyqgvcx5fz2lvr9n0ilr490l1j3z4myahi4snk2mg"; + sha256 = "06lpgralggh5546qgvpilzxh4anshli2za41x68x2zbaizyqb09a"; }; + preConfigure = '' + patchShebangs configure + ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 9a1897695a9d..9c228b391147 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -52,11 +52,12 @@ let export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32' export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin' - export PKG_CONFIG_PATH=/usr/lib/pkgconfig - # Force compilers to look in default search paths + # Force compilers and other tools to look in default search paths export NIX_CFLAGS_COMPILE='-idirafter /usr/include' export NIX_LDFLAGS_BEFORE='-L/usr/lib -L/usr/lib32' + export PKG_CONFIG_PATH=/usr/lib/pkgconfig + export ACLOCAL_PATH=/usr/share/aclocal ${profile} ''; diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index dc05ec1678cb..47e2c1b904c3 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -2,7 +2,7 @@ # a fork of the buildEnv in the Nix distribution. Most changes should # eventually be merged back into the Nix distribution. -{ perl, runCommand, lib }: +{ buildPackages, runCommand, lib }: { name @@ -66,6 +66,6 @@ runCommand name passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null; } '' - ${perl}/bin/perl -w ${./builder.pl} + ${buildPackages.perl}/bin/perl -w ${./builder.pl} eval "$postBuild" '' diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 91569d0c070a..2275a065594f 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -7,6 +7,7 @@ , buildInputs ? [] , cargoUpdateHook ? "" , cargoDepsHook ? "" +, cargoBuildFlags ? [] , ... } @ args: let @@ -26,7 +27,11 @@ in stdenv.mkDerivation (args // { buildInputs = [ git rust.cargo rust.rustc ] ++ buildInputs; - configurePhase = args.configurePhase or "true"; + configurePhase = args.configurePhase or '' + runHook preConfigure + # noop + runHook postConfigure + ''; postUnpack = '' eval "$cargoDepsHook" @@ -92,22 +97,26 @@ in stdenv.mkDerivation (args // { ) '' + (args.prePatch or ""); - buildPhase = args.buildPhase or '' - echo "Running cargo build --release" - cargo build --release + buildPhase = with builtins; args.buildPhase or '' + runHook preBuild + echo "Running cargo build --release ${concatStringsSep " " cargoBuildFlags}" + cargo build --release ${concatStringsSep " " cargoBuildFlags} + runHook postBuild ''; checkPhase = args.checkPhase or '' + runHook preCheck echo "Running cargo test" cargo test + runHook postCheck ''; doCheck = args.doCheck or true; installPhase = args.installPhase or '' + runHook preInstall mkdir -p $out/bin - for f in $(find target/release -maxdepth 1 -type f); do - cp $f $out/bin - done; + find target/release -maxdepth 1 -executable -exec cp "{}" $out/bin \; + runHook postInstall ''; }) diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index a8b2b786efaf..31c89215ea77 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "https://dl.dropbox.com/u/56493902/loudifier/comicrelief.zip"; + url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; sha256 = "0wpf10m9zmcfvcxgc7dxzdm3syam7d7qxlfabgr1nxzq299kh8ch"; }; diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix new file mode 100644 index 000000000000..203b68f5e5d2 --- /dev/null +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, mkfontdir, mkfontscale }: + +stdenv.mkDerivation rec { + name = "envypn-font-1.7.1"; + + src = fetchurl { + url = "https://ywstd.fr/files/p/envypn-font/envypn-font-1.7.1.tar.gz"; + sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270"; + }; + + buildInputs = [ mkfontdir mkfontscale ]; + + unpackPhase = '' + tar -xzf $src --strip-components=1 + ''; + + installPhase = '' + # install the pcf fonts (for xorg applications) + fontDir="$out/share/fonts/envypn" + mkdir -p "$fontDir" + mv *.pcf.gz "$fontDir" + + cd "$fontDir" + mkfontdir + mkfontscale + ''; + + meta = with stdenv.lib; { + description = '' + Readable bitmap font inspired by Envy Code R + ''; + homepage = "http://ywstd.fr/p/pj/#envypn"; + license = licenses.miros; + platforms = platforms.linux; + }; +} diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index ac7dcea31b13..5fde19e01289 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.12.1"; + version = "1.12.5"; buildInputs = [ unzip ]; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; - sha256 = "1rwg06fbizf2cmjwysx4ciz96nh80k48drsyr3rshppycajnaahj"; + sha256 = "0s3g6mk0ngwsrw9h9dqinb50cd9i8zhqdcmmh93fhyf4d87yfwyi"; }; sourceRoot = "."; diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix index aac1739a6e99..3dfbe6fbf0b5 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./nix_share_path.patch ]; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix index 8d9ee143ac2b..b3646abd6dda 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix @@ -20,12 +20,11 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ shared_mime_info gnome3.gnome_themes_standard ]; - buildInputs = [ vala_0_32 intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas - libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview - librsvg libsecret dconf - gobjectIntrospection gnome3.adwaita-icon-theme ]; + buildInputs = [ vala_0_32 libgit2 gtk3 glib json_glib webkitgtk libgee libpeas + libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings_desktop_schemas + librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook intltool pkgconfig ]; # https://bugzilla.gnome.org/show_bug.cgi?id=758240 preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir''; diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix index bc9e517aceb8..5a78b8d0ca6b 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gitg-3.22.0"; + name = "gitg-3.23.90"; src = fetchurl { - url = mirror://gnome/sources/gitg/3.22/gitg-3.22.0.tar.xz; - sha256 = "ba6895f85c18748294075980a5e03e0936ad4e84534dbb0d8f9e29aa874ddeaf"; + url = mirror://gnome/sources/gitg/3.23/gitg-3.23.90.tar.xz; + sha256 = "0m3g8ag8nh6vj5m188l7sgkm7p8mrs094mjijqaaav3r6cz91fdg"; }; } diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix index 6922a7aee1bc..b9abde42cbda 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix @@ -1,12 +1,12 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: rec { - major = "0.24"; - minor = "4"; + major = "0.25"; + minor = "0"; name = "libgit2-glib-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/libgit2-glib/${major}/${name}.tar.xz"; - sha256 = "0802qskm64l5ic8rvfjxg27chj502irhw1xkabrl4015dxsiy89s"; + sha256 = "0rf5gcr3khp35wj9ax9cbyq5j3iiwa1l0fi16w6sfgmrryd6n9aa"; }; } diff --git a/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch new file mode 100644 index 000000000000..3bc871f09063 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch @@ -0,0 +1,13 @@ +diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvancedwidget.cpp +index 2f11ba1d..310f11b4 100644 +--- a/vpn/openvpn/openvpnadvancedwidget.cpp ++++ b/vpn/openvpn/openvpnadvancedwidget.cpp +@@ -75,7 +75,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P + connect(m_ui->cmbProxyType, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged); + + // start openVPN process and get its cipher list +- const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList() << "/sbin" << "/usr/sbin"); ++ const QString openVpnBinary = "@openvpn@/bin/openvpn"; + const QStringList ciphersArgs(QLatin1String("--show-ciphers")); + const QStringList versionArgs(QLatin1String("--version")); + diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index da57653bb083..736d59b40412 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -4,7 +4,7 @@ , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem , kxmlgui, mobile_broadband_provider_info , modemmanager-qt, networkmanager-qt, openconnect, plasma-framework -, qca-qt5, qtdeclarative, solid +, qca-qt5, qtdeclarative, solid, openvpn }: plasmaPackage { @@ -14,6 +14,10 @@ plasmaPackage { src = ./0001-mobile-broadband-provider-info-path.patch; inherit mobile_broadband_provider_info; }) + (substituteAll { + src = ./0002-openvpn-binary-path.patch; + inherit openvpn; + }) ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ @@ -23,4 +27,5 @@ plasmaPackage { mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect qca-qt5 solid ]; + enableParallelBuilding = true; } diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index de2c6d40d40c..224d111026af 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -1,5 +1,5 @@ { stdenv, writeText, erlang, rebar3, openssl, libyaml, - pc, buildEnv, lib }: + pc, lib }: { name, version , src diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix new file mode 100644 index 000000000000..d1fb9b212431 --- /dev/null +++ b/pkgs/development/compilers/dale/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, libffi, llvm_35, perl }: + +let version = "20170416"; + doCheck = false; +in stdenv.mkDerivation { + name = "dale-${version}"; + + src = fetchFromGitHub { + owner = "tomhrr"; + repo = "dale"; + rev = "ecc5ea91efef8a263c7dddd6925983df5b5258b2"; + sha256 = "0naly7jsfriiqf68q210ay9ppcvidbwwcxksy5zwy1m17aq5kxaw"; + }; + + buildInputs = [ cmake libffi llvm_35 ] ++ + stdenv.lib.optional doCheck perl; + + inherit doCheck; + + checkTarget = "tests"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Lisp-flavoured C"; + longDescription = '' + Dale is a system (no GC) programming language that uses + S-expressions for syntax and supports syntactic macros. + ''; + homepage = "https://github.com/tomhrr/dale"; + license = licenses.mit; + maintainers = with maintainers; [ amiloradovsky ]; + platforms = platforms.linux; # fails on Darwin, linking vs. FFI + }; +} diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index 48eafff6f724..6fb36d7cbfb9 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -29,6 +29,9 @@ mkDerivation { tasty-hunit tasty-quickcheck text union-find wl-pprint ]; jailbreak = true; + postInstall = '' + ln -s $out/bin/elm-format-0.18 $out/bin/elm-format + ''; homepage = "http://elm-lang.org"; description = "A source code formatter for Elm"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index b5d2ba66e752..d3d7561ddfbc 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, python, ... }: let - rev = "1.37.3"; + rev = "1.37.9"; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kripken"; repo = "emscripten-fastcomp"; - sha256 = "0s5156g6576hm31628c2wbqwl9r6vn10z5ry59psl565zz3lpg8x"; + sha256 = "0dvay98hlajhwgl5s58sh8s79i4nbcl3gajssgzimk0id8fa0ifx"; inherit rev; }; srcFL = fetchFromGitHub { owner = "kripken"; repo = "emscripten-fastcomp-clang"; - sha256 = "0jhk20wb7275n5m9niqkzmvrr8hh5v26glkmsfmng4p66cs7jkil"; + sha256 = "1ilrb6p3vybjz0hj8hc80hpm0y01794v488dywwj81khhqahnhcv"; inherit rev; }; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 05df6e9359a0..351e045b50af 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, jre }: let - rev = "1.37.3"; + rev = "1.37.9"; appdir = "share/emscripten"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "kripken"; repo = "emscripten"; - sha256 = "0pkxm8nd2zv57f2xm0c3n4xsdh2scliyy3zx04xk2bpkvskyzl7x"; + sha256 = "0dmvhw4j9bdqbdknz7ibg2fwzynw4w8ksnj8rkswdmp660889krp"; inherit rev; }; diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix new file mode 100644 index 000000000000..35e6749659e0 --- /dev/null +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -0,0 +1,87 @@ +# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it + +{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, dotnetbuildhelpers, dotnetPackages }: + +stdenv.mkDerivation rec { + name = "fsharp-${version}"; + version = "4.1.7"; + + src = fetchurl { + url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; + sha256 = "0rfkrk4mzi4w54mfqilvng9ar5swhmnwhsyjc54rx3fd0np3jiyl"; + }; + + buildInputs = [ + pkgconfig + autoconf + automake + which + mono + dotnetbuildhelpers + dotnetPackages.FsCheck262 + dotnetPackages.FSharpCompilerTools + dotnetPackages.FSharpCore + dotnetPackages.FSharpData225 + dotnetPackages.FsLexYacc704 + dotnetPackages.MicrosoftDiaSymReader + dotnetPackages.MicrosoftDiaSymReaderPortablePdb + dotnetPackages.NUnit350 + dotnetPackages.SystemCollectionsImmutable131 + dotnetPackages.SystemReflectionMetadata + dotnetPackages.SystemValueTuple + ]; + + configurePhase = '' + substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "/bin/sh" + ./autogen.sh --prefix $out + ''; + + preBuild = '' + substituteInPlace Makefile --replace "MONO_ENV_OPTIONS=\$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config" "true" + substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.dll\" />" "" + substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.optdata\" />" "" + substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.sigdata\" />" "" + substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.xml\" />" "" + + rm -rf packages + mkdir packages + + ln -s ${dotnetPackages.FsCheck262}/lib/dotnet/FsCheck packages/FsCheck.2.6.2 + ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.4 + ln -s ${dotnetPackages.FSharpCore}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1 + ln -s ${dotnetPackages.FSharpData225}/lib/dotnet/FSharp.Data/ packages/FSharp.Data.2.2.5 + ln -s ${dotnetPackages.FsLexYacc704}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.4 + ln -s ${dotnetPackages.MicrosoftDiaSymReader}/lib/dotnet/Microsoft.DiaSymReader/ packages/Microsoft.DiaSymReader.1.1.0 + ln -s ${dotnetPackages.MicrosoftDiaSymReaderPortablePdb}/lib/dotnet/Microsoft.DiaSymReader.PortablePdb/ packages/Microsoft.DiaSymReader.PortablePdb.1.2.0 + ln -s ${dotnetPackages.NUnit350}/lib/dotnet/NUnit/ packages/NUnit.3.5.0 + ln -s ${dotnetPackages.SystemCollectionsImmutable131}/lib/dotnet/System.Collections.Immutable/ packages/System.Collections.Immutable.1.3.1 + ln -s ${dotnetPackages.SystemReflectionMetadata}/lib/dotnet/System.Reflection.Metadata/ packages/System.Reflection.Metadata.1.4.2 + ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.0 + ''; + + # Make sure the executables use the right mono binary, + # and set up some symlinks for backwards compatibility. + postInstall = '' + substituteInPlace $out/bin/fsharpc --replace " mono " " ${mono}/bin/mono " + substituteInPlace $out/bin/fsharpi --replace " mono " " ${mono}/bin/mono " + substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono " + ln -s $out/bin/fsharpc $out/bin/fsc + ln -s $out/bin/fsharpi $out/bin/fsi + for dll in "$out/lib/mono/fsharp"/FSharp*.dll + do + create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll" + done + ''; + + # To fix this error when running: + # The file "/nix/store/path/whatever.exe" is an not a valid CIL image + dontStrip = true; + + meta = { + description = "A functional CLI language"; + homepage = "http://fsharp.org/"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 81bed7119ea5..12eb8b3a5425 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -60,7 +60,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "7-20161211"; +let version = "7-20170409"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; @@ -217,7 +217,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/snapshots/${version}/gcc-${version}.tar.bz2"; - sha256 = "114rrrm5d5cawmr3161d2wgjlzkb9l1imj1p7fnypwz7y85l1661"; + sha256 = "19197rw1xrpkb8h10lfgn6zj7yj52x95hdmr0x5lg8i4v3i23b67"; }; inherit patches; diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix index c167f4bdd75a..08e74bdb78e9 100644 --- a/pkgs/development/compilers/halvm/2.4.0.nix +++ b/pkgs/development/compilers/halvm/2.4.0.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { isHaLVM = true; isGhcjs = false; src = fetchgit { - rev = "6aa72c9b047fd8ddff857c994a5a895461fc3925"; + rev = "65fad65966eb7e60f234453a35aeb564a09d2595"; url = "https://github.com/GaloisInc/HaLVM"; - sha256 = "05cg4w6fw5ajmpmh8g2msprnygmr4isb3pphqhlddfqwyvqhl167"; + sha256 = "09633h38w0z20cz0wcfp9z5kzv8v1zwcv0wqvgq3c8svqbrxp28k"; }; prePatch = '' - sed -i '312 d' Makefile - sed -i '316,446 d' Makefile # Removes RPM packaging + sed -i '305 d' Makefile + sed -i '309,439 d' Makefile # Removes RPM packaging sed -i '20 d' src/scripts/halvm-cabal.in sed -ie 's|ld |${binutils}/bin/ld |g' src/scripts/ldkernel.in ''; diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix new file mode 100644 index 000000000000..70ef8b63277f --- /dev/null +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -0,0 +1,26 @@ +{ haskellPackages, mkDerivation, fetchFromGitHub, lib }: + +with lib; + +mkDerivation rec { + pname = "psc-package"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "purescript"; + repo = pname; + rev = "v${version}"; + sha256 = "078xjn10yq4i0ff78bxscvxhn29p3s7iwv3pjyqxzlhaymn5949l"; + }; + + isLibrary = false; + isExecutable = true; + + executableHaskellDepends = with haskellPackages; [ + aeson aeson-pretty optparse-applicative system-filepath turtle + ]; + + description = "An experimental package manager for PureScript"; + license = licenses.bsd3; + maintainers = with lib.maintainers; [ profpatsch ]; +} diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index f0d7e0dabc27..2d4d6ad4db1f 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -24,12 +24,6 @@ rustPlatform.buildRustPackage rec { LIBGIT2_SYS_USE_PKG_CONFIG=1; postInstall = '' - rm "$out/lib/rustlib/components" \ - "$out/lib/rustlib/install.log" \ - "$out/lib/rustlib/rust-installer-version" \ - "$out/lib/rustlib/uninstall.sh" \ - "$out/lib/rustlib/manifest-cargo" - # NOTE: We override the `http.cainfo` option usually specified in # `.cargo/config`. This is an issue when users want to specify # their own certificate chain as environment variables take diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index 8d98ace71f88..313580fe600a 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -8,8 +8,7 @@ fetchgit, guile, libtool, - pkgconfig, - buildEnv + pkgconfig }: stdenv.mkDerivation rec { name = "guile-sdl2-${version}"; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d39e1bacd71d..f7d16a89df86 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused -, jailbreak-cabal, hscolour, cpphs, nodejs +, jailbreak-cabal, hscolour, cpphs, nodejs, lib }: let isCross = (ghc.cross or null) != null; in { pname @@ -53,7 +53,7 @@ , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -, hardeningDisable ? [] +, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all" } @ args: assert editedCabalFile != null -> revision != null; @@ -330,9 +330,11 @@ stdenv.mkDerivation ({ export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}" export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html" - '' + (if isHaLVM - then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"'' - else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"'') + "${shellHook}"; + ${if isHaLVM + then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"'' + else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"''} + ${shellHook} + ''; }; }; diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index d83b43ffd75a..b3c3e1732e0d 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { echo "<settings><mirrors>\ <mirror><id>tmpm2</id><url>file://$out/m2</url><mirrorOf>*</mirrorOf></mirror></mirrors>\ <localRepository>$out/m2/</localRepository></settings>" >> $out/m2/settings.xml - ${maven}/bin/mvn ${optionalString (quiet) "-q"} clean package -Dmaven.test.skip=${if skipTests then "true" else "false"} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml + ${maven}/bin/mvn ${optionalString (quiet) "-q"} clean package -Dmaven.test.skip=${boolToString skipTests} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml cp ./target/*.jar $out/m2/${m2Path} cp -v ./target/*.jar $out/target/ ''; diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix new file mode 100644 index 000000000000..bfee99619840 --- /dev/null +++ b/pkgs/development/libraries/NSPlist/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation { + name = "NSPlist-713decf"; + + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "NSPlist"; + rev = "713decf06c1ef6c39a707bc99eb45ac9925f2b8a"; + sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r"; + }; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ matthewbauer ]; + description = "Parses .plist files"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/development/libraries/PlistCpp/default.nix new file mode 100644 index 000000000000..f7703b731b99 --- /dev/null +++ b/pkgs/development/libraries/PlistCpp/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }: + +stdenv.mkDerivation { + name = "PlistCpp-11615d"; + + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "PlistCpp"; + rev = "11615deab3369356a182dabbf5bae30574967264"; + sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv"; + }; + + buildInputs = [ cmake boost NSPlist pugixml ]; + + + meta = with stdenv.lib; { + maintainers = with maintainers; [ matthewbauer ]; + description = "CPP bindings for Plist"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 4a4ec5d9fe9c..b37fd6079b9e 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -3,6 +3,7 @@ , baseVersion, revision, sha256 , extraConfigureFlags ? "" , postPatch ? null +, darwin , ... }: @@ -20,7 +21,8 @@ stdenv.mkDerivation rec { }; inherit postPatch; - buildInputs = [ python bzip2 zlib gmp openssl boost ]; + buildInputs = [ python bzip2 zlib gmp openssl boost ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; configurePhase = '' python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 51e366ba29cd..cf27249064fc 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }: stdenv.mkDerivation (rec { - version = "0.24.6"; + version = "0.25.1"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "070jrv690bd5dq991lc32qfnai9ywvrjzsfgi3rcw6kw4l2ynxjr"; + sha256 = "100bah8picqjzyhpw4wd7z5vyidcb8aggin50bhbpn607h8n8bml"; }; # TODO: `cargo` (rust's package manager) surfaced a serious bug in diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 7128f5606193..66510919e34f 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -48,7 +48,8 @@ stdenv.mkDerivation ({ "/bin:/usr/bin", which is inappropriate on NixOS machines. This patch extends the search path by "/run/current-system/sw/bin". */ ./fix_path_attribute_in_getconf.patch - ]; + ] + ++ lib.optional stdenv.isi686 ./fix-i686-memchr.patch; postPatch = # Needed for glibc to build with the gnumake 3.82 diff --git a/pkgs/development/libraries/glibc/fix-i686-memchr.patch b/pkgs/development/libraries/glibc/fix-i686-memchr.patch new file mode 100644 index 000000000000..32564de9f3ae --- /dev/null +++ b/pkgs/development/libraries/glibc/fix-i686-memchr.patch @@ -0,0 +1,23 @@ +Fix i686 memchr overflow calculation (BZ#21182) + +https://sourceware.org/git/?p=glibc.git;a=commit;h=3abeeec5f46ff03 +diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2.S b/sysdeps/i386/i686/multiarch/memchr-sse2.S +index 910679c..e41f324 100644 +--- a/sysdeps/i386/i686/multiarch/memchr-sse2.S ++++ b/sysdeps/i386/i686/multiarch/memchr-sse2.S +@@ -117,7 +117,6 @@ L(crosscache): + + # ifndef USE_AS_RAWMEMCHR + jnz L(match_case2_prolog1) +- lea -16(%edx), %edx + /* Calculate the last acceptable address and check for possible + addition overflow by using satured math: + edx = ecx + edx +@@ -125,6 +124,7 @@ L(crosscache): + add %ecx, %edx + sbb %eax, %eax + or %eax, %edx ++ sub $16, %edx + jbe L(return_null) + lea 16(%edi), %edi + # else diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index bb4e40dd3a7e..e30c15e629ef 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -3,11 +3,11 @@ let inherit (stdenv.lib) optional optionalString; in let self = stdenv.mkDerivation rec { - name = "gmp-6.1.1"; + name = "gmp-6.1.2"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; - sha256 = "1mpzprdzkgfpdc1v2lf4dxlxps4x8bvmzvd8n1ri6gw9y9jrh458"; + sha256 = "1clg7pbpk6qwxj5b2mw0pghzawp2qlm3jf9gdd8i6fl6yh2bnxaj"; }; #outputs TODO: split $cxx due to libstdc++ dependency diff --git a/pkgs/development/libraries/gnutls/3.5.10.nix b/pkgs/development/libraries/gnutls/3.5.10.nix new file mode 100644 index 000000000000..a1eab1a84c11 --- /dev/null +++ b/pkgs/development/libraries/gnutls/3.5.10.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, libunistring, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "3.5.10"; + + src = fetchurl { + url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; + sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g"; + }; +}) diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix index a1eab1a84c11..77ecd4957f75 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -1,10 +1,18 @@ { callPackage, fetchurl, libunistring, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.10"; + version = "3.5.11"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; - sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g"; + sha256 = "13z2dxxyrsb7gfpl1k2kafqh2zaigi872y5xgykhs9cyaz2mqxji"; }; + + # Skip two tests introduced in 3.5.11. Probable reasons of failure: + # - pkgconfig: building against the result won't work before installing + # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox + postPatch = '' + sed '2iexit 77' -i tests/pkgconfig.sh + sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c + ''; }) diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch index 49e059befdb9..75d9281dfb0e 100644 --- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch +++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch @@ -57,15 +57,16 @@ diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py index 838d343..ca7fc0d 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py -@@ -53,10 +53,24 @@ def _resolve_libtool(options, binary, libraries): +@@ -53,10 +53,27 @@ def _resolve_libtool(options, binary, libraries): # Match absolute paths on OS X to conform to how libraries are usually # referenced on OS X systems. def _ldd_library_pattern(library_name): + nix_store_dir = re.escape('@nixStoreDir@'.rstrip('/')) pattern = "(?<![A-Za-z0-9_-])(lib*%s[^A-Za-z0-9_-][^\s\(\)]*)" -- if platform.system() == 'Darwin': -- pattern = "([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)" + if platform.system() == 'Darwin': + pattern = "([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)" - return re.compile(pattern % re.escape(library_name)) ++ return re.compile(pattern % re.escape(library_name)) + pattern = r''' + ( + (?: @@ -85,7 +86,7 @@ index 838d343..ca7fc0d 100644 # This is a what we do for non-la files. We assume that we are on an -@@ -115,7 +129,11 @@ def _resolve_non_libtool(options, binary, libraries): +@@ -115,7 +132,11 @@ def _resolve_non_libtool(options, binary, libraries): m = pattern.search(line) if m: del patterns[library] diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index 30ac8f2fe280..f9ce0aa4b81e 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk, gobjectIntrospection }: stdenv.mkDerivation rec { name = "gtk-mac-integration-2.0.8"; @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc ]; - buildInputs = [ glib gtk ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc gobjectIntrospection ]; + buildInputs = [ glib ]; + propagatedBuildInputs = [ gtk ]; preAutoreconf = '' gtkdocize diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index eacab92d36b6..b9b6c3c7c24f 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,14 +1,38 @@ -{stdenv, fetchurl, libpng, libtiff, libjpeg, zlib}: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig +, giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib +}: -stdenv.mkDerivation { - name = "leptonica-1.72"; +stdenv.mkDerivation rec { + name = "leptonica-${version}"; + version = "1.74.1"; src = fetchurl { - url = http://www.leptonica.org/source/leptonica-1.72.tar.gz; - sha256 = "0mhzvqs0im04y1cpcc1yma70hgdac1frf33h73m9z3356bfymmbr"; + url = "http://www.leptonica.org/source/${name}.tar.gz"; + sha256 = "0qpcidvv6igybrrhj0m6j47g642c8sk1qn4dpj82mgd38xx52skl"; }; - buildInputs = [ libpng libtiff libjpeg zlib ]; + patches = stdenv.lib.singleton (fetchpatch { + # configure: Support pkg-config + url = "https://github.com/DanBloomberg/leptonica/commit/" + + "4476d162cc191a0fefb2ce434153e12bbf188664.patch"; + sha256 = "1razzp2g49shfaravfqpxm3ivcd1r92lvqysll6nnf6d1wp9865s"; + }); + + postPatch = '' + # Remove the AC_SUBST() macros on *_LIBS, because the *_LIBS variables will + # be automatically set by PKG_CHECK_MODULES() since autotools 0.24 and + # using the ones that are set here in Leptonica's configure.ac do not + # include -L linker flags. + sed -i -e '/PKG_CHECK_MODULES/,/^ *\])/s/AC_SUBST([^)]*)//' configure.ac + + # The giflib package doesn't ship a pkg-config file, so we need to inject + # the linker search path. + substituteInPlace configure.ac --replace -lgif \ + ${stdenv.lib.escapeShellArg "'-L${giflib}/lib -lgif'"} + ''; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ]; meta = { description = "Image processing and analysis library"; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 82681a6d05e7..de219bee382f 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }: stdenv.mkDerivation rec { - name = "libdrm-2.4.76"; + name = "libdrm-2.4.79"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "7cdfb83ea77def453299dd95332aa9257c9f3534ff5844f5c0ce87265c275f3a"; + sha256 = "c6aaf319293bce38023e9a637471b0f45c93c807d2a279060d741fc7a2e5b197"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 0beb689090a0..aa76505c3a07 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake }: +{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake +, darwin }: let version = "1.0.9"; in @@ -15,6 +16,7 @@ stdenv.mkDerivation rec { prefixKey = "--prefix "; propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ]; nativeBuildInputs = [ pkgconfig which cmake ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; meta = { homepage = http://github.com/lastfm/liblastfm; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix new file mode 100644 index 000000000000..7b421f4ca365 --- /dev/null +++ b/pkgs/development/libraries/libqtav/default.nix @@ -0,0 +1,63 @@ +{ stdenv, lib, fetchFromGitHub, extra-cmake-modules, makeQtWrapper +, qtbase, qtmultimedia, qtquick1, qttools +, mesa, libX11 +, libass, openal, ffmpeg, libuchardet +, alsaLib, libpulseaudio, libva +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "libqtav-${version}"; + + # Awaiting upcoming `v1.12.0` release. `v1.11.0` is not supporting cmake which is the + # the reason behind taking an unstable git rev. + version = "unstable-2017-03-30"; + + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper qttools ]; + buildInputs = [ + qtbase qtmultimedia qtquick1 + mesa libX11 + libass openal ffmpeg libuchardet + alsaLib libpulseaudio libva + ]; + + src = fetchFromGitHub { + sha256 = "1xw0ynm9w501651rna3ppf8p336ag1p60i9dxhghzm543l7as93v"; + rev = "4b4ae3b470b2fcbbcf1b541c2537fb270ee0bcfa"; + repo = "QtAV"; + owner = "wang-bin"; + fetchSubmodules = true; + }; + + patchPhase = '' + sed -i -e 's#CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT#TRUE#g' ./CMakeLists.txt + sed -i -e 's#DESTINATION ''${QT_INSTALL_LIBS}/cmake#DESTINATION ''${QTAV_INSTALL_LIBS}/cmake#g' ./CMakeLists.txt + ''; + + # Make sure libqtav finds its libGL dependancy at both link and run time + # by adding mesa to rpath. Not sure why it wasn't done automatically like + # the other libraries as `mesa` is part of our `buildInputs`. + NIX_CFLAGS_LINK = [ "-Wl,-rpath,${mesa}/lib"]; + + preFixup = '' + mkdir -p "$out/bin" + cp -a "./bin/"* "$out/bin" + ''; + + postFixup = '' + for i in `find $out/bin -maxdepth 1 -xtype f -executable`; do + wrapQtProgram "$i" + done + ''; + + meta = { + description = "A multimedia playback framework based on Qt + FFmpeg."; + #license = licenses.lgpl21; # For the libraries / headers only. + license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used. + homepage = http://www.qtav.org/; + maintainers = [ maintainers.jraygauthier ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/development/libraries/libressl/2.5.nix b/pkgs/development/libraries/libressl/2.5.nix index 0a3e0d97f84f..b2444b189024 100644 --- a/pkgs/development/libraries/libressl/2.5.nix +++ b/pkgs/development/libraries/libressl/2.5.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.5.1"; + version = "2.5.3"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1kc709scgd76vk7fld4jnb4wb5lxdv1cj8zsgyjb33xp4jlf06pp"; + sha256 = "0c4awq45cl757fv7f7f75i5i0ibc6v7ns13n7xvfak7chv2lrqql"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libsigsegv/aarch64.patch b/pkgs/development/libraries/libsigsegv/aarch64.patch deleted file mode 100644 index 7bb48a230cee..000000000000 --- a/pkgs/development/libraries/libsigsegv/aarch64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure b/configure -index 6c4e868..0298e19 100755 ---- a/configure -+++ b/configure -@@ -14501,6 +14501,7 @@ else - - case "$host_cpu" in - a29k | \ -+ aarch64* | \ - alpha* | \ - arc | \ - arm* | strongarm* | xscale* | \ diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 3353fbf9e8d9..0e644686af02 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -1,21 +1,14 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "libsigsegv-2.10"; + name = "libsigsegv-2.11"; src = fetchurl { url = "mirror://gnu/libsigsegv/${name}.tar.gz"; - sha256 = "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44"; + sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x"; }; - # Based on https://github.com/davidgfnet/buildroot-Os/blob/69fe6065b9dd1cb4dcc0a4b554e42cc2e5bd0d60/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch - # but applied directly to configure since we can't use autoreconf while bootstrapping. - patches = if stdenv.isAarch64 || stdenv.cross.arch or "" == "aarch64" - then [ ./aarch64.patch ] - else null; # TODO: change to lib.optional on next mass rebuild - - # https://github.com/NixOS/nixpkgs/issues/6028 - doCheck = false; + doCheck = true; meta = { homepage = http://www.gnu.org/software/libsigsegv/; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 30b378d77a46..bd5d0fd733c7 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libsndfile-1.0.27"; + name = "libsndfile-1.0.28"; src = fetchurl { url = "http://www.mega-nerd.com/libsndfile/files/${name}.tar.gz"; - sha256 = "1h7s61nhf7vklh9sdsbbqzb6x287q4x4j1jc5gmjragl4wprb4d3"; + sha256 = "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz"; }; buildInputs = [ pkgconfig flac libogg libvorbis ] diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 96649a0927ee..9449a8f538f1 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, xen, zfs +, curl, libiconv, gmp, xen, zfs, parted }: with stdenv.lib; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap + attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap parted ] ++ optionals stdenv.isLinux [ libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl xen @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { "--with-test" "--with-esx" "--with-remote" + "--with-storage-disk" ] ++ optionals stdenv.isLinux [ "--with-attr" "--with-apparmor" diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 23168de43ed5..8739c9d25d59 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "lzo-2.09"; + name = "lzo-2.10"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "0k5kpj3jnsjfxqqkblpfpx0mqcy86zs5fhjhgh2kq1hksg7ag57j"; + sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60"; }; configureFlags = [ "--enable-shared" ]; diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index c79c3cbe4d62..5090aa874ec4 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS = "-D__STDC_CONSTANT_MACROS=1"; + NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1"; patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 8c40ff2be20b..d9d0afa2bde8 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -18,9 +18,6 @@ stdenv.mkDerivation rec { sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp ''; - patches = [] - ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-long-long.patch ]; - meta = with stdenv.lib; { description = "Light-weight, simple and fast XML parser for C++ with XPath support"; homepage = http://pugixml.org/; diff --git a/pkgs/development/libraries/pugixml/no-long-long.patch b/pkgs/development/libraries/pugixml/no-long-long.patch deleted file mode 100644 index 46c54e85a1d0..000000000000 --- a/pkgs/development/libraries/pugixml/no-long-long.patch +++ /dev/null @@ -1,19 +0,0 @@ -Get rid of long-long feature. This breaks on AppleClang compilers. ---- -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 40a7ab0..c84f0f7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,9 +26,9 @@ else() - endif() - - # Enable C++11 long long for compilers that are capable of it --if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) -- target_compile_features(pugixml PUBLIC cxx_long_long_type) --endif() -+# if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) -+# target_compile_features(pugixml PUBLIC cxx_long_long_type) -+# endif() - - set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1) - diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix index 13b8296dc0e3..1234c825b14d 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix @@ -2,7 +2,8 @@ , xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst , fontconfig, freetype, harfbuzz, icu, dbus -, zlib, libjpeg, libpng, libtiff +, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus +, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent , alsaLib , libcap , pciutils @@ -11,7 +12,7 @@ , coreutils , pkgconfig, python2 -, stdenv # lib.optional, needsPax +, lib, stdenv # lib.optional, needsPax }: qtSubmodule { @@ -47,20 +48,33 @@ qtSubmodule { -docdir $out/share/doc/qt5" ''; propagatedBuildInputs = [ - dbus zlib alsaLib - # Image formats - libjpeg libpng libtiff + libjpeg libpng libtiff libwebp + + # Video formats + srtp libvpx + + # Audio formats + libopus # Text rendering - fontconfig freetype harfbuzz icu + harfbuzz icu + ] + ++ lib.optionals (!stdenv.isDarwin) [ + dbus zlib minizip snappy nss protobuf jsoncpp libevent - # X11 libs - xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst - xlibs.libXcomposite + # Audio formats + alsaLib + + # Text rendering + fontconfig freetype libcap pciutils + + # X11 libs + xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst + xlibs.libXcomposite ]; patches = [ ./chromium-clang-update-py.patch diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix new file mode 100644 index 000000000000..50f4d74d15cb --- /dev/null +++ b/pkgs/development/libraries/safefile/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "safefile"; + version = "1.0.5"; + + src = fetchurl { + url = "http://research.cs.wisc.edu/mist/${pname}/releases/${name}.tar.gz"; + sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78"; + }; + + buildInputs = []; + + passthru = { + updateScript = '' + cd ${toString ./.} + ${toString <nixpkgs/pkgs/build-support/upstream-updater/update-walker.sh>} default.nix + ''; + }; + + meta = { + inherit version; + description = "File open routines to safely open a file when in the presence of an attack"; + license = stdenv.lib.licenses.asl20 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://research.cs.wisc.edu/mist/safefile/"; + updateWalker = true; + }; +} diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index fbe11db165f2..6f3f78e55018 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation { ''PREFIX="''$(out)"'' "NUM_THREADS=64" "INTERFACE64=${if blas64 then "1" else "0"}" + "NO_STATIC=1" ] ++ mapAttrsToList (var: val: var + "=" + val) config; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 070e2b1be1f9..7e71eafef697 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { "LAPACK=" ]; - NIX_CFLAGS = "-fPIC"; - meta = with stdenv.lib; { homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html; description = "A suite of sparse matrix algorithms"; diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 7712a2890f1b..f38de0884244 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { "LAPACK=" ]; - NIX_CFLAGS = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER"; postInstall = '' # Build and install shared library diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 76912f19ab5f..f4ec02422242 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libusb ]; propagatedBuildInputs = [ libusb ]; + outputs = [ "out" "dev" ]; + meta = with stdenv.lib; { description = "USB traffic redirection protocol"; homepage = http://spice-space.org/page/UsbRedir; diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix index 99a41ec0c185..a1b220948552 100644 --- a/pkgs/development/libraries/webkitgtk/2.14.nix +++ b/pkgs/development/libraries/webkitgtk/2.14.nix @@ -2,7 +2,7 @@ , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls , gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit -, libidn +, libidn, libedit, readline, mesa, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite , gst-plugins-base }: @@ -18,12 +18,27 @@ stdenv.mkDerivation rec { description = "Web content rendering engine, GTK+ port"; homepage = "http://webkitgtk.org/"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; hydraPlatforms = []; maintainers = with maintainers; [ ]; }; - preConfigure = "patchShebangs Tools"; + postConfigure = optionalString stdenv.isDarwin '' + substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \ + --replace "../../lib/libWTFGTK.a" "" + substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ + --replace "../../lib/libbmalloc.a" "" + sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \ + Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \ + Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \ + Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \ + Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \ + Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \ + Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \ + Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt + substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ + --replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a" + ''; src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; @@ -32,29 +47,54 @@ stdenv.mkDerivation rec { # see if we can clean this up.... - patches = [ ./finding-harfbuzz-icu.patch ]; + patches = [ ./finding-harfbuzz-icu.patch ] + ++ optionals stdenv.isDarwin [ + ./PR-152650-2.patch + ./PR-153138.patch + ./PR-157554.patch + ./PR-157574.patch + ]; cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" - "-DENABLE_GLES2=ON" + ] + ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" + ++ optionals stdenv.isDarwin [ + "-DUSE_SYSTEM_MALLOC=ON" + "-DUSE_ACCELERATE=0" + "-DENABLE_INTROSPECTION=ON" + "-DENABLE_MINIBROWSER=OFF" + "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" + "-DENABLE_MINIBROWSER=OFF" + "-DENABLE_VIDEO=ON" + "-DENABLE_QUARTZ_TARGET=ON" + "-DENABLE_X11_TARGET=OFF" + "-DENABLE_OPENGL=OFF" + "-DENABLE_WEB_AUDIO=OFF" + "-DENABLE_WEBGL=OFF" + "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" + "-DENABLE_GTKDOC=OFF" ]; # XXX: WebKit2 missing include path for gst-plugins-base. # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"; + NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0" + + (optionalString stdenv.isDarwin " -lintl"); nativeBuildInputs = [ cmake perl python2 ruby bison gperf sqlite pkgconfig gettext gobjectIntrospection ]; - buildInputs = [ - gtk2 wayland libwebp enchant libnotify gnutls pcre nettle libidn + buildInputs = libintlOrEmpty ++ [ + gtk2 libwebp enchant libnotify gnutls pcre nettle libidn libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit gst-plugins-base libxkbcommon epoxy at_spi2_core ] ++ optional enableGeoLocation geoclue2 - ++ (with xlibs; [ libXdmcp libXt libXtst ]); + ++ (with xlibs; [ libXdmcp libXt libXtst ]) + ++ optionals stdenv.isDarwin [ libedit readline mesa ] + ++ optional stdenv.isLinux wayland; propagatedBuildInputs = [ libsoup gtk3 diff --git a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch new file mode 100644 index 000000000000..db84a4a6b26e --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch @@ -0,0 +1,62 @@ +From 4607ea0a569b3c527ae8dce341ab55eb0d69d8f7 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Tue, 8 Mar 2016 17:26:23 -0800 +Subject: [PATCH 2/2] [GTK][Mac] Enable support for gtk-doc on Mac + +https://bugs.webkit.org/show_bug.cgi?id=152650 + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + ChangeLog | 10 ++++++++++ + Source/PlatformGTK.cmake | 2 +- + Source/cmake/OptionsGTK.cmake | 5 ----- + 3 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake +index af4d2e3..0b11b56 100644 +--- a/Source/PlatformGTK.cmake ++++ b/Source/PlatformGTK.cmake +@@ -34,7 +34,7 @@ endmacro() + add_gtkdoc_generator("docs-build.stamp" "") + if (ENABLE_GTKDOC) + add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp") +-elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE) ++elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING) + add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp") + + # Add a default build step which check that documentation does not have any warnings +diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake +index 6b01f1a..b443d10 100644 +--- a/Source/cmake/OptionsGTK.cmake ++++ b/Source/cmake/OptionsGTK.cmake +@@ -424,11 +424,6 @@ if (CMAKE_CROSSCOMPILING) + set(ENABLE_INTROSPECTION OFF) + endif () + +-# Override the cached variable, gtk-doc does not really work when building on Mac. +-if (APPLE) +- set(ENABLE_GTKDOC OFF) +-endif () +- + set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom) + set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk) + set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit) +diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py +index 4c8237b..a628ae0 100644 +--- a/Tools/gtk/gtkdoc.py ++++ b/Tools/gtk/gtkdoc.py +@@ -322,6 +322,11 @@ class GTKDoc(object): + env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path) + else: + env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path ++ current_dyld_library_path = env.get('DYLD_LIBRARY_PATH') ++ if current_ld_library_path: ++ env['RUN'] = 'DYLD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_dyld_library_path) ++ else: ++ env['RUN'] = 'DYLD_LIBRARY_PATH="%s" ' % self.library_path + + if ldflags: + env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', '')) +-- +2.7.2 + diff --git a/pkgs/development/libraries/webkitgtk/PR-153138.patch b/pkgs/development/libraries/webkitgtk/PR-153138.patch new file mode 100644 index 000000000000..833921f68061 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/PR-153138.patch @@ -0,0 +1,26 @@ +From 07886d9eacb7587dd52a9bcae10c1fc8ab56a910 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Fri, 15 Jan 2016 11:53:07 -0800 +Subject: [PATCH] https://bugs.webkit.org/show_bug.cgi?id=153138 + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + Source/JavaScriptCore/bytecode/StructureStubInfo.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp +index 1e4b4f5..9b27aed 100644 +--- a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp ++++ b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp +@@ -26,6 +26,8 @@ + #include "config.h" + #include "StructureStubInfo.h" + ++#include "JSCellInlines.h" ++ + #include "JSObject.h" + #include "PolymorphicAccess.h" + #include "Repatch.h" +-- +2.7.0 + diff --git a/pkgs/development/libraries/webkitgtk/PR-157554.patch b/pkgs/development/libraries/webkitgtk/PR-157554.patch new file mode 100644 index 000000000000..615e805c92ce --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/PR-157554.patch @@ -0,0 +1,33 @@ +https://bugs.webkit.org/show_bug.cgi?id=157554 + +--- a/Source/WTF/wtf/OSRandomSource.cpp ++++ b/Source/WTF/wtf/OSRandomSource.cpp +@@ -29,7 +29,7 @@ + #include <stdint.h> + #include <stdlib.h> + +-#if !OS(DARWIN) && OS(UNIX) ++#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070) + #include <errno.h> + #include <fcntl.h> + #include <unistd.h> +@@ -46,7 +46,7 @@ + + namespace WTF { + +-#if !OS(DARWIN) && OS(UNIX) ++#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070) + NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom() + { + CRASH(); +@@ -60,8 +56,8 @@ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToReadFromURandom() + + void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length) + { +-#if OS(DARWIN) +- RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length)); ++#if OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 ++ return arc4random_buf(buffer, length); + #elif OS(UNIX) + int fd = open("/dev/urandom", O_RDONLY, 0); + if (fd < 0) diff --git a/pkgs/development/libraries/webkitgtk/PR-157574.patch b/pkgs/development/libraries/webkitgtk/PR-157574.patch new file mode 100644 index 000000000000..d9b0795afa5b --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/PR-157574.patch @@ -0,0 +1,62 @@ +diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h +index ab53183..1310dec 100644 +--- a/Source/JavaScriptCore/API/WebKitAvailability.h ++++ b/Source/JavaScriptCore/API/WebKitAvailability.h +@@ -27,57 +27,12 @@ + #define __WebKitAvailability__ + + #if defined(__APPLE__) +- +-#include <AvailabilityMacros.h> + #include <CoreFoundation/CoreFoundation.h> +- +-#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100 +-/* To support availability macros that mention newer OS X versions when building on older OS X versions, +- we provide our own definitions of the underlying macros that the availability macros expand to. We're +- free to expand the macros as no-ops since frameworks built on older OS X versions only ship bundled with +- an application rather than as part of the system. +-*/ +- +-#ifndef __NSi_10_10 // Building from trunk rather than SDK. +-#define __NSi_10_10 introduced=10.0 // Use 10.0 to indicate that everything is available. +-#endif +- +-#ifndef __NSi_10_11 // Building from trunk rather than SDK. +-#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available. +-#endif +- +-#ifndef __NSi_10_12 // Building from trunk rather than SDK. +-#define __NSi_10_12 introduced=10.0 // Use 10.0 to indicate that everything is available. +-#endif +- +-#ifndef __AVAILABILITY_INTERNAL__MAC_10_9 +-#define __AVAILABILITY_INTERNAL__MAC_10_9 +-#endif +- +-#ifndef __AVAILABILITY_INTERNAL__MAC_10_10 +-#define __AVAILABILITY_INTERNAL__MAC_10_10 + #endif + +-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER +-#define AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER +-#endif +- +-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER +-#define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER +-#endif +- +-#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */ +- +-#if defined(BUILDING_GTK__) + #undef CF_AVAILABLE + #define CF_AVAILABLE(_mac, _ios) + #undef CF_ENUM_AVAILABLE + #define CF_ENUM_AVAILABLE(_mac, _ios) +-#endif +- +-#else +-#define CF_AVAILABLE(_mac, _ios) +-#define CF_ENUM_AVAILABLE(_mac, _ios) +-#endif + + #endif /* __WebKitAvailability__ */ diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index e263708c18e9..9538f1dd1f85 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, libX11, cairo -, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, +, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, compat24 ? false, compat26 ? true, unicode ? true, }: -assert withMesa -> mesa != null; +assert withMesa -> mesa_glu != null && mesa_noglu != null; with stdenv.lib; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ] - ++ optional withMesa mesa; + ++ optional withMesa mesa_glu; nativeBuildInputs = [ pkgconfig ]; @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; SEARCH_LIB = "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " - + optionalString withMesa "${mesa.out}/lib "; + + optionalString withMesa "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; # Work around a bug in configure. NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index e19f0bc3a765..28cd79b5549a 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true +, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, compat24 ? false, compat26 ? true, unicode ? true , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null }: -assert withMesa -> mesa != null; +assert withMesa -> mesa_glu != null && mesa_noglu != null; with stdenv.lib; @@ -22,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] - ++ optional withMesa mesa + ++ optional withMesa mesa_glu ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; nativeBuildInputs = [ pkgconfig ]; @@ -39,7 +40,7 @@ stdenv.mkDerivation { # allow building on 64-bit [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; - SEARCH_LIB = optionalString withMesa "${mesa}/lib"; + SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix index f40595d4eacb..4fea863827f1 100644 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ b/pkgs/development/libraries/wxGTK-3.0/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true +, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, compat24 ? false, compat26 ? true, unicode ? true , withWebKit ? false, webkitgtk2 ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: -assert withMesa -> mesa != null; +assert withMesa -> mesa_glu != null && mesa_noglu != null; assert withWebKit -> webkitgtk2 != null; with stdenv.lib; @@ -25,7 +26,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] - ++ optional withMesa mesa + ++ optional withMesa mesa_glu ++ optional withWebKit webkitgtk2 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; @@ -50,7 +51,7 @@ stdenv.mkDerivation { ++ optionals withWebKit ["--enable-webview" "--enable-webview-webkit"]; - SEARCH_LIB = optionalString withMesa "${mesa}/lib"; + SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 88cf92b34ef0..a06003997845 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, wxGTK, sqlite }: +{ stdenv, fetchFromGitHub, wxGTK, sqlite +, darwin }: stdenv.mkDerivation rec { name = "wxsqlite3-${version}"; @@ -11,7 +12,12 @@ stdenv.mkDerivation rec { sha1 = "bb8p58g88nkdcsj3h4acx7h925n2cy9g"; }; - buildInputs = [ wxGTK sqlite ]; + preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + cp build28/Info.plist.in build28/wxmac.icns build/ + ''; + + buildInputs = [ wxGTK sqlite ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; meta = with stdenv.lib; { homepage = http://utelle.github.io/wxsqlite3/ ; diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index 6e1b84eb3e99..2088439c61d5 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation { (uiop/lisp-build:compile-file* \"'"$out"'/lib/common-lisp/asdf/build/asdf.lisp\") (asdf:load-system :uiop :force :all) (asdf:load-system :asdf :force :all) + (ignore-errors (asdf:load-system :uiop/version :force :all)) )"' \ "$out/bin/common-lisp.sh" ''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index ea7e790ccaed..2725c354d35b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -2,7 +2,7 @@ let addDeps = newdeps: x: {deps = x.deps ++ newdeps;}; addNativeLibs = libs: x: { propagatedBuildInputs = libs; }; - skipBuildPhase = x: { + skipBuildPhase = x: { overrides = y: ((x.overrides y) // { buildPhase = "true"; }); }; qlnp = quicklisp-to-nix-packages; @@ -33,8 +33,13 @@ in }; hunchentoot = addNativeLibs [pkgs.openssl]; iolib = x: { - propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ [pkgs.libfixposix pkgs.gcc]; - testSystems = (x.testSystems or ["iolib"]) ++ ["iolib/os" "iolib/zstreams"]; + propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ + [pkgs.libfixposix pkgs.gcc]; + testSystems = (x.testSystems or ["iolib"]) ++ [ + "iolib/os" "iolib/zstreams" "iolib/common-lisp" "iolib/base" "iolib/asdf" + "iolib/conf" "iolib/grovel" "iolib/syscalls" "iolib/sockets" + "iolib/multiplex" "iolib/streams" "iolib/pathnames" + ]; }; cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]); clack = addDeps (with qlnp;[lack bordeaux-threads prove]); @@ -51,7 +56,7 @@ in wookie = multiOverride [(addDeps (with qlnp; [ alexandria blackbird cl-async chunga fast-http quri babel cl-ppcre cl-fad fast-io vom do-urlencode cl-async-ssl - ])) + ])) (addNativeLibs (with pkgs; [libuv openssl]))]; woo = addDeps (with qlnp; [ cffi lev clack swap-bytes static-vectors fast-http proc-parse quri fast-io @@ -129,6 +134,9 @@ in plump = addDeps (with qlnp; [array-utils trivial-indent]); sqlite = addNativeLibs [pkgs.sqlite]; uiop = x: { + testSystems = (x.testSystems or ["uiop"]) ++ [ + "uiop/version" + ]; overrides = y: (x.overrides y) // { postInstall = ((x.overrides y).postInstall or "") + '' cp -r "${pkgs.asdf}/lib/common-lisp/asdf/uiop/contrib" "$out/lib/common-lisp/uiop" diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index a9bdefd03a40..22cd44ddad64 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -625,13 +625,13 @@ let sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970"; }; }; - "azure-arm-trafficmanager-0.10.5" = { + "azure-arm-trafficmanager-0.12.0" = { name = "azure-arm-trafficmanager"; packageName = "azure-arm-trafficmanager"; - version = "0.10.5"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.5.tgz"; - sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01"; + url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.12.0.tgz"; + sha1 = "609e585c0253960a91deaf773dae1ce184ce414b"; }; }; "azure-arm-dns-0.11.1" = { @@ -697,13 +697,13 @@ let sha1 = "379e6c2ed4155de86caff63243923c7330d34802"; }; }; - "azure-asm-compute-0.17.0" = { + "azure-asm-compute-0.18.0" = { name = "azure-asm-compute"; packageName = "azure-asm-compute"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.17.0.tgz"; - sha1 = "15967b535c06a5d06330b3d5adbf5b4b85e9df90"; + url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.18.0.tgz"; + sha1 = "109c31e17c697f4a00a01533fb230bf3ae448685"; }; }; "azure-asm-hdinsight-0.10.2" = { @@ -814,13 +814,13 @@ let sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; }; }; - "azure-storage-2.0.0" = { + "azure-storage-2.1.0" = { name = "azure-storage"; packageName = "azure-storage"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.0.0.tgz"; - sha1 = "581ed1245ee105e818806efd5cc5cc4c14eab7c0"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz"; + sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01"; }; }; "azure-arm-batch-0.3.0" = { @@ -1750,13 +1750,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "brace-expansion-1.1.6" = { + "brace-expansion-1.1.7" = { name = "brace-expansion"; packageName = "brace-expansion"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; - sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"; + sha1 = "3effc3c50e000531fb720eaff80f0ae8ef23cf59"; }; }; "balanced-match-0.4.2" = { @@ -2002,13 +2002,13 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "async-2.2.0" = { + "async-2.3.0" = { name = "async"; packageName = "async"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.2.0.tgz"; - sha1 = "c324eba010a237e4fbd55a12dee86367d5c0ef32"; + url = "https://registry.npmjs.org/async/-/async-2.3.0.tgz"; + sha1 = "1013d1051047dd320fe24e494d5c66ecaf6147d9"; }; }; "lodash-4.17.4" = { @@ -2227,13 +2227,13 @@ let sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; - "sshpk-1.11.0" = { + "sshpk-1.13.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.11.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz"; - sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz"; + sha1 = "ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"; }; }; "assert-plus-1.0.0" = { @@ -2443,13 +2443,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "readable-stream-2.2.6" = { + "readable-stream-2.2.9" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.6"; + version = "2.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; - sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"; + sha1 = "cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"; }; }; "buffer-shims-1.0.0" = { @@ -2461,6 +2461,15 @@ let sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; }; }; + "string_decoder-1.0.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz"; + sha1 = "f06f41157b664d86069f84bdbdc9b0d8ab281667"; + }; + }; "http-basic-2.5.1" = { name = "http-basic"; packageName = "http-basic"; @@ -2965,13 +2974,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.4.1" = { + "hosted-git-info-2.4.2" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz"; - sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"; + sha1 = "0076b9f46a270506ddbaaea56496897460612a67"; }; }; "is-builtin-module-1.0.0" = { @@ -3325,13 +3334,13 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-5.0.5" = { + "buffer-5.0.6" = { name = "buffer"; packageName = "buffer"; - version = "5.0.5"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz"; - sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.6.tgz"; + sha1 = "2ea669f7eec0b6eda05b08f8b5ff661b28573588"; }; }; "cached-path-relative-1.0.1" = { @@ -3442,13 +3451,13 @@ let sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; }; }; - "https-browserify-0.0.1" = { + "https-browserify-1.0.0" = { name = "https-browserify"; packageName = "https-browserify"; - version = "0.0.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; - sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; }; "insert-module-globals-7.0.1" = { @@ -3559,13 +3568,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.6.3" = { + "stream-http-2.7.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.6.3"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz"; - sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.0.tgz"; + sha1 = "cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"; }; }; "subarg-1.0.0" = { @@ -3946,13 +3955,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "hmac-drbg-1.0.0" = { + "hmac-drbg-1.0.1" = { name = "hmac-drbg"; packageName = "hmac-drbg"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz"; - sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5"; + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; }; }; "minimalistic-crypto-utils-1.0.1" = { @@ -4639,13 +4648,13 @@ let sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; - "parse-torrent-5.8.2" = { + "parse-torrent-5.8.3" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.2.tgz"; - sha1 = "09f02ca43ec2d885d1460aacb0fb50c79b3c49f9"; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz"; + sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c"; }; }; "pump-0.3.5" = { @@ -4837,31 +4846,31 @@ let sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; - "magnet-uri-5.1.5" = { + "magnet-uri-5.1.6" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "5.1.5"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz"; - sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.6.tgz"; + sha1 = "60e8fb5ea90488c8491701eb306970f3126480b3"; }; }; - "parse-torrent-file-4.0.1" = { + "parse-torrent-file-4.0.2" = { name = "parse-torrent-file"; packageName = "parse-torrent-file"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.1.tgz"; - sha1 = "4580c5ebb3f6e607baa02ef0ace51f627859e699"; + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.2.tgz"; + sha1 = "981a22143832abbcd99052d889d31a39ae3f9bfe"; }; }; - "simple-get-2.4.0" = { + "simple-get-2.5.1" = { name = "simple-get"; packageName = "simple-get"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz"; - sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.5.1.tgz"; + sha1 = "eb418fb2c9e431631b4cd6c478af548da613ccd2"; }; }; "thirty-two-1.0.2" = { @@ -4990,13 +4999,13 @@ let sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; }; }; - "fs-chunk-store-1.6.4" = { + "fs-chunk-store-1.6.5" = { name = "fs-chunk-store"; packageName = "fs-chunk-store"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.4.tgz"; - sha1 = "5aa0025d58533118552e815f5986f39f93b06e69"; + url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.5.tgz"; + sha1 = "fc42c2ff4c7f1688ab5fd41cf17c0f9ece4c6156"; }; }; "hat-0.0.3" = { @@ -5062,22 +5071,22 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-piece-1.1.0" = { + "torrent-piece-1.1.1" = { name = "torrent-piece"; packageName = "torrent-piece"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.0.tgz"; - sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854"; + url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.1.tgz"; + sha1 = "50346e42a43b35daf2a86f414afb153629a854be"; }; }; - "random-access-file-1.5.0" = { + "random-access-file-1.6.1" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.5.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz"; - sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.6.1.tgz"; + sha1 = "33358436f43076d34a058db47177a691319f0e99"; }; }; "run-parallel-1.1.6" = { @@ -5098,6 +5107,15 @@ let sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; + "buffer-alloc-unsafe-1.0.0" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; + sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; + }; + }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -5395,13 +5413,13 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; - "ws-2.2.2" = { + "ws-2.2.3" = { name = "ws"; packageName = "ws"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-2.2.2.tgz"; - sha1 = "aa26daf39c52b20ed716e3447f8641494a726b01"; + url = "https://registry.npmjs.org/ws/-/ws-2.2.3.tgz"; + sha1 = "f36c9719a56dff813f455af912a2078145bbd940"; }; }; "ultron-1.1.0" = { @@ -5872,13 +5890,13 @@ let sha1 = "364200d5f13646ca8bcd44490271335614792300"; }; }; - "big-integer-1.6.17" = { + "big-integer-1.6.19" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.17"; + version = "1.6.19"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz"; - sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.19.tgz"; + sha1 = "4a5e915e3188c8708f254b356196f28542acc1e0"; }; }; "sax-1.1.4" = { @@ -5971,13 +5989,13 @@ let sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; }; }; - "init-package-json-1.9.5" = { + "init-package-json-1.9.6" = { name = "init-package-json"; packageName = "init-package-json"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.5.tgz"; - sha1 = "7d4d64a264dc76c1f1f557cbbe824978bf10cd09"; + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.6.tgz"; + sha1 = "789fc2b74466a4952b9ea77c0575bc78ebd60a61"; }; }; "nopt-3.0.6" = { @@ -6070,13 +6088,13 @@ let sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; }; }; - "xcode-0.9.1" = { + "xcode-0.9.3" = { name = "xcode"; packageName = "xcode"; - version = "0.9.1"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/xcode/-/xcode-0.9.1.tgz"; - sha1 = "5b4e71b71b03573ff0cdb48439103e8107da0f95"; + url = "https://registry.npmjs.org/xcode/-/xcode-0.9.3.tgz"; + sha1 = "910a89c16aee6cc0b42ca805a6d0b4cf87211cf3"; }; }; "browserify-transform-tools-1.5.3" = { @@ -6205,6 +6223,15 @@ let sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; + "https-browserify-0.0.1" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; + sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + }; + }; "compression-1.6.2" = { name = "compression"; packageName = "compression"; @@ -6484,13 +6511,13 @@ let sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; }; }; - "type-is-1.6.14" = { + "type-is-1.6.15" = { name = "type-is"; packageName = "type-is"; - version = "1.6.14"; + version = "1.6.15"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"; - sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz"; + sha1 = "cab10fb4909e441c82842eafe1ad646c81804410"; }; }; "utils-merge-1.0.0" = { @@ -6574,13 +6601,13 @@ let sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; }; }; - "npm-package-arg-4.2.1" = { + "npm-package-arg-5.0.1" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "4.2.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz"; - sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.0.1.tgz"; + sha1 = "09a816e3f45a549e3ddaf33e9bae5e7b31077872"; }; }; "promzard-0.3.0" = { @@ -7402,49 +7429,40 @@ let sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; }; }; - "pegjs-0.9.0" = { + "pegjs-0.10.0" = { name = "pegjs"; packageName = "pegjs"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/pegjs/-/pegjs-0.9.0.tgz"; - sha1 = "f6aefa2e3ce56169208e52179dfe41f89141a369"; + url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; + sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; }; }; - "simple-plist-0.1.4" = { + "simple-plist-0.2.1" = { name = "simple-plist"; packageName = "simple-plist"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.1.4.tgz"; - sha1 = "10eb51b47e33c556eb8ec46d5ee64d64e717db5d"; - }; - }; - "bplist-parser-0.0.6" = { - name = "bplist-parser"; - packageName = "bplist-parser"; - version = "0.0.6"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"; - sha1 = "38da3471817df9d44ab3892e27707bbbd75a11b9"; + url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz"; + sha1 = "71766db352326928cf3a807242ba762322636723"; }; }; - "bplist-creator-0.0.4" = { + "bplist-creator-0.0.7" = { name = "bplist-creator"; packageName = "bplist-creator"; - version = "0.0.4"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.4.tgz"; - sha1 = "4ac0496782e127a85c1d2026a4f5eb22a7aff991"; + url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz"; + sha1 = "37df1536092824b87c42f957b01344117372ae45"; }; }; - "stream-buffers-0.2.6" = { + "stream-buffers-2.2.0" = { name = "stream-buffers"; packageName = "stream-buffers"; - version = "0.2.6"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-0.2.6.tgz"; - sha1 = "181c08d5bb3690045f69401b9ae6a7a0cf3313fc"; + url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"; + sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; }; }; "async-1.5.2" = { @@ -7663,13 +7681,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "form-data-2.1.2" = { + "form-data-2.1.4" = { name = "form-data"; packageName = "form-data"; - version = "2.1.2"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; - sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; + sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; }; }; "har-validator-4.2.1" = { @@ -7708,13 +7726,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "ajv-4.11.5" = { + "ajv-4.11.6" = { name = "ajv"; packageName = "ajv"; - version = "4.11.5"; + version = "4.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; - sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.6.tgz"; + sha1 = "947e93049790942b2a2d60a8289b28924d39f987"; }; }; "har-schema-1.0.5" = { @@ -7843,13 +7861,13 @@ let sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; }; }; - "rc-1.2.0" = { + "rc-1.2.1" = { name = "rc"; packageName = "rc"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.0.tgz"; - sha1 = "c7de973b7b46297c041366b2fd3d2363b1697c66"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz"; + sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"; }; }; "strip-json-comments-2.0.1" = { @@ -8276,13 +8294,13 @@ let sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; }; - "nan-2.5.1" = { + "nan-2.6.2" = { name = "nan"; packageName = "nan"; - version = "2.5.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; - sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; + url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"; + sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; }; }; "jsonparse-0.0.6" = { @@ -9242,13 +9260,13 @@ let sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; }; }; - "espree-3.4.0" = { + "espree-3.4.1" = { name = "espree"; packageName = "espree"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.4.0.tgz"; - sha1 = "41656fa5628e042878025ef467e78f125cb86e1d"; + url = "https://registry.npmjs.org/espree/-/espree-3.4.1.tgz"; + sha1 = "28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"; }; }; "esquery-1.0.0" = { @@ -9296,13 +9314,13 @@ let sha1 = "0c0ca696d9b9bb694d2e5470bd37777caad50286"; }; }; - "ignore-3.2.6" = { + "ignore-3.2.7" = { name = "ignore"; packageName = "ignore"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.6.tgz"; - sha1 = "26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz"; + sha1 = "4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"; }; }; "inquirer-0.12.0" = { @@ -9323,13 +9341,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.8.2" = { + "js-yaml-3.8.3" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz"; - sha1 = "02d3e2c0f6beab20248d412c352203827d786721"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz"; + sha1 = "33a05ec481c850c8875929166fe1beb61c728766"; }; }; "levn-0.3.0" = { @@ -9494,13 +9512,13 @@ let sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; }; }; - "acorn-4.0.4" = { + "acorn-5.0.3" = { name = "acorn"; packageName = "acorn"; - version = "4.0.4"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz"; - sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz"; + sha1 = "c460df08491463f028ccb82eab3730bf01087b3d"; }; }; "acorn-jsx-3.0.1" = { @@ -10097,13 +10115,13 @@ let sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"; }; }; - "arr-flatten-1.0.1" = { + "arr-flatten-1.0.2" = { name = "arr-flatten"; packageName = "arr-flatten"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"; - sha1 = "e5ffe54d45e19f32f216e91eb99c8ce892bb604b"; + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.2.tgz"; + sha1 = "1ec1e63439c54f67d6f72bb4299c3d4f73b2d996"; }; }; "expand-range-1.8.2" = { @@ -10448,13 +10466,13 @@ let sha1 = "21ffdc429be2b50cb361df990a40a7731288e935"; }; }; - "simple-git-1.69.0" = { + "simple-git-1.70.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.69.0"; + version = "1.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.69.0.tgz"; - sha1 = "e86ead16abfc273dca9ae2bd51e5eb3c0122c177"; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.70.0.tgz"; + sha1 = "62cfd90bb2628a13ff4fe704c840fcef56244a71"; }; }; "tabtab-git+https://github.com/mixu/node-tabtab.git" = { @@ -10494,13 +10512,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.12.4" = { + "coffee-script-1.12.5" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.4"; + version = "1.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; - sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz"; + sha1 = "809f4585419112bbfe46a073ad7543af18c27346"; }; }; "jade-1.11.0" = { @@ -10584,13 +10602,13 @@ let sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; }; }; - "uglify-js-2.8.20" = { + "uglify-js-2.8.22" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.20"; + version = "2.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; - sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.22.tgz"; + sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0"; }; }; "void-elements-2.0.1" = { @@ -13221,6 +13239,15 @@ let sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a"; }; }; + "npm-package-arg-4.2.1" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz"; + sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec"; + }; + }; "retry-0.8.0" = { name = "retry"; packageName = "retry"; @@ -13824,13 +13851,13 @@ let sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.21" = { + "node-red-node-email-0.1.22" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.21"; + version = "0.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.21.tgz"; - sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.22.tgz"; + sha1 = "99c610fdba3f498ddab71da9273d6003e4e0280e"; }; }; "node-red-node-twitter-0.1.10" = { @@ -13842,13 +13869,13 @@ let sha1 = "5883f6a8acebc99829c52400420d5ed52f44d221"; }; }; - "node-red-node-rbe-0.1.6" = { + "node-red-node-rbe-0.1.8" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.6"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz"; - sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.8.tgz"; + sha1 = "96108a5720842387ea5ddd046d7e483c7ab2a5dc"; }; }; "bcrypt-1.0.2" = { @@ -14031,13 +14058,13 @@ let sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; }; }; - "moment-timezone-0.5.11" = { + "moment-timezone-0.5.13" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.11"; + version = "0.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz"; - sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz"; + sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90"; }; }; "content-disposition-0.5.1" = { @@ -14139,22 +14166,22 @@ let sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef"; }; }; - "help-me-1.0.1" = { + "help-me-1.1.0" = { name = "help-me"; packageName = "help-me"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-1.0.1.tgz"; - sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a"; + url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz"; + sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "mqtt-packet-5.2.2" = { + "mqtt-packet-5.3.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "5.2.2"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.2.tgz"; - sha1 = "190d4358f415c6f964211030c20ca0bf45d5698a"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.3.0.tgz"; + sha1 = "078ed59ae4c06febf3b3eaca90b50e97e269f206"; }; }; "reinterval-1.1.0" = { @@ -14193,6 +14220,42 @@ let sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; }; }; + "glob-stream-6.1.0" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"; + sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; + }; + }; + "is-negated-glob-1.0.0" = { + name = "is-negated-glob"; + packageName = "is-negated-glob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; + sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; + }; + }; + "ordered-read-streams-1.0.0" = { + name = "ordered-read-streams"; + packageName = "ordered-read-streams"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.0.tgz"; + sha1 = "d674a86ffcedf83d0ae06afa2918855e96d4033a"; + }; + }; + "to-absolute-glob-2.0.1" = { + name = "to-absolute-glob"; + packageName = "to-absolute-glob"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.1.tgz"; + sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b"; + }; + }; "feedparser-1.1.3" = { name = "feedparser"; packageName = "feedparser"; @@ -14940,13 +15003,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "mailcomposer-4.0.1" = { + "mailcomposer-4.0.2" = { name = "mailcomposer"; packageName = "mailcomposer"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz"; - sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.2.tgz"; + sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101"; }; }; "simplesmtp-0.3.35" = { @@ -15075,15 +15138,6 @@ let sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; }; }; - "hosted-git-info-2.2.0" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; - sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; - }; - }; "lazy-property-1.0.0" = { name = "lazy-property"; packageName = "lazy-property"; @@ -15156,15 +15210,6 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; - "node-gyp-3.5.0" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; - sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; - }; - }; "npm-install-checks-3.0.0" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -15174,13 +15219,13 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; - "npm-registry-client-7.4.6" = { + "npm-registry-client-8.1.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.4.6"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.6.tgz"; - sha1 = "0aa7c55f18631b941b7b80a7aa501bfcb8b19717"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz"; + sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf"; }; }; "opener-1.4.3" = { @@ -15525,13 +15570,13 @@ let sha1 = "f3c9dc8738f5b59304d54d2cfb3f91d08fdd7998"; }; }; - "registry-auth-token-3.1.0" = { + "registry-auth-token-3.1.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz"; - sha1 = "997c08256e0c7999837b90e944db39d8a790276b"; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.2.tgz"; + sha1 = "1b9e51a185c930da34a9894b12a52ea998f1adaf"; }; }; "argparse-0.1.15" = { @@ -15786,13 +15831,13 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.26.1" = { + "snyk-1.28.1" = { name = "snyk"; packageName = "snyk"; - version = "1.26.1"; + version = "1.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.26.1.tgz"; - sha1 = "12b28e9b43c6453ecb6d4be7670b0c0df7db38a5"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.28.1.tgz"; + sha1 = "ae0faed0fcee7d5dbc0fa8a7a8c9ebacb03b6151"; }; }; "spawn-please-0.2.0" = { @@ -15903,22 +15948,22 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "snyk-module-1.7.0" = { + "snyk-module-1.8.1" = { name = "snyk-module"; packageName = "snyk-module"; - version = "1.7.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.7.0.tgz"; - sha1 = "07c6ca8556d281de6f9e2368c04ecb6dd1f2631a"; + url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz"; + sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; }; }; - "snyk-policy-1.7.0" = { + "snyk-policy-1.7.1" = { name = "snyk-policy"; packageName = "snyk-policy"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.0.tgz"; - sha1 = "2151c751ab1edc040fc6b94a872aa989db492324"; + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.1.tgz"; + sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22"; }; }; "snyk-recursive-readdir-2.0.0" = { @@ -16318,15 +16363,6 @@ let sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; }; }; - "gelf-stream-0.2.4" = { - name = "gelf-stream"; - packageName = "gelf-stream"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz"; - sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013"; - }; - }; "mediawiki-title-0.5.6" = { name = "mediawiki-title"; packageName = "mediawiki-title"; @@ -16383,6 +16419,15 @@ let sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; }; }; + "yargs-5.0.0" = { + name = "yargs"; + packageName = "yargs"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; + sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + }; + }; "is-arguments-1.0.2" = { name = "is-arguments"; packageName = "is-arguments"; @@ -16437,22 +16482,13 @@ let sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; }; }; - "gelfling-0.2.0" = { - name = "gelfling"; - packageName = "gelfling"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz"; - sha1 = "23a13c366883adae32ecfd252a566be302b88dc3"; - }; - }; - "bunyan-1.8.9" = { + "bunyan-1.8.10" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.9"; + version = "1.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz"; - sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz"; + sha1 = "201fedd26c7080b632f416072f53a90b9a52981c"; }; }; "bunyan-syslog-udp-0.1.0" = { @@ -16672,6 +16708,15 @@ let sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; }; }; + "yargs-parser-3.2.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; + sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; + }; + }; "airplayer-2.0.0" = { name = "airplayer"; packageName = "airplayer"; @@ -16762,15 +16807,6 @@ let sha1 = "d5bd826506425a3b3eacadf1e0e2c1ac3e289728"; }; }; - "stream-buffers-2.2.0" = { - name = "stream-buffers"; - packageName = "stream-buffers"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"; - sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; - }; - }; "consume-http-header-1.0.0" = { name = "consume-http-header"; packageName = "consume-http-header"; @@ -17554,6 +17590,96 @@ let sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; }; }; + "ast-types-0.9.8" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.9.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.8.tgz"; + sha1 = "6cb6a40beba31f49f20928e28439fc14a3dab078"; + }; + }; + "babylon-7.0.0-beta.8" = { + name = "babylon"; + packageName = "babylon"; + version = "7.0.0-beta.8"; + src = fetchurl { + url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.8.tgz"; + sha1 = "2bdc5ae366041442c27e068cce6f0d7c06ea9949"; + }; + }; + "flow-parser-0.43.0" = { + name = "flow-parser"; + packageName = "flow-parser"; + version = "0.43.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.43.0.tgz"; + sha1 = "e2b8eb1ac83dd53f7b6b04a7c35b6a52c33479b7"; + }; + }; + "jest-validate-19.0.0" = { + name = "jest-validate"; + packageName = "jest-validate"; + version = "19.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-19.0.0.tgz"; + sha1 = "8c6318a20ecfeaba0ba5378bfbb8277abded4173"; + }; + }; + "jest-matcher-utils-19.0.0" = { + name = "jest-matcher-utils"; + packageName = "jest-matcher-utils"; + version = "19.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz"; + sha1 = "5ecd9b63565d2b001f61fbf7ec4c7f537964564d"; + }; + }; + "leven-2.1.0" = { + name = "leven"; + packageName = "leven"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; + sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; + }; + }; + "pretty-format-19.0.0" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "19.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-19.0.0.tgz"; + sha1 = "56530d32acb98a3fa4851c4e2b9d37b420684c84"; + }; + }; + "ansi-styles-3.0.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.0.0.tgz"; + sha1 = "5404e93a544c4fec7f048262977bebfe3155e0c1"; + }; + }; + "color-convert-1.9.0" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; + sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; + }; + }; + "color-name-1.1.2" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; + sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; + }; + }; "commoner-0.10.8" = { name = "commoner"; packageName = "commoner"; @@ -18698,22 +18824,13 @@ let sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580"; }; }; - "express-4.14.1" = { - name = "express"; - packageName = "express"; - version = "4.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz"; - sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33"; - }; - }; - "express-session-1.14.2" = { + "express-session-1.15.2" = { name = "express-session"; packageName = "express-session"; - version = "1.14.2"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz"; - sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; + sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; }; }; "forever-monitor-1.1.0" = { @@ -18770,13 +18887,13 @@ let sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44"; }; }; - "npm-4.1.2" = { + "npm-4.5.0" = { name = "npm"; packageName = "npm"; - version = "4.1.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz"; - sha1 = "daaa77d631947135b36528c304573243f5cd2e07"; + url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz"; + sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475"; }; }; "octicons-3.5.0" = { @@ -18797,13 +18914,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-1.1.5" = { + "raven-1.2.1" = { name = "raven"; packageName = "raven"; - version = "1.1.5"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-1.1.5.tgz"; - sha1 = "6af541406c37da1d678781d0af411c27c6f05fbf"; + url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz"; + sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd"; }; }; "signals-1.0.0" = { @@ -18815,13 +18932,13 @@ let sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; }; }; - "snapsvg-0.4.0" = { + "snapsvg-0.5.1" = { name = "snapsvg"; packageName = "snapsvg"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.4.0.tgz"; - sha1 = "e0767014167825957de7e125c29b0fa89796ea03"; + url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.5.1.tgz"; + sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; }; }; "winston-2.3.1" = { @@ -18833,13 +18950,13 @@ let sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "color-convert-1.9.0" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.0"; + "yargs-7.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; - sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; + url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz"; + sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8"; }; }; "color-string-1.5.2" = { @@ -18851,15 +18968,6 @@ let sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9"; }; }; - "color-name-1.1.2" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; - sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; - }; - }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -18896,13 +19004,13 @@ let sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; }; }; - "crc-3.4.1" = { + "crc-3.4.4" = { name = "crc"; packageName = "crc"; - version = "3.4.1"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz"; - sha1 = "65d5830b1a2569557cfb324c0e679998521473ee"; + url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; + sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; }; }; "broadway-0.2.10" = { @@ -19031,15 +19139,6 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; - "mississippi-1.2.0" = { - name = "mississippi"; - packageName = "mississippi"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; - sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; - }; - }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -19058,13 +19157,22 @@ let sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; }; }; - "eve-0.4.2" = { + "eve-0.5.3" = { name = "eve"; packageName = "eve"; - version = "0.4.2"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eve/-/eve-0.5.3.tgz"; + sha1 = "6c2f6588f7d0b392044d245ba5af9d7cfe237f42"; + }; + }; + "yargs-parser-5.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eve/-/eve-0.4.2.tgz"; - sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz"; + sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; }; }; "kew-0.1.7" = { @@ -19130,6 +19238,15 @@ let sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de"; }; }; + "json5-0.5.1" = { + name = "json5"; + packageName = "json5"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + }; "loader-runner-2.3.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -19202,15 +19319,6 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; - "json5-0.5.1" = { - name = "json5"; - packageName = "json5"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; - }; - }; "os-browserify-0.2.1" = { name = "os-browserify"; packageName = "os-browserify"; @@ -19310,15 +19418,6 @@ let sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; }; }; - "leven-2.1.0" = { - name = "leven"; - packageName = "leven"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; - sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; - }; - }; "node-emoji-1.5.1" = { name = "node-emoji"; packageName = "node-emoji"; @@ -19364,6 +19463,15 @@ let sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e"; }; }; + "v8-compile-cache-1.1.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.0.tgz"; + sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9"; + }; + }; "regenerator-runtime-0.10.3" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -19865,10 +19973,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.8"; + version = "1.9.11"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.8.tgz"; - sha1 = "17294e9828a1f11ef241d59f5eb040e6a5b4ed13"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.11.tgz"; + sha1 = "6e185c5c3211b5a86d272caec63b8daf80e5b186"; }; dependencies = [ sources."colors-0.6.0-1" @@ -20007,10 +20115,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.11"; + version = "0.10.12"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.11.tgz"; - sha1 = "aa1a379386b5c60f90f86134b4047acb1302d482"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.12.tgz"; + sha1 = "4446af5df8dda6c755a0bf7dfec2468a9f63f26d"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -20059,7 +20167,7 @@ in sources."azure-arm-servermanagement-0.1.2" sources."azure-arm-network-0.18.0" sources."azure-arm-powerbiembedded-0.1.0" - sources."azure-arm-trafficmanager-0.10.5" + sources."azure-arm-trafficmanager-0.12.0" sources."azure-arm-dns-0.11.1" sources."azure-arm-website-0.11.4" sources."azure-arm-rediscache-0.2.3" @@ -20067,7 +20175,7 @@ in sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" sources."azure-keyvault-0.11.0" - sources."azure-asm-compute-0.17.0" + sources."azure-asm-compute-0.18.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-trafficmanager-0.10.3" sources."azure-asm-mgmt-0.10.1" @@ -20088,7 +20196,7 @@ in sources."moment-2.14.1" ]; }) - (sources."azure-storage-2.0.0" // { + (sources."azure-storage-2.1.0" // { dependencies = [ sources."browserify-mime-1.2.9" sources."extend-1.2.1" @@ -20231,7 +20339,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -20299,7 +20407,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -20368,7 +20476,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -20427,13 +20535,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -20549,13 +20657,13 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -20574,14 +20682,14 @@ in sources."prepend-http-1.0.4" (sources."read-all-stream-2.2.0" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -20615,7 +20723,7 @@ in sources."minimist-1.2.0" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -20752,7 +20860,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -20804,7 +20912,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -20832,10 +20940,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "14.1.0"; + version = "14.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz"; - sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.3.0.tgz"; + sha1 = "fd003a2386ac1aec127f097885a3cc6373b745c4"; }; dependencies = [ (sources."JSONStream-1.3.1" // { @@ -20868,7 +20976,7 @@ in sources."pako-0.2.9" ]; }) - (sources."buffer-5.0.5" // { + (sources."buffer-5.0.6" // { dependencies = [ sources."base64-js-1.2.0" sources."ieee754-1.1.8" @@ -20925,7 +21033,7 @@ in dependencies = [ sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" ]; @@ -20955,7 +21063,7 @@ in dependencies = [ sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" ]; @@ -21021,7 +21129,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -21043,7 +21151,7 @@ in ]; }) sources."htmlescape-1.1.1" - sources."https-browserify-0.0.1" + sources."https-browserify-1.0.0" sources."inherits-2.0.3" (sources."insert-module-globals-7.0.1" // { dependencies = [ @@ -21094,12 +21202,13 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -21127,7 +21236,7 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.6.3" // { + (sources."stream-http-2.7.0" // { dependencies = [ sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" @@ -21291,7 +21400,7 @@ in sources."map-obj-1.0.1" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -21449,17 +21558,17 @@ in sources."minimist-0.0.10" ]; }) - (sources."parse-torrent-5.8.2" // { + (sources."parse-torrent-5.8.3" // { dependencies = [ sources."blob-to-buffer-1.2.6" sources."get-stdin-5.0.1" - (sources."magnet-uri-5.1.5" // { + (sources."magnet-uri-5.1.6" // { dependencies = [ sources."thirty-two-1.0.2" sources."uniq-1.0.1" ]; }) - (sources."parse-torrent-file-4.0.1" // { + (sources."parse-torrent-file-4.0.2" // { dependencies = [ sources."bencode-0.11.0" (sources."simple-sha1-2.1.0" // { @@ -21470,7 +21579,7 @@ in sources."uniq-1.0.1" ]; }) - (sources."simple-get-2.4.0" // { + (sources."simple-get-2.5.1" // { dependencies = [ (sources."once-1.4.0" // { dependencies = [ @@ -21518,15 +21627,16 @@ in }) ]; }) - (sources."fs-chunk-store-1.6.4" // { + (sources."fs-chunk-store-1.6.5" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - (sources."random-access-file-1.5.0" // { + (sources."random-access-file-1.6.1" // { dependencies = [ + sources."buffer-alloc-unsafe-1.0.0" sources."inherits-2.0.3" ]; }) @@ -21605,7 +21715,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -21669,7 +21779,7 @@ in }) sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-get-2.4.0" // { + (sources."simple-get-2.5.1" // { dependencies = [ sources."simple-concat-1.0.0" sources."unzip-response-2.0.1" @@ -21679,13 +21789,13 @@ in dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -21694,18 +21804,19 @@ in (sources."simple-websocket-4.3.1" // { dependencies = [ sources."randombytes-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) - (sources."ws-2.2.2" // { + (sources."ws-2.2.3" // { dependencies = [ + sources."safe-buffer-5.0.1" sources."ultron-1.1.0" ]; }) @@ -21731,7 +21842,7 @@ in sources."run-parallel-1.1.6" ]; }) - sources."torrent-piece-1.1.0" + sources."torrent-piece-1.1.1" ]; }) sources."windows-no-runnable-0.0.6" @@ -21832,13 +21943,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -21884,10 +21995,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.4"; + version = "1.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; - sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz"; + sha1 = "809f4585419112bbfe46a073ad7543af18c27346"; }; buildInputs = globalBuildInputs; meta = { @@ -21911,7 +22022,7 @@ in sources."ansi-0.3.1" (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.17" + sources."big-integer-1.6.19" ]; }) sources."cordova-registry-mapper-1.1.15" @@ -21938,7 +22049,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -22017,7 +22128,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -22139,7 +22250,7 @@ in dependencies = [ sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" ]; @@ -22169,7 +22280,7 @@ in dependencies = [ sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" ]; @@ -22235,7 +22346,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -22308,12 +22419,13 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -22341,7 +22453,7 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.6.3" // { + (sources."stream-http-2.7.0" // { dependencies = [ sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" @@ -22498,7 +22610,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -22535,7 +22647,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -22551,7 +22663,7 @@ in sources."path-is-absolute-1.0.1" ]; }) - (sources."init-package-json-1.9.5" // { + (sources."init-package-json-1.9.6" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -22564,7 +22676,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -22580,9 +22692,15 @@ in sources."path-is-absolute-1.0.1" ]; }) - (sources."npm-package-arg-4.2.1" // { + (sources."npm-package-arg-5.0.1" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" + (sources."osenv-0.1.4" // { + dependencies = [ + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + ]; + }) sources."semver-5.3.0" ]; }) @@ -22601,7 +22719,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -22705,7 +22823,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -22741,13 +22859,13 @@ in (sources."concat-stream-1.6.0" // { dependencies = [ sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -22846,7 +22964,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -22906,7 +23024,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -23071,7 +23189,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -23096,20 +23214,31 @@ in }) sources."unorm-1.3.3" sources."valid-identifier-0.0.1" - (sources."xcode-0.9.1" // { + (sources."xcode-0.9.3" // { dependencies = [ - sources."node-uuid-1.4.7" - sources."pegjs-0.9.0" - (sources."simple-plist-0.1.4" // { + sources."pegjs-0.10.0" + (sources."simple-plist-0.2.1" // { dependencies = [ - sources."bplist-parser-0.0.6" - (sources."bplist-creator-0.0.4" // { + (sources."bplist-creator-0.0.7" // { + dependencies = [ + sources."stream-buffers-2.2.0" + ]; + }) + (sources."bplist-parser-0.1.1" // { + dependencies = [ + sources."big-integer-1.6.19" + ]; + }) + (sources."plist-2.0.1" // { dependencies = [ - sources."stream-buffers-0.2.6" + sources."base64-js-1.1.2" + sources."xmlbuilder-8.2.2" + sources."xmldom-0.1.27" ]; }) ]; }) + sources."uuid-3.0.1" ]; }) ]; @@ -23240,14 +23369,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -23279,7 +23408,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -23392,13 +23521,13 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -23423,14 +23552,14 @@ in sources."pinkie-2.0.4" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -23441,7 +23570,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -23601,7 +23730,7 @@ in (sources."hiredis-0.4.1" // { dependencies = [ sources."bindings-1.2.1" - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) (sources."json-rpc2-0.8.1" // { @@ -23815,13 +23944,13 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -23950,14 +24079,14 @@ in sources."split2-2.1.1" (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -23987,13 +24116,13 @@ in }) ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -24036,14 +24165,14 @@ in (sources."tar-stream-1.5.2" // { dependencies = [ sources."bl-1.2.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -24087,7 +24216,7 @@ in sources."through-2.3.8" ]; }) - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -24112,14 +24241,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -24151,7 +24280,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -24331,7 +24460,7 @@ in sources."minimist-1.2.0" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -24442,10 +24571,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.18.0"; + version = "3.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.18.0.tgz"; - sha1 = "647e985c4ae71502d20ac62c109f66d5104c8a4b"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; + sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; }; dependencies = [ (sources."babel-code-frame-6.22.0" // { @@ -24474,13 +24603,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -24524,9 +24653,9 @@ in }) ]; }) - (sources."espree-3.4.0" // { + (sources."espree-3.4.1" // { dependencies = [ - sources."acorn-4.0.4" + sources."acorn-5.0.3" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -24587,7 +24716,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -24604,7 +24733,7 @@ in ]; }) sources."globals-9.17.0" - sources."ignore-3.2.6" + sources."ignore-3.2.7" sources."imurmurhash-0.1.4" (sources."inquirer-0.12.0" // { dependencies = [ @@ -24679,7 +24808,7 @@ in sources."tryit-1.0.3" ]; }) - (sources."js-yaml-3.8.2" // { + (sources."js-yaml-3.8.3" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -24747,7 +24876,7 @@ in sources."strip-json-comments-2.0.1" (sources."table-3.8.3" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" ]; @@ -24915,7 +25044,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" ]; }) sources."array-unique-0.2.1" @@ -25001,13 +25130,13 @@ in (sources."readdirp-2.1.0" // { dependencies = [ sources."graceful-fs-4.1.11" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -25016,7 +25145,7 @@ in }) (sources."fsevents-1.1.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -25040,13 +25169,13 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -25080,7 +25209,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -25100,14 +25229,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -25139,7 +25268,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -25224,13 +25353,13 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -25245,7 +25374,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -25344,7 +25473,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -25391,7 +25520,7 @@ in sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4"; }; dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -25402,7 +25531,7 @@ in sources."microee-0.0.2" ]; }) - sources."simple-git-1.69.0" + sources."simple-git-1.70.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -25434,7 +25563,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -25478,7 +25607,7 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.5" (sources."jade-1.11.0" // { dependencies = [ sources."character-parser-1.2.1" @@ -25546,7 +25675,7 @@ in }) ]; }) - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."source-map-0.5.6" (sources."yargs-3.10.0" // { @@ -25627,7 +25756,7 @@ in }) (sources."msgpack-1.0.2" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) ]; @@ -25736,14 +25865,14 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -25778,7 +25907,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" ]; }) sources."array-unique-0.2.1" @@ -25983,7 +26112,7 @@ in }) (sources."minimatch-2.0.10" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -26124,7 +26253,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -26190,7 +26319,7 @@ in }) (sources."minimatch-2.0.10" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -26283,7 +26412,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -26307,7 +26436,7 @@ in sources."amdefine-1.0.1" ]; }) - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."source-map-0.5.6" (sources."yargs-3.10.0" // { @@ -26358,7 +26487,7 @@ in }) ]; }) - (sources."js-yaml-3.8.2" // { + (sources."js-yaml-3.8.3" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -26482,7 +26611,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -26535,10 +26664,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz"; - sha1 = "02d3e2c0f6beab20248d412c352203827d786721"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz"; + sha1 = "33a05ec481c850c8875929166fe1beb61c728766"; }; dependencies = [ (sources."argparse-1.0.9" // { @@ -26559,10 +26688,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.5.0.tgz"; - sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009"; + url = "https://registry.npmjs.org/karma/-/karma-1.6.0.tgz"; + sha1 = "0e871d4527d5eac56c41d181f03c5c0a7e6dbf3e"; }; dependencies = [ sources."bluebird-3.5.0" @@ -26595,7 +26724,7 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -26616,7 +26745,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" ]; }) sources."array-unique-0.2.1" @@ -26702,13 +26831,13 @@ in sources."path-is-absolute-1.0.1" (sources."readdirp-2.1.0" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -26717,7 +26846,7 @@ in }) (sources."fsevents-1.1.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -26741,13 +26870,13 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -26781,7 +26910,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -26801,14 +26930,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -26840,7 +26969,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -26897,13 +27026,13 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -27014,7 +27143,7 @@ in sources."mime-1.3.4" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -27366,7 +27495,7 @@ in }) ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -27493,14 +27622,14 @@ in dependencies = [ (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -27544,7 +27673,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -27574,7 +27703,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" ]; }) sources."array-unique-0.2.1" @@ -27701,14 +27830,14 @@ in ]; }) sources."object-assign-4.1.1" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -27819,7 +27948,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -27912,13 +28041,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -27932,7 +28061,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -27952,7 +28081,7 @@ in }) (sources."npm-package-arg-4.2.1" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" ]; }) (sources."once-1.4.0" // { @@ -27972,14 +28101,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -28011,7 +28140,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -28062,7 +28191,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -28081,14 +28210,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -28182,7 +28311,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -28278,7 +28407,7 @@ in sources."graceful-fs-4.1.11" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -28301,14 +28430,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -28360,14 +28489,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -28399,7 +28528,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -28461,10 +28590,10 @@ in node-inspector = nodeEnv.buildNodePackage { name = "node-inspector"; packageName = "node-inspector"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.0.0.tgz"; - sha1 = "c6221619e3f0bd8f1f24e0e882a65eb793f69d37"; + url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.0.tgz"; + sha1 = "0f8ffffbf9a9b86540eb33c1d64e7ba546457622"; }; dependencies = [ sources."async-0.9.2" @@ -28515,7 +28644,7 @@ in dependencies = [ (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.17" + sources."big-integer-1.6.19" ]; }) (sources."meow-3.7.0" // { @@ -28539,7 +28668,7 @@ in sources."map-obj-1.0.1" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -28722,7 +28851,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -28746,7 +28875,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -28762,7 +28891,7 @@ in ]; }) sources."path-is-absolute-1.0.1" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -28786,7 +28915,7 @@ in }) (sources."v8-debug-1.0.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -28810,14 +28939,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -28863,14 +28992,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -28902,7 +29031,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -28952,7 +29081,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -28994,7 +29123,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -29009,14 +29138,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29029,7 +29158,7 @@ in }) (sources."v8-profiler-5.7.0" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -29053,14 +29182,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29106,14 +29235,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -29145,7 +29274,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -29195,7 +29324,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -29237,7 +29366,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -29252,14 +29381,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29361,14 +29490,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29402,7 +29531,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -29422,14 +29551,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -29461,7 +29590,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -29511,7 +29640,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -29559,7 +29688,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -29574,14 +29703,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29615,7 +29744,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" ]; }) sources."array-unique-0.2.1" @@ -29702,13 +29831,13 @@ in (sources."readdirp-2.1.0" // { dependencies = [ sources."graceful-fs-4.1.11" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29717,7 +29846,7 @@ in }) (sources."fsevents-1.1.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -29741,13 +29870,13 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29781,7 +29910,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -29801,14 +29930,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -29840,7 +29969,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -29920,13 +30049,13 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -29975,7 +30104,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -30075,13 +30204,13 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -30106,14 +30235,14 @@ in sources."pinkie-2.0.4" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -30124,7 +30253,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -30212,7 +30341,7 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ (sources."mime-types-2.1.15" // { dependencies = [ @@ -30249,13 +30378,13 @@ in sources."domhandler-2.3.0" sources."domutils-1.5.1" sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -30289,7 +30418,7 @@ in }) (sources."cron-1.2.1" // { dependencies = [ - (sources."moment-timezone-0.5.11" // { + (sources."moment-timezone-0.5.13" // { dependencies = [ sources."moment-2.18.1" ]; @@ -30378,7 +30507,7 @@ in }) ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ (sources."mime-types-2.1.15" // { dependencies = [ @@ -30460,14 +30589,15 @@ in }) ]; }) - (sources."help-me-1.0.1" // { + (sources."help-me-1.1.0" // { dependencies = [ sources."callback-stream-1.1.0" - (sources."glob-stream-5.3.5" // { + (sources."glob-stream-6.1.0" // { dependencies = [ sources."extend-3.0.0" - (sources."glob-5.0.15" // { + (sources."glob-7.1.1" // { dependencies = [ + sources."fs.realpath-1.0.0" (sources."inflight-1.0.6" // { dependencies = [ sources."wrappy-1.0.2" @@ -30475,7 +30605,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -30501,104 +30631,50 @@ in sources."path-dirname-1.0.2" ]; }) - (sources."micromatch-2.3.11" // { + sources."is-negated-glob-1.0.0" + (sources."ordered-read-streams-1.0.0" // { dependencies = [ - (sources."arr-diff-2.0.0" // { - dependencies = [ - sources."arr-flatten-1.0.1" - ]; - }) - sources."array-unique-0.2.1" - (sources."braces-1.8.5" // { + sources."is-stream-1.1.0" + ]; + }) + (sources."pumpify-1.3.5" // { + dependencies = [ + (sources."duplexify-3.5.0" // { dependencies = [ - (sources."expand-range-1.8.2" // { + (sources."end-of-stream-1.0.0" // { dependencies = [ - (sources."fill-range-2.2.3" // { + (sources."once-1.3.3" // { dependencies = [ - sources."is-number-2.1.0" - (sources."isobject-2.1.0" // { - dependencies = [ - sources."isarray-1.0.0" - ]; - }) - sources."randomatic-1.1.6" - sources."repeat-string-1.6.1" + sources."wrappy-1.0.2" ]; }) ]; }) - sources."preserve-0.2.0" - sources."repeat-element-1.1.2" - ]; - }) - (sources."expand-brackets-0.1.5" // { - dependencies = [ - sources."is-posix-bracket-0.1.1" - ]; - }) - sources."extglob-0.3.2" - sources."filename-regex-2.0.0" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - (sources."kind-of-3.1.0" // { - dependencies = [ - sources."is-buffer-1.1.5" - ]; - }) - (sources."normalize-path-2.1.1" // { - dependencies = [ - sources."remove-trailing-separator-1.0.1" + sources."stream-shift-1.0.0" ]; }) - (sources."object.omit-2.0.1" // { + ]; + }) + sources."remove-trailing-separator-1.0.1" + (sources."to-absolute-glob-2.0.1" // { + dependencies = [ + (sources."extend-shallow-2.0.1" // { dependencies = [ - (sources."for-own-0.1.5" // { - dependencies = [ - sources."for-in-1.0.2" - ]; - }) sources."is-extendable-0.1.1" ]; }) - (sources."parse-glob-3.0.4" // { + (sources."is-absolute-0.2.6" // { dependencies = [ - (sources."glob-base-0.3.0" // { + (sources."is-relative-0.2.1" // { dependencies = [ - sources."glob-parent-2.0.0" + (sources."is-unc-path-0.1.2" // { + dependencies = [ + sources."unc-path-regex-0.1.2" + ]; + }) ]; }) - sources."is-dotfile-1.0.2" - ]; - }) - (sources."regex-cache-0.4.3" // { - dependencies = [ - sources."is-equal-shallow-0.1.3" - sources."is-primitive-2.0.0" - ]; - }) - ]; - }) - (sources."ordered-read-streams-0.3.0" // { - dependencies = [ - sources."is-stream-1.1.0" - ]; - }) - (sources."through2-0.6.5" // { - dependencies = [ - (sources."readable-stream-1.0.34" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - ]; - }) - ]; - }) - (sources."to-absolute-glob-0.1.1" // { - dependencies = [ - (sources."extend-shallow-2.0.1" // { - dependencies = [ - sources."is-extendable-0.1.1" + sources."is-windows-0.2.0" ]; }) ]; @@ -30610,11 +30686,7 @@ in sources."jsonify-0.0.0" ]; }) - (sources."through2-filter-2.0.0" // { - dependencies = [ - sources."through2-2.0.3" - ]; - }) + sources."through2-filter-2.0.0" ]; }) ]; @@ -30624,19 +30696,20 @@ in }) sources."inherits-2.0.3" sources."minimist-1.2.0" - (sources."mqtt-packet-5.2.2" // { + (sources."mqtt-packet-5.3.0" // { dependencies = [ sources."bl-1.2.0" sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.0.1" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -30832,7 +30905,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -30901,7 +30974,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -30937,7 +31010,7 @@ in }) ]; }) - (sources."node-red-node-email-0.1.21" // { + (sources."node-red-node-email-0.1.22" // { dependencies = [ (sources."nodemailer-1.11.0" // { dependencies = [ @@ -31054,14 +31127,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -31093,7 +31166,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -31131,7 +31204,7 @@ in }) ]; }) - sources."node-red-node-rbe-0.1.6" + sources."node-red-node-rbe-0.1.8" (sources."bcrypt-1.0.2" // { dependencies = [ sources."bindings-1.2.1" @@ -31148,14 +31221,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -31209,14 +31282,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -31248,7 +31321,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -31297,7 +31370,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -31344,7 +31417,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -31453,7 +31526,7 @@ in (sources."config-0.4.15" // { dependencies = [ sources."js-yaml-0.3.7" - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.5" (sources."vows-0.8.1" // { dependencies = [ sources."eyes-0.1.8" @@ -31514,7 +31587,7 @@ in sources."moment-2.1.0" (sources."nodemailer-0.3.35" // { dependencies = [ - (sources."mailcomposer-4.0.1" // { + (sources."mailcomposer-4.0.2" // { dependencies = [ (sources."buildmail-4.0.1" // { dependencies = [ @@ -31580,10 +31653,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.4.4"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.4.4.tgz"; - sha1 = "d5ec661923a06bcd6a6eec3d0433a9da3fd67e37"; + url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz"; + sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475"; }; dependencies = [ (sources."JSONStream-1.3.1" // { @@ -31632,7 +31705,7 @@ in dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -31649,7 +31722,7 @@ in sources."fs.realpath-1.0.0" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -31662,12 +31735,12 @@ in }) sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.2" sources."iferr-0.1.5" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - (sources."init-package-json-1.9.5" // { + (sources."init-package-json-1.9.6" // { dependencies = [ sources."promzard-0.3.0" ]; @@ -31734,11 +31807,11 @@ in sources."run-queue-1.0.3" ]; }) - (sources."node-gyp-3.5.0" // { + (sources."node-gyp-3.6.0" // { dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -31763,7 +31836,7 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.1" - (sources."npm-registry-client-7.4.6" // { + (sources."npm-registry-client-8.1.1" // { dependencies = [ (sources."concat-stream-1.6.0" // { dependencies = [ @@ -31831,13 +31904,13 @@ in ]; }) sources."read-package-tree-5.1.5" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -31854,14 +31927,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -31893,7 +31966,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -32084,9 +32157,9 @@ in }) ]; }) - (sources."registry-auth-token-3.1.0" // { + (sources."registry-auth-token-3.1.2" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."minimist-1.2.0" @@ -32097,7 +32170,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."minimist-1.2.0" @@ -32187,14 +32260,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -32226,7 +32299,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -32281,7 +32354,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -32306,14 +32379,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -32403,7 +32476,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -32453,7 +32526,7 @@ in ]; }) sources."findit-1.2.0" - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.5" ]; buildInputs = globalBuildInputs; meta = { @@ -32465,10 +32538,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.10.4"; + version = "2.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.4.tgz"; - sha1 = "0833dd707f983a04fdcd615afb860ce82b1e54a2"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.5.tgz"; + sha1 = "2d047e3a24d676e0c99cf7221361088dcc247a6a"; }; dependencies = [ sources."bluebird-3.5.0" @@ -32558,7 +32631,7 @@ in dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -32575,7 +32648,7 @@ in sources."fs.realpath-1.0.0" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -32593,7 +32666,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - (sources."init-package-json-1.9.5" // { + (sources."init-package-json-1.9.6" // { dependencies = [ sources."promzard-0.3.0" (sources."validate-npm-package-name-3.0.0" // { @@ -32623,7 +32696,7 @@ in dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -32704,13 +32777,13 @@ in (sources."concat-stream-1.6.0" // { dependencies = [ sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -32879,7 +32952,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -32976,7 +33049,7 @@ in sources."require-dir-0.3.1" sources."semver-5.3.0" sources."semver-utils-1.1.1" - (sources."snyk-1.26.1" // { + (sources."snyk-1.28.1" // { dependencies = [ sources."abbrev-1.1.0" sources."ansi-escapes-1.4.0" @@ -33092,14 +33165,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -33131,7 +33204,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -33221,19 +33294,14 @@ in sources."path-is-absolute-1.0.1" ]; }) - (sources."snyk-module-1.7.0" // { + (sources."snyk-module-1.8.1" // { dependencies = [ - sources."hosted-git-info-2.4.1" - (sources."validate-npm-package-name-2.2.2" // { - dependencies = [ - sources."builtins-0.0.7" - ]; - }) + sources."hosted-git-info-2.4.2" ]; }) - (sources."snyk-policy-1.7.0" // { + (sources."snyk-policy-1.7.1" // { dependencies = [ - (sources."js-yaml-3.8.2" // { + (sources."js-yaml-3.8.3" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -33250,7 +33318,7 @@ in dependencies = [ (sources."minimatch-3.0.2" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -33370,14 +33438,14 @@ in ]; }) sources."read-all-stream-3.1.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -33390,9 +33458,9 @@ in }) ]; }) - (sources."registry-auth-token-3.1.0" // { + (sources."registry-auth-token-3.1.2" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -33403,7 +33471,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -33474,7 +33542,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -33599,13 +33667,13 @@ in ]; }) sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -33630,14 +33698,14 @@ in sources."pinkie-2.0.4" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -33648,7 +33716,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -33792,14 +33860,14 @@ in ]; }) sources."read-all-stream-3.1.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -33812,9 +33880,9 @@ in }) ]; }) - (sources."registry-auth-token-3.1.0" // { + (sources."registry-auth-token-3.1.2" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -33826,7 +33894,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -33861,10 +33929,10 @@ in parsoid = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; - version = "0.6.1"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz"; - sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723"; + url = "https://registry.npmjs.org/parsoid/-/parsoid-0.7.1.tgz"; + sha1 = "121dcf59d0bacd9247405988525888f9a6ba2328"; }; dependencies = [ sources."async-0.9.2" @@ -33903,7 +33971,7 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -34035,7 +34103,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -34061,7 +34129,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -34092,7 +34160,7 @@ in sources."amdefine-1.0.1" ]; }) - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."source-map-0.5.6" (sources."yargs-3.10.0" // { @@ -34178,12 +34246,7 @@ in sources."unpipe-1.0.0" ]; }) - (sources."gelf-stream-0.2.4" // { - dependencies = [ - sources."gelfling-0.2.0" - ]; - }) - (sources."js-yaml-3.8.2" // { + (sources."js-yaml-3.8.3" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -34210,14 +34273,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -34249,7 +34312,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -34298,11 +34361,11 @@ in (sources."service-runner-2.2.5" // { dependencies = [ sources."bluebird-3.5.0" - (sources."bunyan-1.8.9" // { + (sources."bunyan-1.8.10" // { dependencies = [ (sources."dtrace-provider-0.8.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) (sources."mv-2.1.1" // { @@ -34325,7 +34388,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -34382,14 +34445,14 @@ in }) ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -34460,7 +34523,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -34529,7 +34592,7 @@ in ]; }) sources."simplediff-0.1.1" - (sources."yargs-4.8.1" // { + (sources."yargs-5.0.0" // { dependencies = [ (sources."cliui-3.2.0" // { dependencies = [ @@ -34594,7 +34657,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -34648,7 +34711,7 @@ in sources."which-module-1.0.0" sources."window-size-0.2.0" sources."y18n-3.2.1" - (sources."yargs-parser-2.4.1" // { + (sources."yargs-parser-3.2.0" // { dependencies = [ sources."camelcase-3.0.0" ]; @@ -34684,20 +34747,20 @@ in }) (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.17" + sources."big-integer-1.6.19" ]; }) (sources."concat-stream-1.6.0" // { dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -34827,7 +34890,7 @@ in sources."map-obj-1.0.1" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -34968,13 +35031,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -35038,17 +35101,17 @@ in sources."minimist-0.0.10" ]; }) - (sources."parse-torrent-5.8.2" // { + (sources."parse-torrent-5.8.3" // { dependencies = [ sources."blob-to-buffer-1.2.6" sources."get-stdin-5.0.1" - (sources."magnet-uri-5.1.5" // { + (sources."magnet-uri-5.1.6" // { dependencies = [ sources."thirty-two-1.0.2" sources."uniq-1.0.1" ]; }) - (sources."parse-torrent-file-4.0.1" // { + (sources."parse-torrent-file-4.0.2" // { dependencies = [ sources."bencode-0.11.0" (sources."simple-sha1-2.1.0" // { @@ -35059,7 +35122,7 @@ in sources."uniq-1.0.1" ]; }) - (sources."simple-get-2.4.0" // { + (sources."simple-get-2.5.1" // { dependencies = [ (sources."once-1.4.0" // { dependencies = [ @@ -35083,7 +35146,7 @@ in ]; }) sources."range-parser-1.2.0" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -35104,15 +35167,16 @@ in }) ]; }) - (sources."fs-chunk-store-1.6.4" // { + (sources."fs-chunk-store-1.6.5" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - (sources."random-access-file-1.5.0" // { + (sources."random-access-file-1.6.1" // { dependencies = [ + sources."buffer-alloc-unsafe-1.0.0" (sources."debug-2.6.3" // { dependencies = [ sources."ms-0.7.2" @@ -35196,7 +35260,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -35261,7 +35325,7 @@ in }) sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-get-2.4.0" // { + (sources."simple-get-2.5.1" // { dependencies = [ sources."simple-concat-1.0.0" sources."unzip-response-2.0.1" @@ -35271,13 +35335,13 @@ in dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -35286,18 +35350,19 @@ in (sources."simple-websocket-4.3.1" // { dependencies = [ sources."randombytes-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) - (sources."ws-2.2.2" // { + (sources."ws-2.2.3" // { dependencies = [ + sources."safe-buffer-5.0.1" sources."ultron-1.1.0" ]; }) @@ -35328,7 +35393,7 @@ in sources."run-parallel-1.1.6" ]; }) - sources."torrent-piece-1.1.0" + sources."torrent-piece-1.1.1" ]; }) sources."windows-no-runnable-0.0.6" @@ -35840,7 +35905,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -35863,7 +35928,7 @@ in }) (sources."fluent-ffmpeg-2.1.0" // { dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -35946,7 +36011,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -35998,7 +36063,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -36026,7 +36091,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -36123,6 +36188,98 @@ in }; production = true; }; + prettier = nodeEnv.buildNodePackage { + name = "prettier"; + packageName = "prettier"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-1.1.0.tgz"; + sha1 = "9d6ad005703efefa66b6999b8916bfc6afeaf9f8"; + }; + dependencies = [ + sources."ast-types-0.9.8" + (sources."babel-code-frame-6.22.0" // { + dependencies = [ + sources."js-tokens-3.0.1" + ]; + }) + sources."babylon-7.0.0-beta.8" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + sources."esutils-2.0.2" + sources."flow-parser-0.43.0" + sources."get-stdin-5.0.1" + (sources."glob-7.1.1" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.6" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.7" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" + ]; + }) + (sources."jest-validate-19.0.0" // { + dependencies = [ + sources."jest-matcher-utils-19.0.0" + sources."leven-2.1.0" + (sources."pretty-format-19.0.0" // { + dependencies = [ + (sources."ansi-styles-3.0.0" // { + dependencies = [ + (sources."color-convert-1.9.0" // { + dependencies = [ + sources."color-name-1.1.2" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + sources."minimist-1.2.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Prettier is an opinionated JavaScript formatter"; + homepage = "https://github.com/prettier/prettier#readme"; + license = "MIT"; + }; + production = true; + }; react-tools = nodeEnv.buildNodePackage { name = "react-tools"; packageName = "react-tools"; @@ -36155,7 +36312,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -36319,14 +36476,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -36358,7 +36515,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -36516,7 +36673,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -36562,7 +36719,7 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -36606,7 +36763,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."js-yaml-3.8.2" // { + (sources."js-yaml-3.8.3" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -36634,14 +36791,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -36673,7 +36830,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -36719,11 +36876,11 @@ in sources."sigmund-1.0.1" ]; }) - (sources."bunyan-1.8.9" // { + (sources."bunyan-1.8.10" // { dependencies = [ (sources."dtrace-provider-0.8.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) (sources."mv-2.1.1" // { @@ -36741,7 +36898,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -36818,13 +36975,13 @@ in }) sources."entities-1.1.1" sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -36867,12 +37024,12 @@ in }) (sources."fs-ext-0.6.0" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) (sources."crypt3-0.2.0" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) ]; @@ -36916,7 +37073,7 @@ in sources."graceful-fs-4.1.11" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -36924,14 +37081,14 @@ in }) ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -37018,7 +37175,7 @@ in }) (sources."dtrace-provider-0.6.0" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) ]; @@ -37027,7 +37184,7 @@ in dependencies = [ (sources."dtrace-provider-0.6.0" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" ]; }) (sources."mv-2.1.1" // { @@ -37050,7 +37207,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -37096,14 +37253,14 @@ in (sources."sshpk-agent-1.2.1" // { dependencies = [ sources."assert-plus-0.1.5" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -37198,7 +37355,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -37315,14 +37472,14 @@ in sources."prr-0.0.0" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -37351,7 +37508,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -37487,7 +37644,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -37554,7 +37711,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -37642,10 +37799,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.20"; + version = "2.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; - sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.22.tgz"; + sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0"; }; dependencies = [ sources."source-map-0.5.6" @@ -37705,10 +37862,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.11"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.11.tgz"; - sha1 = "a6391af1d6d132c2f995dbf9740b17b315b2f90f"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.14.tgz"; + sha1 = "e65f05f541bc8b829f9720f28e74c4a12c7b6dd2"; }; dependencies = [ sources."async-2.1.5" @@ -37743,7 +37900,7 @@ in sources."unpipe-1.0.0" ]; }) - (sources."type-is-1.6.14" // { + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -37797,7 +37954,7 @@ in sources."whatwg-fetch-2.0.3" ]; }) - (sources."express-4.14.1" // { + (sources."express-4.15.2" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ @@ -37814,22 +37971,26 @@ in sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - (sources."debug-2.2.0" // { + (sources."debug-2.6.1" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."depd-1.1.0" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - (sources."finalhandler-0.5.1" // { + sources."etag-1.8.0" + (sources."finalhandler-1.0.1" // { dependencies = [ - sources."statuses-1.3.1" + (sources."debug-2.6.3" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) sources."unpipe-1.0.0" ]; }) - sources."fresh-0.3.0" + sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" (sources."on-finished-2.3.0" // { @@ -37845,23 +38006,23 @@ in sources."ipaddr.js-1.3.0" ]; }) - sources."qs-6.2.0" + sources."qs-6.4.0" sources."range-parser-1.2.0" - (sources."send-0.14.2" // { + (sources."send-0.15.1" // { dependencies = [ sources."destroy-1.0.4" - (sources."http-errors-1.5.1" // { + (sources."http-errors-1.6.1" // { dependencies = [ sources."inherits-2.0.3" - sources."setprototypeof-1.0.2" ]; }) sources."mime-1.3.4" sources."ms-0.7.2" - sources."statuses-1.3.1" ]; }) - (sources."type-is-1.6.14" // { + sources."setprototypeof-1.0.3" + sources."statuses-1.3.1" + (sources."type-is-1.6.15" // { dependencies = [ sources."media-typer-0.3.0" (sources."mime-types-2.1.15" // { @@ -37875,14 +38036,14 @@ in sources."vary-1.1.1" ]; }) - (sources."express-session-1.14.2" // { + (sources."express-session-1.15.2" // { dependencies = [ sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."crc-3.4.1" - (sources."debug-2.2.0" // { + sources."crc-3.4.4" + (sources."debug-2.6.3" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) sources."depd-1.1.0" @@ -38021,7 +38182,7 @@ in ]; }) sources."hasher-1.2.0" - sources."ignore-3.2.6" + sources."ignore-3.2.7" (sources."keen.io-0.1.3" // { dependencies = [ sources."underscore-1.5.2" @@ -38034,13 +38195,13 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.17.1" + sources."moment-2.18.1" (sources."node-cache-4.1.1" // { dependencies = [ sources."clone-2.1.1" ]; }) - (sources."npm-4.1.2" // { + (sources."npm-4.5.0" // { dependencies = [ (sources."JSONStream-1.3.1" // { dependencies = [ @@ -38048,12 +38209,15 @@ in sources."through-2.3.8" ]; }) - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" + sources."ansi-regex-2.1.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."archy-1.0.0" sources."asap-2.0.5" + sources."bluebird-3.5.0" + sources."call-limit-1.1.0" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" (sources."columnify-1.5.4" // { @@ -38085,7 +38249,7 @@ in dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -38102,7 +38266,7 @@ in sources."fs.realpath-1.0.0" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -38115,21 +38279,17 @@ in }) sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.4.2" sources."iferr-0.1.5" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - (sources."init-package-json-1.9.5" // { + (sources."init-package-json-1.9.6" // { dependencies = [ sources."promzard-0.3.0" - (sources."validate-npm-package-name-3.0.0" // { - dependencies = [ - sources."builtins-1.0.3" - ]; - }) ]; }) + sources."lazy-property-1.0.0" sources."lockfile-1.0.3" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ @@ -38141,7 +38301,7 @@ in sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" - (sources."mississippi-1.2.0" // { + (sources."mississippi-1.3.0" // { dependencies = [ (sources."concat-stream-1.6.0" // { dependencies = [ @@ -38161,6 +38321,11 @@ in sources."end-of-stream-1.4.0" sources."flush-write-stream-1.0.2" sources."from2-2.3.0" + (sources."parallel-transform-1.1.0" // { + dependencies = [ + sources."cyclist-0.2.2" + ]; + }) sources."pump-1.0.2" sources."pumpify-1.3.5" (sources."stream-each-1.2.0" // { @@ -38175,11 +38340,17 @@ in }) ]; }) - (sources."node-gyp-3.5.0" // { + (sources."move-concurrently-1.0.1" // { + dependencies = [ + sources."copy-concurrently-1.0.3" + sources."run-queue-1.0.3" + ]; + }) + (sources."node-gyp-3.6.0" // { dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -38262,22 +38433,22 @@ in ]; }) sources."read-package-tree-5.1.5" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) sources."realize-package-specifier-3.0.3" - (sources."request-2.79.0" // { + (sources."request-2.81.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" (sources."combined-stream-1.0.5" // { dependencies = [ sources."delayed-stream-1.0.0" @@ -38285,43 +38456,24 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) - (sources."har-validator-2.0.6" // { + (sources."har-validator-4.2.1" // { dependencies = [ - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - ]; - }) - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.16.0" // { + (sources."ajv-4.11.6" // { dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { + sources."co-4.6.0" + (sources."json-stable-stringify-1.0.1" // { dependencies = [ - sources."is-property-1.0.2" + sources."jsonify-0.0.0" ]; }) - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" ]; }) + sources."har-schema-1.0.5" ]; }) (sources."hawk-3.1.3" // { @@ -38343,7 +38495,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -38367,14 +38519,16 @@ in ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.2" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" ]; }) sources."retry-0.10.1" @@ -38416,10 +38570,135 @@ in ]; }) sources."unpipe-1.0.0" + (sources."update-notifier-2.1.0" // { + dependencies = [ + (sources."boxen-1.0.0" // { + dependencies = [ + (sources."ansi-align-1.1.0" // { + dependencies = [ + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + ]; + }) + sources."camelcase-4.1.0" + sources."cli-boxes-1.0.0" + (sources."string-width-2.0.0" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + (sources."term-size-0.1.1" // { + dependencies = [ + (sources."execa-0.4.0" // { + dependencies = [ + (sources."cross-spawn-async-2.2.5" // { + dependencies = [ + (sources."lru-cache-4.0.2" // { + dependencies = [ + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + ]; + }) + ]; + }) + sources."is-stream-1.1.0" + sources."npm-run-path-1.0.0" + sources."object-assign-4.1.1" + sources."path-key-1.0.0" + sources."strip-eof-1.0.0" + ]; + }) + ]; + }) + (sources."widest-line-1.0.0" // { + dependencies = [ + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + ]; + }) + (sources."configstore-3.0.0" // { + dependencies = [ + (sources."dot-prop-4.1.1" // { + dependencies = [ + sources."is-obj-1.0.1" + ]; + }) + (sources."unique-string-1.0.0" // { + dependencies = [ + sources."crypto-random-string-1.0.0" + ]; + }) + ]; + }) + sources."is-npm-1.0.0" + (sources."latest-version-3.1.0" // { + dependencies = [ + (sources."package-json-4.0.0" // { + dependencies = [ + (sources."got-6.7.1" // { + dependencies = [ + (sources."create-error-class-3.0.2" // { + dependencies = [ + sources."capture-stack-trace-1.0.0" + ]; + }) + sources."duplexer3-0.1.4" + sources."get-stream-3.0.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."safe-buffer-5.0.1" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" + (sources."url-parse-lax-1.0.0" // { + dependencies = [ + sources."prepend-http-1.0.4" + ]; + }) + ]; + }) + sources."registry-auth-token-3.1.2" + sources."registry-url-3.1.0" + ]; + }) + ]; + }) + sources."lazy-req-2.0.0" + sources."semver-diff-2.1.0" + sources."xdg-basedir-3.0.0" + ]; + }) sources."uuid-3.0.1" - (sources."validate-npm-package-name-2.2.2" // { + (sources."validate-npm-package-name-3.0.0" // { dependencies = [ - sources."builtins-0.0.7" + sources."builtins-1.0.3" ]; }) (sources."which-1.2.14" // { @@ -38429,7 +38708,6 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-1.3.1" - sources."ansi-regex-2.1.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -38451,19 +38729,19 @@ in }) ]; }) - (sources."npm-registry-client-7.4.6" // { + (sources."npm-registry-client-8.1.1" // { dependencies = [ (sources."concat-stream-1.6.0" // { dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -38472,7 +38750,7 @@ in sources."graceful-fs-4.1.11" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -38490,9 +38768,19 @@ in }) ]; }) - (sources."npm-package-arg-4.2.1" // { + (sources."npm-package-arg-5.0.1" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" + (sources."osenv-0.1.4" // { + dependencies = [ + sources."os-tmpdir-1.0.2" + ]; + }) + (sources."validate-npm-package-name-3.0.0" // { + dependencies = [ + sources."builtins-1.0.3" + ]; + }) ]; }) (sources."once-1.4.0" // { @@ -38512,14 +38800,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -38551,7 +38839,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -38595,14 +38883,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -38652,7 +38940,7 @@ in sources."passport-strategy-1.0.0" ]; }) - (sources."raven-1.1.5" // { + (sources."raven-1.2.1" // { dependencies = [ sources."cookie-0.3.1" sources."json-stringify-safe-5.0.1" @@ -38661,7 +38949,7 @@ in sources."stack-trace-0.0.9" ]; }) - (sources."rc-1.1.7" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -38669,7 +38957,7 @@ in sources."strip-json-comments-2.0.1" ]; }) - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -38682,7 +38970,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -38701,26 +38989,22 @@ in ]; }) sources."semver-5.3.0" - (sources."serve-static-1.11.2" // { + (sources."serve-static-1.12.1" // { dependencies = [ sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."parseurl-1.3.1" - (sources."send-0.14.2" // { + (sources."send-0.15.1" // { dependencies = [ - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) + sources."debug-2.6.1" sources."depd-1.1.0" sources."destroy-1.0.4" - sources."etag-1.7.0" - sources."fresh-0.3.0" - (sources."http-errors-1.5.1" // { + sources."etag-1.8.0" + sources."fresh-0.5.0" + (sources."http-errors-1.6.1" // { dependencies = [ sources."inherits-2.0.3" - sources."setprototypeof-1.0.2" + sources."setprototypeof-1.0.3" ]; }) sources."mime-1.3.4" @@ -38737,9 +39021,9 @@ in ]; }) sources."signals-1.0.0" - (sources."snapsvg-0.4.0" // { + (sources."snapsvg-0.5.1" // { dependencies = [ - sources."eve-0.4.2" + sources."eve-0.5.3" ]; }) (sources."socket.io-1.7.3" // { @@ -38912,7 +39196,7 @@ in sources."stack-trace-0.0.9" ]; }) - (sources."yargs-6.6.0" // { + (sources."yargs-7.1.0" // { dependencies = [ sources."camelcase-3.0.0" (sources."cliui-3.2.0" // { @@ -38977,7 +39261,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -39030,7 +39314,7 @@ in }) sources."which-module-1.0.0" sources."y18n-3.2.1" - sources."yargs-parser-4.2.1" + sources."yargs-parser-5.0.0" ]; }) ]; @@ -39133,7 +39417,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -39185,7 +39469,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -39213,7 +39497,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -39325,15 +39609,19 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "2.3.2"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-2.3.2.tgz"; - sha1 = "7d521e6f0777a3a58985c69425263fdfe977b458"; + url = "https://registry.npmjs.org/webpack/-/webpack-2.4.1.tgz"; + sha1 = "15a91dbe34966d8a4b99c7d656efd92a2e5a6f6a"; }; dependencies = [ - sources."acorn-4.0.11" - sources."acorn-dynamic-import-2.0.2" - (sources."ajv-4.11.5" // { + sources."acorn-5.0.3" + (sources."acorn-dynamic-import-2.0.2" // { + dependencies = [ + sources."acorn-4.0.11" + ]; + }) + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -39344,7 +39632,7 @@ in ]; }) sources."ajv-keywords-1.5.1" - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -39357,12 +39645,12 @@ in }) sources."interpret-1.0.2" sources."json-loader-0.5.4" + sources."json5-0.5.1" sources."loader-runner-2.3.0" (sources."loader-utils-0.2.17" // { dependencies = [ sources."big.js-3.1.3" sources."emojis-list-2.1.0" - sources."json5-0.5.1" sources."object-assign-4.1.1" ]; }) @@ -39373,14 +39661,14 @@ in sources."prr-0.0.0" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -39443,7 +39731,7 @@ in dependencies = [ sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" ]; @@ -39473,7 +39761,7 @@ in dependencies = [ sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" ]; @@ -39533,13 +39821,14 @@ in sources."process-0.11.9" sources."punycode-1.4.1" sources."querystring-es3-0.2.1" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -39548,7 +39837,7 @@ in sources."inherits-2.0.3" ]; }) - (sources."stream-http-2.6.3" // { + (sources."stream-http-2.7.0" // { dependencies = [ sources."builtin-status-codes-3.0.0" sources."inherits-2.0.3" @@ -39588,7 +39877,7 @@ in ]; }) sources."tapable-0.2.6" - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ (sources."yargs-3.10.0" // { dependencies = [ @@ -39647,7 +39936,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" ]; }) sources."array-unique-0.2.1" @@ -39735,7 +40024,7 @@ in dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -39743,13 +40032,13 @@ in }) ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -39758,7 +40047,7 @@ in }) (sources."fsevents-1.1.1" // { dependencies = [ - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ (sources."nopt-4.0.1" // { @@ -39777,13 +40066,13 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -39817,7 +40106,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -39837,7 +40126,7 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; @@ -39866,7 +40155,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -39915,7 +40204,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -39951,7 +40240,7 @@ in dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -39966,13 +40255,13 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -40058,7 +40347,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -40143,10 +40432,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "0.21.3"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-0.21.3.tgz"; - sha1 = "8dda3a63c798b383cfa577452c2b3cb3e4aa87e0"; + url = "https://registry.npmjs.org/yarn/-/yarn-0.22.0.tgz"; + sha1 = "fd8511dc29225b925be967dc185772cc59de5888"; }; dependencies = [ (sources."babel-runtime-6.23.0" // { @@ -40156,7 +40445,7 @@ in ]; }) sources."bytes-2.5.0" - sources."camelcase-3.0.0" + sources."camelcase-4.1.0" (sources."chalk-1.1.3" // { dependencies = [ sources."ansi-styles-2.2.1" @@ -40190,11 +40479,6 @@ in sources."ms-0.7.2" ]; }) - (sources."defaults-1.0.3" // { - dependencies = [ - sources."clone-1.0.2" - ]; - }) sources."detect-indent-5.0.0" sources."ini-1.3.4" (sources."inquirer-3.0.6" // { @@ -40282,7 +40566,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -40335,14 +40619,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -40413,14 +40697,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -40452,7 +40736,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -40537,20 +40821,21 @@ in }) ]; }) - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) sources."xtend-4.0.1" ]; }) + sources."v8-compile-cache-1.1.0" (sources."validate-npm-package-license-3.0.1" // { dependencies = [ (sources."spdx-correct-1.0.2" // { @@ -40721,14 +41006,14 @@ in ]; }) sources."read-all-stream-3.1.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -40870,14 +41155,14 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { + (sources."form-data-2.1.4" // { dependencies = [ sources."asynckit-0.4.0" ]; }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -40909,7 +41194,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -40971,7 +41256,7 @@ in sources."minimist-1.2.0" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -41014,7 +41299,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -41033,9 +41318,9 @@ in }) (sources."package-json-2.4.0" // { dependencies = [ - (sources."registry-auth-token-3.1.0" // { + (sources."registry-auth-token-3.1.2" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -41047,7 +41332,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -41115,7 +41400,7 @@ in }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -41223,13 +41508,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -41288,14 +41573,14 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -41438,7 +41723,7 @@ in }) (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -41477,7 +41762,7 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ - (sources."brace-expansion-1.1.6" // { + (sources."brace-expansion-1.1.7" // { dependencies = [ sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -41526,13 +41811,13 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -41584,14 +41869,14 @@ in dependencies = [ (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) @@ -41623,14 +41908,14 @@ in dependencies = [ (sources."first-chunk-stream-2.0.0" // { dependencies = [ - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; }) diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 08070fe0e5f1..d61af12b7132 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -625,13 +625,13 @@ let sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970"; }; }; - "azure-arm-trafficmanager-0.10.5" = { + "azure-arm-trafficmanager-0.12.0" = { name = "azure-arm-trafficmanager"; packageName = "azure-arm-trafficmanager"; - version = "0.10.5"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.5.tgz"; - sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01"; + url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.12.0.tgz"; + sha1 = "609e585c0253960a91deaf773dae1ce184ce414b"; }; }; "azure-arm-dns-0.11.1" = { @@ -697,13 +697,13 @@ let sha1 = "379e6c2ed4155de86caff63243923c7330d34802"; }; }; - "azure-asm-compute-0.17.0" = { + "azure-asm-compute-0.18.0" = { name = "azure-asm-compute"; packageName = "azure-asm-compute"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.17.0.tgz"; - sha1 = "15967b535c06a5d06330b3d5adbf5b4b85e9df90"; + url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.18.0.tgz"; + sha1 = "109c31e17c697f4a00a01533fb230bf3ae448685"; }; }; "azure-asm-hdinsight-0.10.2" = { @@ -814,13 +814,13 @@ let sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; }; }; - "azure-storage-2.0.0" = { + "azure-storage-2.1.0" = { name = "azure-storage"; packageName = "azure-storage"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.0.0.tgz"; - sha1 = "581ed1245ee105e818806efd5cc5cc4c14eab7c0"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz"; + sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01"; }; }; "azure-arm-batch-0.3.0" = { @@ -1741,13 +1741,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "brace-expansion-1.1.6" = { + "brace-expansion-1.1.7" = { name = "brace-expansion"; packageName = "brace-expansion"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; - sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"; + sha1 = "3effc3c50e000531fb720eaff80f0ae8ef23cf59"; }; }; "balanced-match-0.4.2" = { @@ -1993,13 +1993,13 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "async-2.2.0" = { + "async-2.3.0" = { name = "async"; packageName = "async"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.2.0.tgz"; - sha1 = "c324eba010a237e4fbd55a12dee86367d5c0ef32"; + url = "https://registry.npmjs.org/async/-/async-2.3.0.tgz"; + sha1 = "1013d1051047dd320fe24e494d5c66ecaf6147d9"; }; }; "lodash-4.17.4" = { @@ -2218,13 +2218,13 @@ let sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; - "sshpk-1.11.0" = { + "sshpk-1.13.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.11.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz"; - sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz"; + sha1 = "ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"; }; }; "assert-plus-1.0.0" = { @@ -2434,13 +2434,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "readable-stream-2.2.6" = { + "readable-stream-2.2.9" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.6"; + version = "2.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; - sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz"; + sha1 = "cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"; }; }; "buffer-shims-1.0.0" = { @@ -2452,6 +2452,15 @@ let sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; }; }; + "string_decoder-1.0.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz"; + sha1 = "f06f41157b664d86069f84bdbdc9b0d8ab281667"; + }; + }; "http-basic-2.5.1" = { name = "http-basic"; packageName = "http-basic"; @@ -2938,13 +2947,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.4.1" = { + "hosted-git-info-2.4.2" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz"; - sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"; + sha1 = "0076b9f46a270506ddbaaea56496897460612a67"; }; }; "is-builtin-module-1.0.0" = { @@ -3298,13 +3307,13 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-5.0.5" = { + "buffer-5.0.6" = { name = "buffer"; packageName = "buffer"; - version = "5.0.5"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz"; - sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.6.tgz"; + sha1 = "2ea669f7eec0b6eda05b08f8b5ff661b28573588"; }; }; "cached-path-relative-1.0.1" = { @@ -3415,13 +3424,13 @@ let sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; }; }; - "https-browserify-0.0.1" = { + "https-browserify-1.0.0" = { name = "https-browserify"; packageName = "https-browserify"; - version = "0.0.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; - sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; }; "insert-module-globals-7.0.1" = { @@ -3532,13 +3541,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.6.3" = { + "stream-http-2.7.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.6.3"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz"; - sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.0.tgz"; + sha1 = "cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"; }; }; "subarg-1.0.0" = { @@ -3919,13 +3928,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "hmac-drbg-1.0.0" = { + "hmac-drbg-1.0.1" = { name = "hmac-drbg"; packageName = "hmac-drbg"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz"; - sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5"; + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; }; }; "minimalistic-crypto-utils-1.0.1" = { @@ -4612,13 +4621,13 @@ let sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; - "parse-torrent-5.8.2" = { + "parse-torrent-5.8.3" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.2.tgz"; - sha1 = "09f02ca43ec2d885d1460aacb0fb50c79b3c49f9"; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz"; + sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c"; }; }; "pump-0.3.5" = { @@ -4810,31 +4819,31 @@ let sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; - "magnet-uri-5.1.5" = { + "magnet-uri-5.1.6" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "5.1.5"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.5.tgz"; - sha1 = "be6abbf2648796c6d6e36e66416f7e0feecf2df8"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.6.tgz"; + sha1 = "60e8fb5ea90488c8491701eb306970f3126480b3"; }; }; - "parse-torrent-file-4.0.1" = { + "parse-torrent-file-4.0.2" = { name = "parse-torrent-file"; packageName = "parse-torrent-file"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.1.tgz"; - sha1 = "4580c5ebb3f6e607baa02ef0ace51f627859e699"; + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.2.tgz"; + sha1 = "981a22143832abbcd99052d889d31a39ae3f9bfe"; }; }; - "simple-get-2.4.0" = { + "simple-get-2.5.1" = { name = "simple-get"; packageName = "simple-get"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.4.0.tgz"; - sha1 = "31ae7478ea0042b107c743a5af657333d778f7c2"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.5.1.tgz"; + sha1 = "eb418fb2c9e431631b4cd6c478af548da613ccd2"; }; }; "thirty-two-1.0.2" = { @@ -4963,13 +4972,13 @@ let sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; }; }; - "fs-chunk-store-1.6.4" = { + "fs-chunk-store-1.6.5" = { name = "fs-chunk-store"; packageName = "fs-chunk-store"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.4.tgz"; - sha1 = "5aa0025d58533118552e815f5986f39f93b06e69"; + url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.5.tgz"; + sha1 = "fc42c2ff4c7f1688ab5fd41cf17c0f9ece4c6156"; }; }; "hat-0.0.3" = { @@ -5035,22 +5044,22 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-piece-1.1.0" = { + "torrent-piece-1.1.1" = { name = "torrent-piece"; packageName = "torrent-piece"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.0.tgz"; - sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854"; + url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.1.tgz"; + sha1 = "50346e42a43b35daf2a86f414afb153629a854be"; }; }; - "random-access-file-1.5.0" = { + "random-access-file-1.6.1" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.5.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz"; - sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.6.1.tgz"; + sha1 = "33358436f43076d34a058db47177a691319f0e99"; }; }; "run-parallel-1.1.6" = { @@ -5071,6 +5080,15 @@ let sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; + "buffer-alloc-unsafe-1.0.0" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; + sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; + }; + }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -5368,13 +5386,13 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; - "ws-2.2.2" = { + "ws-2.2.3" = { name = "ws"; packageName = "ws"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-2.2.2.tgz"; - sha1 = "aa26daf39c52b20ed716e3447f8641494a726b01"; + url = "https://registry.npmjs.org/ws/-/ws-2.2.3.tgz"; + sha1 = "f36c9719a56dff813f455af912a2078145bbd940"; }; }; "ultron-1.1.0" = { @@ -5863,13 +5881,13 @@ let sha1 = "364200d5f13646ca8bcd44490271335614792300"; }; }; - "big-integer-1.6.17" = { + "big-integer-1.6.19" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.17"; + version = "1.6.19"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.17.tgz"; - sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.19.tgz"; + sha1 = "4a5e915e3188c8708f254b356196f28542acc1e0"; }; }; "sax-1.1.4" = { @@ -5962,13 +5980,13 @@ let sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; }; }; - "init-package-json-1.9.5" = { + "init-package-json-1.9.6" = { name = "init-package-json"; packageName = "init-package-json"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.5.tgz"; - sha1 = "7d4d64a264dc76c1f1f557cbbe824978bf10cd09"; + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.6.tgz"; + sha1 = "789fc2b74466a4952b9ea77c0575bc78ebd60a61"; }; }; "nopt-3.0.6" = { @@ -6061,13 +6079,13 @@ let sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; }; }; - "xcode-0.9.1" = { + "xcode-0.9.3" = { name = "xcode"; packageName = "xcode"; - version = "0.9.1"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/xcode/-/xcode-0.9.1.tgz"; - sha1 = "5b4e71b71b03573ff0cdb48439103e8107da0f95"; + url = "https://registry.npmjs.org/xcode/-/xcode-0.9.3.tgz"; + sha1 = "910a89c16aee6cc0b42ca805a6d0b4cf87211cf3"; }; }; "browserify-transform-tools-1.5.3" = { @@ -6196,6 +6214,15 @@ let sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; + "https-browserify-0.0.1" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; + sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + }; + }; "compression-1.6.2" = { name = "compression"; packageName = "compression"; @@ -6484,13 +6511,13 @@ let sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; }; }; - "type-is-1.6.14" = { + "type-is-1.6.15" = { name = "type-is"; packageName = "type-is"; - version = "1.6.14"; + version = "1.6.15"; src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"; - sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2"; + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz"; + sha1 = "cab10fb4909e441c82842eafe1ad646c81804410"; }; }; "utils-merge-1.0.0" = { @@ -6574,13 +6601,13 @@ let sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; }; }; - "npm-package-arg-4.2.1" = { + "npm-package-arg-5.0.1" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "4.2.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz"; - sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.0.1.tgz"; + sha1 = "09a816e3f45a549e3ddaf33e9bae5e7b31077872"; }; }; "promzard-0.3.0" = { @@ -7150,6 +7177,15 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; + "npm-package-arg-4.2.1" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz"; + sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec"; + }; + }; "request-2.81.0" = { name = "request"; packageName = "request"; @@ -7168,13 +7204,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "form-data-2.1.2" = { + "form-data-2.1.4" = { name = "form-data"; packageName = "form-data"; - version = "2.1.2"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; - sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; + sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; }; }; "har-validator-4.2.1" = { @@ -7213,13 +7249,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "ajv-4.11.5" = { + "ajv-4.11.6" = { name = "ajv"; packageName = "ajv"; - version = "4.11.5"; + version = "4.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; - sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.6.tgz"; + sha1 = "947e93049790942b2a2d60a8289b28924d39f987"; }; }; "har-schema-1.0.5" = { @@ -7501,49 +7537,40 @@ let sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; }; }; - "pegjs-0.9.0" = { + "pegjs-0.10.0" = { name = "pegjs"; packageName = "pegjs"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/pegjs/-/pegjs-0.9.0.tgz"; - sha1 = "f6aefa2e3ce56169208e52179dfe41f89141a369"; + url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; + sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; }; }; - "simple-plist-0.1.4" = { + "simple-plist-0.2.1" = { name = "simple-plist"; packageName = "simple-plist"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.1.4.tgz"; - sha1 = "10eb51b47e33c556eb8ec46d5ee64d64e717db5d"; - }; - }; - "bplist-parser-0.0.6" = { - name = "bplist-parser"; - packageName = "bplist-parser"; - version = "0.0.6"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"; - sha1 = "38da3471817df9d44ab3892e27707bbbd75a11b9"; + url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz"; + sha1 = "71766db352326928cf3a807242ba762322636723"; }; }; - "bplist-creator-0.0.4" = { + "bplist-creator-0.0.7" = { name = "bplist-creator"; packageName = "bplist-creator"; - version = "0.0.4"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.4.tgz"; - sha1 = "4ac0496782e127a85c1d2026a4f5eb22a7aff991"; + url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz"; + sha1 = "37df1536092824b87c42f957b01344117372ae45"; }; }; - "stream-buffers-0.2.6" = { + "stream-buffers-2.2.0" = { name = "stream-buffers"; packageName = "stream-buffers"; - version = "0.2.6"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-0.2.6.tgz"; - sha1 = "181c08d5bb3690045f69401b9ae6a7a0cf3313fc"; + url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"; + sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; }; }; "async-1.5.2" = { @@ -7834,13 +7861,13 @@ let sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; }; }; - "rc-1.2.0" = { + "rc-1.2.1" = { name = "rc"; packageName = "rc"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.0.tgz"; - sha1 = "c7de973b7b46297c041366b2fd3d2363b1697c66"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz"; + sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"; }; }; "strip-json-comments-2.0.1" = { @@ -8267,13 +8294,13 @@ let sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; }; - "nan-2.5.1" = { + "nan-2.6.2" = { name = "nan"; packageName = "nan"; - version = "2.5.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; - sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; + url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"; + sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; }; }; "jsonparse-0.0.6" = { @@ -9233,13 +9260,13 @@ let sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; }; }; - "espree-3.4.0" = { + "espree-3.4.1" = { name = "espree"; packageName = "espree"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.4.0.tgz"; - sha1 = "41656fa5628e042878025ef467e78f125cb86e1d"; + url = "https://registry.npmjs.org/espree/-/espree-3.4.1.tgz"; + sha1 = "28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"; }; }; "esquery-1.0.0" = { @@ -9287,13 +9314,13 @@ let sha1 = "0c0ca696d9b9bb694d2e5470bd37777caad50286"; }; }; - "ignore-3.2.6" = { + "ignore-3.2.7" = { name = "ignore"; packageName = "ignore"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.6.tgz"; - sha1 = "26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz"; + sha1 = "4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"; }; }; "inquirer-0.12.0" = { @@ -9314,13 +9341,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.8.2" = { + "js-yaml-3.8.3" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz"; - sha1 = "02d3e2c0f6beab20248d412c352203827d786721"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz"; + sha1 = "33a05ec481c850c8875929166fe1beb61c728766"; }; }; "levn-0.3.0" = { @@ -9485,13 +9512,13 @@ let sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; }; }; - "acorn-4.0.4" = { + "acorn-5.0.3" = { name = "acorn"; packageName = "acorn"; - version = "4.0.4"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz"; - sha1 = "17a8d6a7a6c4ef538b814ec9abac2779293bf30a"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz"; + sha1 = "c460df08491463f028ccb82eab3730bf01087b3d"; }; }; "acorn-jsx-3.0.1" = { @@ -10088,13 +10115,13 @@ let sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"; }; }; - "arr-flatten-1.0.1" = { + "arr-flatten-1.0.2" = { name = "arr-flatten"; packageName = "arr-flatten"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"; - sha1 = "e5ffe54d45e19f32f216e91eb99c8ce892bb604b"; + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.2.tgz"; + sha1 = "1ec1e63439c54f67d6f72bb4299c3d4f73b2d996"; }; }; "expand-range-1.8.2" = { @@ -10439,13 +10466,13 @@ let sha1 = "21ffdc429be2b50cb361df990a40a7731288e935"; }; }; - "simple-git-1.69.0" = { + "simple-git-1.70.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.69.0"; + version = "1.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.69.0.tgz"; - sha1 = "e86ead16abfc273dca9ae2bd51e5eb3c0122c177"; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.70.0.tgz"; + sha1 = "62cfd90bb2628a13ff4fe704c840fcef56244a71"; }; }; "tabtab-git+https://github.com/mixu/node-tabtab.git" = { @@ -10485,13 +10512,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.12.4" = { + "coffee-script-1.12.5" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.4"; + version = "1.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; - sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz"; + sha1 = "809f4585419112bbfe46a073ad7543af18c27346"; }; }; "jade-1.11.0" = { @@ -10575,13 +10602,13 @@ let sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; }; }; - "uglify-js-2.8.20" = { + "uglify-js-2.8.22" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.20"; + version = "2.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; - sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.22.tgz"; + sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0"; }; }; "void-elements-2.0.1" = { @@ -13824,13 +13851,13 @@ let sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.21" = { + "node-red-node-email-0.1.22" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.21"; + version = "0.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.21.tgz"; - sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.22.tgz"; + sha1 = "99c610fdba3f498ddab71da9273d6003e4e0280e"; }; }; "node-red-node-twitter-0.1.10" = { @@ -13842,13 +13869,13 @@ let sha1 = "5883f6a8acebc99829c52400420d5ed52f44d221"; }; }; - "node-red-node-rbe-0.1.6" = { + "node-red-node-rbe-0.1.8" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.6"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.6.tgz"; - sha1 = "36c22f39c44dd13b5ca9b4e14f05dca001ac5539"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.8.tgz"; + sha1 = "96108a5720842387ea5ddd046d7e483c7ab2a5dc"; }; }; "bcrypt-1.0.2" = { @@ -14031,13 +14058,13 @@ let sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; }; }; - "moment-timezone-0.5.11" = { + "moment-timezone-0.5.13" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.11"; + version = "0.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.11.tgz"; - sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz"; + sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90"; }; }; "content-disposition-0.5.1" = { @@ -14139,22 +14166,22 @@ let sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef"; }; }; - "help-me-1.0.1" = { + "help-me-1.1.0" = { name = "help-me"; packageName = "help-me"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-1.0.1.tgz"; - sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a"; + url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz"; + sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "mqtt-packet-5.2.2" = { + "mqtt-packet-5.3.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "5.2.2"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.2.tgz"; - sha1 = "190d4358f415c6f964211030c20ca0bf45d5698a"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.3.0.tgz"; + sha1 = "078ed59ae4c06febf3b3eaca90b50e97e269f206"; }; }; "reinterval-1.1.0" = { @@ -14193,6 +14220,42 @@ let sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; }; }; + "glob-stream-6.1.0" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"; + sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; + }; + }; + "is-negated-glob-1.0.0" = { + name = "is-negated-glob"; + packageName = "is-negated-glob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; + sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; + }; + }; + "ordered-read-streams-1.0.0" = { + name = "ordered-read-streams"; + packageName = "ordered-read-streams"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.0.tgz"; + sha1 = "d674a86ffcedf83d0ae06afa2918855e96d4033a"; + }; + }; + "to-absolute-glob-2.0.1" = { + name = "to-absolute-glob"; + packageName = "to-absolute-glob"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.1.tgz"; + sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b"; + }; + }; "feedparser-1.1.3" = { name = "feedparser"; packageName = "feedparser"; @@ -14940,13 +15003,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "mailcomposer-4.0.1" = { + "mailcomposer-4.0.2" = { name = "mailcomposer"; packageName = "mailcomposer"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz"; - sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.2.tgz"; + sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101"; }; }; "simplesmtp-0.3.35" = { @@ -15075,15 +15138,6 @@ let sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; }; }; - "hosted-git-info-2.2.0" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; - sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; - }; - }; "lazy-property-1.0.0" = { name = "lazy-property"; packageName = "lazy-property"; @@ -15156,15 +15210,6 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; - "node-gyp-3.5.0" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; - sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; - }; - }; "npm-install-checks-3.0.0" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -15174,13 +15219,13 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; - "npm-registry-client-7.4.6" = { + "npm-registry-client-8.1.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.4.6"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.6.tgz"; - sha1 = "0aa7c55f18631b941b7b80a7aa501bfcb8b19717"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz"; + sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf"; }; }; "opener-1.4.3" = { @@ -15525,13 +15570,13 @@ let sha1 = "f3c9dc8738f5b59304d54d2cfb3f91d08fdd7998"; }; }; - "registry-auth-token-3.1.0" = { + "registry-auth-token-3.1.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz"; - sha1 = "997c08256e0c7999837b90e944db39d8a790276b"; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.2.tgz"; + sha1 = "1b9e51a185c930da34a9894b12a52ea998f1adaf"; }; }; "argparse-0.1.15" = { @@ -15786,13 +15831,13 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.26.1" = { + "snyk-1.28.1" = { name = "snyk"; packageName = "snyk"; - version = "1.26.1"; + version = "1.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.26.1.tgz"; - sha1 = "12b28e9b43c6453ecb6d4be7670b0c0df7db38a5"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.28.1.tgz"; + sha1 = "ae0faed0fcee7d5dbc0fa8a7a8c9ebacb03b6151"; }; }; "spawn-please-0.2.0" = { @@ -15903,22 +15948,22 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "snyk-module-1.7.0" = { + "snyk-module-1.8.1" = { name = "snyk-module"; packageName = "snyk-module"; - version = "1.7.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.7.0.tgz"; - sha1 = "07c6ca8556d281de6f9e2368c04ecb6dd1f2631a"; + url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz"; + sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; }; }; - "snyk-policy-1.7.0" = { + "snyk-policy-1.7.1" = { name = "snyk-policy"; packageName = "snyk-policy"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.0.tgz"; - sha1 = "2151c751ab1edc040fc6b94a872aa989db492324"; + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.1.tgz"; + sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22"; }; }; "snyk-recursive-readdir-2.0.0" = { @@ -16318,15 +16363,6 @@ let sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; }; }; - "gelf-stream-0.2.4" = { - name = "gelf-stream"; - packageName = "gelf-stream"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz"; - sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013"; - }; - }; "mediawiki-title-0.5.6" = { name = "mediawiki-title"; packageName = "mediawiki-title"; @@ -16383,6 +16419,15 @@ let sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; }; }; + "yargs-5.0.0" = { + name = "yargs"; + packageName = "yargs"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; + sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + }; + }; "is-arguments-1.0.2" = { name = "is-arguments"; packageName = "is-arguments"; @@ -16437,22 +16482,13 @@ let sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; }; }; - "gelfling-0.2.0" = { - name = "gelfling"; - packageName = "gelfling"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz"; - sha1 = "23a13c366883adae32ecfd252a566be302b88dc3"; - }; - }; - "bunyan-1.8.9" = { + "bunyan-1.8.10" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.9"; + version = "1.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz"; - sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz"; + sha1 = "201fedd26c7080b632f416072f53a90b9a52981c"; }; }; "bunyan-syslog-udp-0.1.0" = { @@ -16663,6 +16699,15 @@ let sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; }; }; + "yargs-parser-3.2.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; + sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; + }; + }; "airplayer-2.0.0" = { name = "airplayer"; packageName = "airplayer"; @@ -16753,15 +16798,6 @@ let sha1 = "d5bd826506425a3b3eacadf1e0e2c1ac3e289728"; }; }; - "stream-buffers-2.2.0" = { - name = "stream-buffers"; - packageName = "stream-buffers"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"; - sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; - }; - }; "consume-http-header-1.0.0" = { name = "consume-http-header"; packageName = "consume-http-header"; @@ -17545,6 +17581,96 @@ let sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; }; }; + "ast-types-0.9.8" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.9.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.8.tgz"; + sha1 = "6cb6a40beba31f49f20928e28439fc14a3dab078"; + }; + }; + "babylon-7.0.0-beta.8" = { + name = "babylon"; + packageName = "babylon"; + version = "7.0.0-beta.8"; + src = fetchurl { + url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.8.tgz"; + sha1 = "2bdc5ae366041442c27e068cce6f0d7c06ea9949"; + }; + }; + "flow-parser-0.43.0" = { + name = "flow-parser"; + packageName = "flow-parser"; + version = "0.43.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.43.0.tgz"; + sha1 = "e2b8eb1ac83dd53f7b6b04a7c35b6a52c33479b7"; + }; + }; + "jest-validate-19.0.0" = { + name = "jest-validate"; + packageName = "jest-validate"; + version = "19.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-19.0.0.tgz"; + sha1 = "8c6318a20ecfeaba0ba5378bfbb8277abded4173"; + }; + }; + "jest-matcher-utils-19.0.0" = { + name = "jest-matcher-utils"; + packageName = "jest-matcher-utils"; + version = "19.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz"; + sha1 = "5ecd9b63565d2b001f61fbf7ec4c7f537964564d"; + }; + }; + "leven-2.1.0" = { + name = "leven"; + packageName = "leven"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; + sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; + }; + }; + "pretty-format-19.0.0" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "19.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-19.0.0.tgz"; + sha1 = "56530d32acb98a3fa4851c4e2b9d37b420684c84"; + }; + }; + "ansi-styles-3.0.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.0.0.tgz"; + sha1 = "5404e93a544c4fec7f048262977bebfe3155e0c1"; + }; + }; + "color-convert-1.9.0" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; + sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; + }; + }; + "color-name-1.1.2" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; + sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; + }; + }; "commoner-0.10.8" = { name = "commoner"; packageName = "commoner"; @@ -18689,22 +18815,13 @@ let sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580"; }; }; - "express-4.14.1" = { - name = "express"; - packageName = "express"; - version = "4.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz"; - sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33"; - }; - }; - "express-session-1.14.2" = { + "express-session-1.15.2" = { name = "express-session"; packageName = "express-session"; - version = "1.14.2"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz"; - sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; + sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; }; }; "forever-monitor-1.1.0" = { @@ -18761,13 +18878,13 @@ let sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44"; }; }; - "npm-4.1.2" = { + "npm-4.5.0" = { name = "npm"; packageName = "npm"; - version = "4.1.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz"; - sha1 = "daaa77d631947135b36528c304573243f5cd2e07"; + url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz"; + sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475"; }; }; "octicons-3.5.0" = { @@ -18788,13 +18905,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-1.1.5" = { + "raven-1.2.1" = { name = "raven"; packageName = "raven"; - version = "1.1.5"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-1.1.5.tgz"; - sha1 = "6af541406c37da1d678781d0af411c27c6f05fbf"; + url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz"; + sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd"; }; }; "signals-1.0.0" = { @@ -18806,13 +18923,13 @@ let sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; }; }; - "snapsvg-0.4.0" = { + "snapsvg-0.5.1" = { name = "snapsvg"; packageName = "snapsvg"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.4.0.tgz"; - sha1 = "e0767014167825957de7e125c29b0fa89796ea03"; + url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.5.1.tgz"; + sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; }; }; "winston-2.3.1" = { @@ -18824,13 +18941,13 @@ let sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "color-convert-1.9.0" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.0"; + "yargs-7.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; - sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; + url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz"; + sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8"; }; }; "color-string-1.5.2" = { @@ -18842,15 +18959,6 @@ let sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9"; }; }; - "color-name-1.1.2" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; - sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; - }; - }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -18887,13 +18995,13 @@ let sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; }; }; - "crc-3.4.1" = { + "crc-3.4.4" = { name = "crc"; packageName = "crc"; - version = "3.4.1"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz"; - sha1 = "65d5830b1a2569557cfb324c0e679998521473ee"; + url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; + sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; }; }; "broadway-0.2.10" = { @@ -19022,15 +19130,6 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; - "mississippi-1.2.0" = { - name = "mississippi"; - packageName = "mississippi"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; - sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; - }; - }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -19049,13 +19148,22 @@ let sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; }; }; - "eve-0.4.2" = { + "eve-0.5.3" = { name = "eve"; packageName = "eve"; - version = "0.4.2"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eve/-/eve-0.5.3.tgz"; + sha1 = "6c2f6588f7d0b392044d245ba5af9d7cfe237f42"; + }; + }; + "yargs-parser-5.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eve/-/eve-0.4.2.tgz"; - sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz"; + sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; }; }; "kew-0.1.7" = { @@ -19121,6 +19229,15 @@ let sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de"; }; }; + "json5-0.5.1" = { + name = "json5"; + packageName = "json5"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + }; "loader-runner-2.3.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -19193,15 +19310,6 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; - "json5-0.5.1" = { - name = "json5"; - packageName = "json5"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; - }; - }; "os-browserify-0.2.1" = { name = "os-browserify"; packageName = "os-browserify"; @@ -19301,15 +19409,6 @@ let sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; }; }; - "leven-2.1.0" = { - name = "leven"; - packageName = "leven"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; - sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; - }; - }; "node-emoji-1.5.1" = { name = "node-emoji"; packageName = "node-emoji"; @@ -19355,6 +19454,15 @@ let sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e"; }; }; + "v8-compile-cache-1.1.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.0.tgz"; + sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9"; + }; + }; "regenerator-runtime-0.10.3" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -19856,10 +19964,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.8"; + version = "1.9.11"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.8.tgz"; - sha1 = "17294e9828a1f11ef241d59f5eb040e6a5b4ed13"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.11.tgz"; + sha1 = "6e185c5c3211b5a86d272caec63b8daf80e5b186"; }; dependencies = [ sources."colors-0.6.0-1" @@ -19937,10 +20045,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.11"; + version = "0.10.12"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.11.tgz"; - sha1 = "aa1a379386b5c60f90f86134b4047acb1302d482"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.12.tgz"; + sha1 = "4446af5df8dda6c755a0bf7dfec2468a9f63f26d"; }; dependencies = [ sources."adal-node-0.1.21" @@ -19964,7 +20072,7 @@ in sources."azure-arm-servermanagement-0.1.2" sources."azure-arm-network-0.18.0" sources."azure-arm-powerbiembedded-0.1.0" - sources."azure-arm-trafficmanager-0.10.5" + sources."azure-arm-trafficmanager-0.12.0" sources."azure-arm-dns-0.11.1" sources."azure-arm-website-0.11.4" sources."azure-arm-rediscache-0.2.3" @@ -19972,7 +20080,7 @@ in sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" sources."azure-keyvault-0.11.0" - sources."azure-asm-compute-0.17.0" + sources."azure-asm-compute-0.18.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-trafficmanager-0.10.3" sources."azure-asm-mgmt-0.10.1" @@ -19993,7 +20101,7 @@ in sources."moment-2.14.1" ]; }) - (sources."azure-storage-2.0.0" // { + (sources."azure-storage-2.1.0" // { dependencies = [ sources."readable-stream-2.0.6" sources."validator-3.22.2" @@ -20145,7 +20253,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" @@ -20162,7 +20270,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.2.0" + sources."async-2.3.0" ]; }) (sources."har-validator-2.0.6" // { @@ -20208,7 +20316,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -20241,7 +20349,8 @@ in sources."amdefine-1.0.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" + sources."string_decoder-1.0.0" ]; }) sources."http-response-object-1.1.0" @@ -20332,7 +20441,7 @@ in sources."timed-out-2.0.0" sources."end-of-stream-1.0.0" sources."inherits-2.0.3" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."stream-shift-1.0.0" sources."once-1.3.3" sources."wrappy-1.0.2" @@ -20340,7 +20449,7 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" @@ -20355,7 +20464,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -20411,7 +20520,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."minimatch-3.0.3" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."q-1.5.0" @@ -20435,10 +20544,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "14.1.0"; + version = "14.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz"; - sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.3.0.tgz"; + sha1 = "fd003a2386ac1aec127f097885a3cc6373b745c4"; }; dependencies = [ sources."JSONStream-1.3.1" @@ -20450,7 +20559,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."buffer-5.0.5" + sources."buffer-5.0.6" sources."cached-path-relative-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -20468,7 +20577,7 @@ in sources."glob-7.1.1" sources."has-1.0.1" sources."htmlescape-1.1.1" - sources."https-browserify-0.0.1" + sources."https-browserify-1.0.0" sources."inherits-2.0.3" sources."insert-module-globals-7.0.1" (sources."labeled-stream-splicer-2.0.0" // { @@ -20484,12 +20593,16 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - sources."readable-stream-2.2.6" + (sources."readable-stream-2.2.9" // { + dependencies = [ + sources."string_decoder-1.0.0" + ]; + }) sources."resolve-1.3.2" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.6.3" + sources."stream-http-2.7.0" sources."string_decoder-0.10.31" sources."subarg-1.0.0" sources."syntax-error-1.3.0" @@ -20547,7 +20660,7 @@ in sources."parse-asn1-5.1.0" sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" @@ -20559,7 +20672,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."function-bind-1.1.0" @@ -20696,7 +20809,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -20734,7 +20847,7 @@ in sources."minimist-0.0.10" ]; }) - (sources."parse-torrent-5.8.2" // { + (sources."parse-torrent-5.8.3" // { dependencies = [ sources."get-stdin-5.0.1" ]; @@ -20785,9 +20898,9 @@ in sources."mute-stream-0.0.4" sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" - sources."magnet-uri-5.1.5" - sources."parse-torrent-file-4.0.1" - sources."simple-get-2.4.0" + sources."magnet-uri-5.1.6" + sources."parse-torrent-file-4.0.2" + sources."simple-get-2.5.1" sources."thirty-two-1.0.2" sources."uniq-1.0.1" sources."bencode-0.11.0" @@ -20807,7 +20920,7 @@ in sources."ini-1.1.0" sources."bitfield-0.1.0" sources."bncode-0.5.3" - (sources."fs-chunk-store-1.6.4" // { + (sources."fs-chunk-store-1.6.5" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" @@ -20821,8 +20934,8 @@ in sources."peer-wire-swarm-0.12.1" sources."rimraf-2.6.1" sources."torrent-discovery-5.4.0" - sources."torrent-piece-1.1.0" - (sources."random-access-file-1.5.0" // { + sources."torrent-piece-1.1.1" + (sources."random-access-file-1.6.1" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" @@ -20831,6 +20944,7 @@ in }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" + sources."buffer-alloc-unsafe-1.0.0" sources."inherits-2.0.3" sources."ip-1.1.5" sources."flatten-0.0.1" @@ -20852,7 +20966,7 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" (sources."bittorrent-dht-6.4.2" // { @@ -20882,15 +20996,17 @@ in sources."run-series-1.1.4" (sources."simple-peer-6.4.4" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."readable-stream-2.2.6" - sources."ws-2.2.2" + sources."readable-stream-2.2.9" + sources."ws-2.2.3" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."string2compact-1.2.2" @@ -20904,6 +21020,7 @@ in sources."buffer-shims-1.0.0" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" + sources."safe-buffer-5.0.1" sources."ultron-1.1.0" sources."addr-to-ip-port-1.4.2" sources."options-0.0.6" @@ -20940,8 +21057,9 @@ in sources."voc-0.5.0" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."exit-on-epipe-1.0.0" @@ -20962,10 +21080,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.4"; + version = "1.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"; - sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz"; + sha1 = "809f4585419112bbfe46a073ad7543af18c27346"; }; buildInputs = globalBuildInputs; meta = { @@ -21021,14 +21139,14 @@ in sources."semver-5.3.0" sources."shelljs-0.5.3" sources."unorm-1.4.1" - sources."big-integer-1.6.17" + sources."big-integer-1.6.19" sources."sax-1.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."os-homedir-1.0.2" @@ -21062,7 +21180,7 @@ in sources."underscore-1.2.1" ]; }) - (sources."init-package-json-1.9.5" // { + (sources."init-package-json-1.9.6" // { dependencies = [ sources."glob-7.1.1" ]; @@ -21118,11 +21236,7 @@ in }) sources."tar-1.0.2" sources."valid-identifier-0.0.1" - (sources."xcode-0.9.1" // { - dependencies = [ - sources."node-uuid-1.4.7" - ]; - }) + sources."xcode-0.9.3" sources."browserify-transform-tools-1.5.3" sources."falafel-1.2.0" sources."through-2.3.8" @@ -21190,15 +21304,16 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.2.9" // { dependencies = [ sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.6.3" + sources."stream-http-2.7.0" sources."string_decoder-0.10.31" sources."subarg-1.0.0" (sources."syntax-error-1.3.0" // { @@ -21256,7 +21371,7 @@ in sources."parse-asn1-5.1.0" sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" @@ -21346,7 +21461,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."utils-merge-1.0.0" sources."unpipe-1.0.0" sources."ee-first-1.1.1" @@ -21356,7 +21471,7 @@ in sources."http-errors-1.6.1" sources."mime-1.3.4" sources."media-typer-0.3.0" - sources."npm-package-arg-4.2.1" + sources."npm-package-arg-5.0.1" sources."promzard-0.3.0" sources."read-1.0.7" (sources."read-package-json-2.0.5" // { @@ -21366,7 +21481,7 @@ in }) sources."validate-npm-package-license-3.0.1" sources."validate-npm-package-name-3.0.0" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."mute-stream-0.0.7" sources."json-parse-helpfulerror-1.0.3" sources."normalize-package-data-2.3.6" @@ -21417,6 +21532,7 @@ in sources."npm-install-checks-1.0.7" (sources."npm-registry-client-7.2.1" // { dependencies = [ + sources."npm-package-arg-4.2.1" sources."request-2.81.0" ]; }) @@ -21424,7 +21540,11 @@ in sources."npmlog-2.0.4" sources."path-is-inside-1.0.2" sources."read-installed-4.0.3" - sources."realize-package-specifier-3.0.3" + (sources."realize-package-specifier-3.0.3" // { + dependencies = [ + sources."npm-package-arg-4.2.1" + ]; + }) sources."retry-0.10.1" (sources."rimraf-2.5.4" // { dependencies = [ @@ -21455,7 +21575,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -21471,7 +21591,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."ajv-4.11.5" // { + (sources."ajv-4.11.6" // { dependencies = [ sources."json-stable-stringify-1.0.1" ]; @@ -21488,7 +21608,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -21529,7 +21649,7 @@ in ]; }) sources."node-uuid-1.4.8" - (sources."async-2.2.0" // { + (sources."async-2.3.0" // { dependencies = [ sources."lodash-4.17.4" ]; @@ -21545,14 +21665,16 @@ in sources."pinkie-2.0.4" sources."isexe-2.0.0" sources."ctype-0.5.3" - sources."pegjs-0.9.0" - (sources."simple-plist-0.1.4" // { + sources."pegjs-0.10.0" + (sources."simple-plist-0.2.1" // { dependencies = [ - sources."bplist-parser-0.0.6" + sources."plist-2.0.1" + sources."base64-js-1.1.2" + sources."xmlbuilder-8.2.2" ]; }) - sources."bplist-creator-0.0.4" - sources."stream-buffers-0.2.6" + sources."bplist-creator-0.0.7" + sources."stream-buffers-2.2.0" (sources."configstore-1.4.0" // { dependencies = [ sources."uuid-2.0.3" @@ -21610,7 +21732,7 @@ in ]; }) sources."stream-shift-1.0.0" - sources."rc-1.2.0" + sources."rc-1.2.1" sources."deep-extend-0.4.1" sources."strip-json-comments-2.0.1" sources."is-finite-1.0.2" @@ -21732,7 +21854,7 @@ in sources."destroy-1.0.3" sources."mime-1.2.11" sources."bindings-1.2.1" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."jsonparse-0.0.6" sources."es5class-2.3.1" sources."faye-websocket-0.11.1" @@ -21835,8 +21957,9 @@ in sources."minimist-1.2.0" sources."split2-2.1.1" sources."through2-2.0.3" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."pump-1.0.2" @@ -21849,8 +21972,9 @@ in (sources."tar-stream-1.5.2" // { dependencies = [ sources."bl-1.2.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) (sources."through2-0.6.5" // { @@ -21874,9 +21998,10 @@ in (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."once-1.3.3" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."lru-cache-2.7.3" @@ -21943,7 +22068,7 @@ in }; dependencies = [ sources."JSONStream-1.3.1" - sources."async-2.2.0" + sources."async-2.3.0" sources."aws4-1.6.0" sources."awscred-1.2.0" sources."ini-1.3.4" @@ -21959,7 +22084,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -21977,7 +22102,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -21992,7 +22117,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22099,7 +22224,7 @@ in sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -22137,10 +22262,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.18.0"; + version = "3.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.18.0.tgz"; - sha1 = "647e985c4ae71502d20ac62c109f66d5104c8a4b"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; + sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; }; dependencies = [ sources."babel-code-frame-6.22.0" @@ -22149,19 +22274,19 @@ in sources."debug-2.6.3" sources."doctrine-2.0.0" sources."escope-3.6.0" - sources."espree-3.4.0" + sources."espree-3.4.1" sources."esquery-1.0.0" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."glob-7.1.1" sources."globals-9.17.0" - sources."ignore-3.2.6" + sources."ignore-3.2.7" sources."imurmurhash-0.1.4" sources."inquirer-0.12.0" sources."is-my-json-valid-2.16.0" sources."is-resolvable-1.0.0" - sources."js-yaml-3.8.2" + sources."js-yaml-3.8.3" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.4" @@ -22192,12 +22317,12 @@ in sources."ansi-regex-2.1.1" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."ms-0.7.2" sources."es6-map-0.1.5" @@ -22214,7 +22339,7 @@ in sources."es6-symbol-3.1.1" sources."event-emitter-0.3.5" sources."object-assign-4.1.1" - sources."acorn-4.0.4" + sources."acorn-5.0.3" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -22242,7 +22367,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."ansi-escapes-1.4.0" @@ -22284,7 +22409,7 @@ in sources."rechoir-0.6.2" sources."resolve-1.3.2" sources."path-parse-1.0.5" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" sources."co-4.6.0" @@ -22428,7 +22553,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -22450,14 +22575,14 @@ in sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."node-pre-gyp-0.6.34" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -22466,7 +22591,7 @@ in }) sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -22508,7 +22633,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -22526,7 +22651,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -22541,7 +22666,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22578,7 +22703,7 @@ in sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" sources."ms-0.7.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" (sources."event-stream-0.5.3" // { @@ -22613,10 +22738,10 @@ in sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4"; }; dependencies = [ - sources."async-2.2.0" + sources."async-2.3.0" sources."lodash.groupby-4.6.0" sources."minilog-2.0.8" - sources."simple-git-1.69.0" + sources."simple-git-1.70.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" sources."lodash-4.17.4" sources."microee-0.0.2" @@ -22649,7 +22774,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."abbrev-1.1.0" @@ -22672,7 +22797,7 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.5" sources."jade-1.11.0" (sources."q-2.0.3" // { dependencies = [ @@ -22699,7 +22824,7 @@ in sources."source-map-0.1.43" ]; }) - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."source-map-0.5.6" ]; @@ -22747,7 +22872,7 @@ in sources."sax-1.2.2" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" - sources."nan-2.5.1" + sources."nan-2.6.2" ]; buildInputs = globalBuildInputs; meta = { @@ -22807,8 +22932,9 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."vinyl-0.5.3" @@ -22865,7 +22991,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -22938,7 +23064,7 @@ in sources."glob2base-0.0.12" sources."unique-stream-1.0.0" sources."inflight-1.0.6" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."find-index-0.1.1" @@ -23018,7 +23144,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" (sources."cli-0.6.6" // { @@ -23098,7 +23224,7 @@ in sources."source-map-0.4.4" ]; }) - (sources."js-yaml-3.8.2" // { + (sources."js-yaml-3.8.3" // { dependencies = [ sources."esprima-3.1.3" ]; @@ -23129,7 +23255,7 @@ in sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" (sources."optimist-0.6.1" // { @@ -23137,7 +23263,7 @@ in sources."wordwrap-0.0.3" ]; }) - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."source-map-0.5.6" ]; @@ -23232,7 +23358,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" ]; @@ -23277,10 +23403,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz"; - sha1 = "02d3e2c0f6beab20248d412c352203827d786721"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz"; + sha1 = "33a05ec481c850c8875929166fe1beb61c728766"; }; dependencies = [ sources."argparse-1.0.9" @@ -23298,10 +23424,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.5.0.tgz"; - sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009"; + url = "https://registry.npmjs.org/karma/-/karma-1.6.0.tgz"; + sha1 = "0e871d4527d5eac56c41d181f03c5c0a7e6dbf3e"; }; dependencies = [ sources."bluebird-3.5.0" @@ -23335,6 +23461,7 @@ in sources."readable-stream-1.0.34" sources."semver-4.3.6" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."mime-1.3.4" @@ -23362,7 +23489,7 @@ in sources."on-finished-2.3.0" sources."qs-6.4.0" sources."raw-body-2.2.0" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."ms-0.7.2" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" @@ -23394,7 +23521,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -23415,19 +23542,19 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."node-pre-gyp-0.6.34" sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -23466,7 +23593,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -23481,7 +23608,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -23496,7 +23623,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23540,7 +23667,7 @@ in sources."inflight-1.0.6" sources."eventemitter3-1.2.0" sources."requires-port-1.0.0" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."wordwrap-0.0.3" @@ -23717,7 +23844,7 @@ in sources."statuses-1.2.1" ]; }) - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."vhost-3.0.2" sources."iconv-lite-0.4.11" sources."on-finished-2.3.0" @@ -23786,14 +23913,14 @@ in sources."through2-2.0.3" sources."vinyl-1.2.0" sources."vinyl-fs-2.4.4" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."xtend-4.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."clone-1.0.2" sources."clone-stats-0.0.1" @@ -23804,6 +23931,7 @@ in sources."through2-0.6.5" sources."readable-stream-1.0.34" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."graceful-fs-4.1.11" @@ -23837,7 +23965,7 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."is-glob-3.1.0" @@ -23863,7 +23991,7 @@ in ]; }) sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -23969,7 +24097,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."lodash._baseassign-3.2.0" @@ -24057,15 +24185,15 @@ in sources."npmlog-3.1.2" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."minimist-0.0.8" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -24079,7 +24207,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -24097,7 +24225,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -24112,7 +24240,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24143,7 +24271,7 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."are-we-there-yet-1.1.2" @@ -24222,7 +24350,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."minimist-0.0.8" @@ -24232,12 +24360,12 @@ in sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."aproba-1.1.1" sources."has-unicode-2.0.1" @@ -24258,7 +24386,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -24276,7 +24404,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -24291,7 +24419,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24331,10 +24459,10 @@ in node-inspector = nodeEnv.buildNodePackage { name = "node-inspector"; packageName = "node-inspector"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.0.0.tgz"; - sha1 = "c6221619e3f0bd8f1f24e0e882a65eb793f69d37"; + url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.1.0.tgz"; + sha1 = "0f8ffffbf9a9b86540eb33c1d64e7ba546457622"; }; dependencies = [ sources."async-0.9.2" @@ -24347,7 +24475,7 @@ in }) sources."glob-5.0.15" sources."path-is-absolute-1.0.1" - sources."rc-1.2.0" + sources."rc-1.2.1" sources."semver-4.3.6" (sources."serve-favicon-2.4.2" // { dependencies = [ @@ -24395,7 +24523,7 @@ in sources."bplist-parser-0.1.1" sources."meow-3.7.0" sources."untildify-2.1.0" - sources."big-integer-1.6.17" + sources."big-integer-1.6.19" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" @@ -24409,7 +24537,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -24465,7 +24593,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."utils-merge-1.0.0" sources."vary-1.1.1" sources."mime-types-2.1.15" @@ -24484,14 +24612,14 @@ in sources."minimatch-3.0.3" sources."once-1.4.0" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" sources."truncate-1.0.5" - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."node-pre-gyp-0.6.34" // { dependencies = [ sources."rimraf-2.6.1" @@ -24515,12 +24643,12 @@ in sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."string-width-1.0.2" @@ -24535,7 +24663,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -24551,7 +24679,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -24566,7 +24694,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24626,7 +24754,7 @@ in sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -24646,13 +24774,13 @@ in sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."aproba-1.1.1" sources."has-unicode-2.0.1" @@ -24674,7 +24802,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -24692,7 +24820,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -24707,7 +24835,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24740,7 +24868,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."block-stream-0.0.9" @@ -24805,7 +24933,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -24827,19 +24955,19 @@ in sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."node-pre-gyp-0.6.34" sources."mkdirp-0.5.1" sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -24879,7 +25007,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -24897,7 +25025,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -24912,7 +25040,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24959,7 +25087,7 @@ in sources."lodash._getnative-3.9.1" sources."lodash.isarguments-3.1.0" sources."lodash.isarray-3.0.4" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."event-stream-3.3.4" @@ -25083,18 +25211,18 @@ in sources."ws-1.1.1" sources."xml2js-0.4.17" sources."node-red-node-feedparser-0.1.7" - sources."node-red-node-email-0.1.21" + sources."node-red-node-email-0.1.22" (sources."node-red-node-twitter-0.1.10" // { dependencies = [ sources."request-2.81.0" sources."caseless-0.12.0" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."qs-6.4.0" sources."tunnel-agent-0.6.0" ]; }) - sources."node-red-node-rbe-0.1.6" + sources."node-red-node-rbe-0.1.8" sources."bcrypt-1.0.2" sources."bytes-2.4.0" sources."content-type-1.0.2" @@ -25104,7 +25232,7 @@ in sources."iconv-lite-0.4.13" sources."on-finished-2.3.0" sources."qs-6.2.0" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."ms-0.7.1" sources."inherits-2.0.3" sources."setprototypeof-1.0.2" @@ -25139,17 +25267,17 @@ in sources."nth-check-1.0.1" sources."domelementtype-1.3.0" sources."domhandler-2.3.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."vary-1.1.1" - sources."moment-timezone-0.5.11" + sources."moment-timezone-0.5.13" sources."moment-2.18.1" sources."accepts-1.3.3" sources."array-flatten-1.1.1" @@ -25193,9 +25321,9 @@ in sources."commist-1.0.0" sources."concat-stream-1.6.0" sources."end-of-stream-1.4.0" - sources."help-me-1.0.1" + sources."help-me-1.1.0" sources."minimist-1.2.0" - sources."mqtt-packet-5.2.2" + sources."mqtt-packet-5.3.0" sources."pump-1.0.2" sources."reinterval-1.1.0" sources."split2-2.1.1" @@ -25206,86 +25334,28 @@ in sources."once-1.4.0" sources."wrappy-1.0.2" sources."callback-stream-1.1.0" - (sources."glob-stream-5.3.5" // { - dependencies = [ - sources."through2-0.6.5" - sources."readable-stream-1.0.34" - sources."isarray-0.0.1" - ]; - }) + sources."glob-stream-6.1.0" sources."through2-2.0.3" sources."extend-3.0.0" - sources."glob-5.0.15" + sources."glob-7.1.1" sources."glob-parent-3.1.0" - (sources."micromatch-2.3.11" // { - dependencies = [ - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - ]; - }) - sources."ordered-read-streams-0.3.0" - sources."to-absolute-glob-0.1.1" + sources."is-negated-glob-1.0.0" + sources."ordered-read-streams-1.0.0" + sources."pumpify-1.3.5" + sources."remove-trailing-separator-1.0.1" + sources."to-absolute-glob-2.0.1" sources."unique-stream-2.2.1" + sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."is-glob-3.1.0" sources."path-dirname-1.0.2" sources."is-extglob-2.1.1" - sources."arr-diff-2.0.0" - sources."array-unique-0.2.1" - sources."braces-1.8.5" - sources."expand-brackets-0.1.5" - (sources."extglob-0.3.2" // { - dependencies = [ - sources."is-extglob-1.0.0" - ]; - }) - sources."filename-regex-2.0.0" - sources."kind-of-3.1.0" - sources."normalize-path-2.1.1" - sources."object.omit-2.0.1" - (sources."parse-glob-3.0.4" // { - dependencies = [ - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - ]; - }) - sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" - sources."expand-range-1.8.2" - sources."preserve-0.2.0" - sources."repeat-element-1.1.2" - sources."fill-range-2.2.3" - sources."is-number-2.1.0" - sources."isobject-2.1.0" - sources."randomatic-1.1.6" - sources."repeat-string-1.6.1" - sources."is-posix-bracket-0.1.1" - sources."is-buffer-1.1.5" - sources."remove-trailing-separator-1.0.1" - sources."for-own-0.1.5" - sources."is-extendable-0.1.1" - sources."for-in-1.0.2" - (sources."glob-base-0.3.0" // { - dependencies = [ - sources."glob-parent-2.0.0" - sources."is-glob-2.0.1" - sources."is-extglob-1.0.0" - ]; - }) - sources."is-dotfile-1.0.2" - sources."is-equal-shallow-0.1.3" - sources."is-primitive-2.0.0" sources."is-stream-1.1.0" - sources."extend-shallow-2.0.1" - sources."json-stable-stringify-1.0.1" - sources."through2-filter-2.0.0" - sources."jsonify-0.0.0" - sources."bl-1.2.0" (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" @@ -25293,6 +25363,18 @@ in ]; }) sources."stream-shift-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-absolute-0.2.6" + sources."is-extendable-0.1.1" + sources."is-relative-0.2.1" + sources."is-windows-0.2.0" + sources."is-unc-path-0.1.2" + sources."unc-path-regex-0.1.2" + sources."json-stable-stringify-1.0.1" + sources."through2-filter-2.0.0" + sources."jsonify-0.0.0" + sources."bl-1.2.0" + sources."safe-buffer-5.0.1" sources."abbrev-1.1.0" sources."uid2-0.0.3" sources."passport-strategy-1.0.0" @@ -25309,7 +25391,10 @@ in sources."wordwrap-0.0.2" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" + sources."kind-of-3.1.0" sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.5" sources."options-0.0.6" sources."ultron-1.0.2" sources."sax-1.2.2" @@ -25320,12 +25405,14 @@ in sources."sax-0.6.1" sources."readable-stream-1.0.34" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) (sources."request-2.74.0" // { dependencies = [ sources."bl-1.1.2" sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" ]; }) sources."addressparser-0.1.3" @@ -25337,7 +25424,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.2.0" + sources."async-2.3.0" ]; }) sources."har-validator-2.0.6" @@ -25377,7 +25464,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25409,6 +25496,7 @@ in dependencies = [ sources."readable-stream-1.1.14" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."libmime-1.2.0" @@ -25446,10 +25534,9 @@ in sources."twitter-ng-0.6.2" sources."oauth-0.9.14" sources."performance-now-0.2.0" - sources."safe-buffer-5.0.1" sources."uuid-3.0.1" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."bindings-1.2.1" @@ -25458,7 +25545,7 @@ in dependencies = [ sources."request-2.81.0" sources."caseless-0.12.0" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."qs-6.4.0" sources."tunnel-agent-0.6.0" @@ -25471,16 +25558,13 @@ in }) sources."npmlog-4.0.2" sources."rc-1.1.7" - (sources."rimraf-2.5.4" // { - dependencies = [ - sources."glob-7.1.1" - ]; - }) + sources."rimraf-2.5.4" sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ sources."once-1.3.3" sources."readable-stream-2.1.5" + sources."string_decoder-0.10.31" ]; }) sources."are-we-there-yet-1.1.2" @@ -25500,7 +25584,6 @@ in sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" - sources."fs.realpath-1.0.0" sources."block-stream-0.0.9" sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" @@ -25578,7 +25661,7 @@ in sources."bytes-0.2.0" sources."pause-0.0.1" sources."mime-1.2.6" - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.5" sources."vows-0.8.1" sources."eyes-0.1.8" sources."diff-1.0.8" @@ -25607,7 +25690,7 @@ in sources."tinycolor-0.0.1" sources."options-0.0.6" sources."zeparser-0.0.5" - sources."mailcomposer-4.0.1" + sources."mailcomposer-4.0.2" sources."simplesmtp-0.3.35" sources."optimist-0.6.1" sources."buildmail-4.0.1" @@ -25643,10 +25726,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.4.4"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.4.4.tgz"; - sha1 = "d5ec661923a06bcd6a6eec3d0433a9da3fd67e37"; + url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz"; + sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475"; }; dependencies = [ sources."JSONStream-1.3.1" @@ -25672,12 +25755,12 @@ in sources."glob-7.1.1" sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.2" sources."iferr-0.1.5" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - sources."init-package-json-1.9.5" + sources."init-package-json-1.9.6" sources."lazy-property-1.0.0" sources."lockfile-1.0.3" sources."lodash._baseuniq-4.6.0" @@ -25688,7 +25771,7 @@ in sources."mississippi-1.3.0" sources."mkdirp-0.5.1" sources."move-concurrently-1.0.1" - (sources."node-gyp-3.5.0" // { + (sources."node-gyp-3.6.0" // { dependencies = [ sources."nopt-3.0.6" ]; @@ -25699,7 +25782,7 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-4.2.1" - sources."npm-registry-client-7.4.6" + sources."npm-registry-client-8.1.1" sources."npm-user-validate-0.1.5" sources."npmlog-4.0.2" sources."once-1.4.0" @@ -25711,7 +25794,7 @@ in sources."read-installed-4.0.3" sources."read-package-json-2.0.5" sources."read-package-tree-5.1.5" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."realize-package-specifier-3.0.3" sources."request-2.81.0" sources."retry-0.10.1" @@ -25725,6 +25808,7 @@ in sources."from2-1.3.0" sources."readable-stream-1.1.14" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."strip-ansi-3.0.1" @@ -25758,7 +25842,7 @@ in sources."proto-list-1.2.4" sources."fstream-ignore-1.0.5" sources."minimatch-3.0.3" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" @@ -25812,7 +25896,7 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -25820,7 +25904,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -25837,7 +25921,7 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -25852,7 +25936,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25918,7 +26002,7 @@ in sources."crypto-random-string-1.0.0" sources."package-json-4.0.0" sources."got-6.7.1" - sources."registry-auth-token-3.1.0" + sources."registry-auth-token-3.1.2" sources."registry-url-3.1.0" sources."create-error-class-3.0.2" sources."duplexer3-0.1.4" @@ -25931,7 +26015,7 @@ in sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" sources."prepend-http-1.0.4" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -25989,7 +26073,7 @@ in }) sources."fs.extra-1.3.2" sources."findit-1.2.0" - sources."coffee-script-1.12.4" + sources."coffee-script-1.12.5" sources."underscore-1.4.4" sources."underscore.string-2.3.3" sources."request-2.81.0" @@ -26007,7 +26091,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -26025,7 +26109,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -26040,7 +26124,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26074,7 +26158,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."are-we-there-yet-1.1.2" @@ -26082,12 +26166,12 @@ in sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."aproba-1.1.1" sources."has-unicode-2.0.1" @@ -26139,10 +26223,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.10.4"; + version = "2.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.4.tgz"; - sha1 = "0833dd707f983a04fdcd615afb860ce82b1e54a2"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.5.tgz"; + sha1 = "2d047e3a24d676e0c99cf7221361088dcc247a6a"; }; dependencies = [ sources."bluebird-3.5.0" @@ -26165,7 +26249,7 @@ in sources."require-dir-0.3.1" sources."semver-5.3.0" sources."semver-utils-1.1.1" - (sources."snyk-1.26.1" // { + (sources."snyk-1.28.1" // { dependencies = [ sources."update-notifier-0.5.0" sources."latest-version-1.0.1" @@ -26221,7 +26305,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - (sources."init-package-json-1.9.5" // { + (sources."init-package-json-1.9.6" // { dependencies = [ sources."validate-npm-package-name-3.0.0" ]; @@ -26264,7 +26348,11 @@ in sources."read-installed-4.0.3" sources."read-package-json-2.0.5" sources."read-package-tree-5.1.5" - sources."readable-stream-2.1.5" + (sources."readable-stream-2.1.5" // { + dependencies = [ + sources."string_decoder-0.10.31" + ]; + }) sources."realize-package-specifier-3.0.3" sources."request-2.75.0" sources."retry-0.10.1" @@ -26302,7 +26390,7 @@ in sources."proto-list-1.2.4" sources."fstream-ignore-1.0.5" sources."minimatch-3.0.3" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" @@ -26337,7 +26425,7 @@ in sources."builtin-modules-1.1.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" ]; }) sources."typedarray-0.0.6" @@ -26345,7 +26433,7 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -26356,6 +26444,7 @@ in (sources."bl-1.1.2" // { dependencies = [ sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" ]; }) sources."caseless-0.11.0" @@ -26394,7 +26483,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26442,8 +26531,8 @@ in sources."open-0.0.5" sources."os-name-1.0.3" sources."snyk-config-1.0.1" - sources."snyk-module-1.7.0" - sources."snyk-policy-1.7.0" + sources."snyk-module-1.8.1" + sources."snyk-policy-1.7.1" (sources."snyk-recursive-readdir-2.0.0" // { dependencies = [ sources."minimatch-3.0.2" @@ -26507,7 +26596,7 @@ in sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.5" - sources."js-yaml-3.8.2" + sources."js-yaml-3.8.3" sources."argparse-1.0.9" sources."esprima-3.1.3" sources."sprintf-js-1.0.3" @@ -26537,7 +26626,7 @@ in sources."is-obj-1.0.1" sources."package-json-2.4.0" sources."got-5.7.1" - sources."registry-auth-token-3.1.0" + sources."registry-auth-token-3.1.2" sources."registry-url-3.1.0" sources."create-error-class-3.0.2" sources."duplexer2-0.1.4" @@ -26555,7 +26644,7 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."prepend-http-1.0.4" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -26613,10 +26702,10 @@ in parsoid = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; - version = "0.6.1"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/parsoid/-/parsoid-0.6.1.tgz"; - sha1 = "b6393a25fde2489290dc9d110b037ce89eec2723"; + url = "https://registry.npmjs.org/parsoid/-/parsoid-0.7.1.tgz"; + sha1 = "121dcf59d0bacd9247405988525888f9a6ba2328"; }; dependencies = [ sources."async-0.9.2" @@ -26656,8 +26745,7 @@ in sources."ms-0.7.1" ]; }) - sources."gelf-stream-0.2.4" - sources."js-yaml-3.8.2" + sources."js-yaml-3.8.3" sources."mediawiki-title-0.5.6" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."node-uuid-1.4.8" @@ -26672,19 +26760,17 @@ in }) (sources."service-runner-2.2.5" // { dependencies = [ - sources."gelf-stream-1.1.1" sources."yargs-6.6.0" - sources."gelfling-0.3.1" sources."camelcase-3.0.0" sources."cliui-3.2.0" ]; }) sources."simplediff-0.1.1" - (sources."yargs-4.8.1" // { + (sources."yargs-5.0.0" // { dependencies = [ sources."cliui-3.2.0" sources."window-size-0.2.0" - sources."yargs-parser-2.4.1" + sources."yargs-parser-3.2.0" sources."camelcase-3.0.0" ]; }) @@ -26698,7 +26784,7 @@ in sources."on-finished-2.3.0" sources."qs-6.4.0" sources."raw-body-2.2.0" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."ms-0.7.2" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" @@ -26754,12 +26840,12 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."optimist-0.6.1" sources."source-map-0.4.4" - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."source-map-0.5.6" sources."yargs-3.10.0" @@ -26789,7 +26875,6 @@ in sources."object-keys-1.0.11" sources."define-properties-1.1.2" sources."foreach-2.0.5" - sources."gelfling-0.2.0" sources."argparse-1.0.9" sources."esprima-3.1.3" sources."sprintf-js-1.0.3" @@ -26799,7 +26884,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -26815,7 +26900,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -26830,7 +26915,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26856,13 +26941,15 @@ in sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."bluebird-3.5.0" - sources."bunyan-1.8.9" + sources."bunyan-1.8.10" sources."bunyan-syslog-udp-0.1.0" + sources."gelf-stream-1.1.1" sources."hot-shots-4.4.0" (sources."limitation-0.2.0" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."dnscache-1.0.1" @@ -26870,7 +26957,7 @@ in sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" sources."moment-2.18.1" - sources."nan-2.5.1" + sources."nan-2.6.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -26878,29 +26965,33 @@ in }) sources."ncp-2.0.0" sources."rimraf-2.4.5" + sources."gelfling-0.3.1" sources."kad-git+https://github.com/gwicke/kad.git#master" sources."clarinet-0.11.0" sources."colors-1.1.2" sources."hat-0.0.3" (sources."kad-fs-0.0.4" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."kad-localstorage-0.0.7" (sources."kad-memstore-0.0.1" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."lodash-3.10.1" sources."merge-1.2.0" (sources."msgpack5-3.4.1" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."buffer-shims-1.0.0" @@ -26909,8 +27000,9 @@ in sources."dom-storage-2.0.2" (sources."bl-1.2.0" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."isarray-1.0.0" + sources."string_decoder-1.0.0" ]; }) sources."get-caller-file-1.0.2" @@ -26946,7 +27038,7 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -26994,14 +27086,14 @@ in sources."minimist-0.0.10" ]; }) - (sources."parse-torrent-5.8.2" // { + (sources."parse-torrent-5.8.3" // { dependencies = [ sources."get-stdin-5.0.1" ]; }) sources."pump-1.0.2" sources."range-parser-1.2.0" - sources."rc-1.2.0" + sources."rc-1.2.1" (sources."torrent-stream-1.0.3" // { dependencies = [ sources."end-of-stream-0.1.5" @@ -27027,15 +27119,15 @@ in sources."plist-1.2.0" sources."reverse-http-1.2.0" sources."stream-buffers-2.2.0" - sources."big-integer-1.6.17" + sources."big-integer-1.6.19" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."base64-js-0.0.8" sources."xmlbuilder-4.0.0" @@ -27084,7 +27176,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -27131,9 +27223,9 @@ in sources."is-promise-2.1.0" sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" - sources."magnet-uri-5.1.5" - sources."parse-torrent-file-4.0.1" - sources."simple-get-2.4.0" + sources."magnet-uri-5.1.6" + sources."parse-torrent-file-4.0.2" + sources."simple-get-2.5.1" sources."thirty-two-1.0.2" sources."uniq-1.0.1" sources."bencode-0.11.0" @@ -27147,7 +27239,7 @@ in sources."strip-json-comments-2.0.1" sources."bitfield-0.1.0" sources."bncode-0.5.3" - (sources."fs-chunk-store-1.6.4" // { + (sources."fs-chunk-store-1.6.5" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" @@ -27161,8 +27253,8 @@ in sources."peer-wire-swarm-0.12.1" sources."rimraf-2.6.1" sources."torrent-discovery-5.4.0" - sources."torrent-piece-1.1.0" - (sources."random-access-file-1.5.0" // { + sources."torrent-piece-1.1.1" + (sources."random-access-file-1.6.1" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" @@ -27171,6 +27263,7 @@ in }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" + sources."buffer-alloc-unsafe-1.0.0" sources."debug-2.6.3" sources."ms-0.7.2" sources."flatten-0.0.1" @@ -27180,6 +27273,7 @@ in sources."readable-stream-1.1.14" sources."bncode-0.2.3" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."speedometer-0.1.4" @@ -27190,7 +27284,7 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" (sources."bittorrent-dht-6.4.2" // { @@ -27221,7 +27315,7 @@ in sources."simple-peer-6.4.4" (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."ws-2.2.2" + sources."ws-2.2.3" ]; }) sources."string2compact-1.2.2" @@ -27518,7 +27612,7 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."which-1.2.14" @@ -27575,7 +27669,7 @@ in sources."minimatch-3.0.3" sources."once-1.4.0" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."is-stream-1.1.0" @@ -27601,7 +27695,7 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.2.0" + sources."async-2.3.0" sources."lodash-4.17.4" sources."mime-db-1.27.0" sources."assert-plus-0.2.0" @@ -27610,7 +27704,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27665,6 +27759,60 @@ in }; production = true; }; + prettier = nodeEnv.buildNodePackage { + name = "prettier"; + packageName = "prettier"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-1.1.0.tgz"; + sha1 = "9d6ad005703efefa66b6999b8916bfc6afeaf9f8"; + }; + dependencies = [ + sources."ast-types-0.9.8" + sources."babel-code-frame-6.22.0" + sources."babylon-7.0.0-beta.8" + sources."chalk-1.1.3" + sources."esutils-2.0.2" + sources."flow-parser-0.43.0" + sources."get-stdin-5.0.1" + sources."glob-7.1.1" + sources."jest-validate-19.0.0" + sources."minimist-1.2.0" + sources."js-tokens-3.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.7" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."jest-matcher-utils-19.0.0" + sources."leven-2.1.0" + (sources."pretty-format-19.0.0" // { + dependencies = [ + sources."ansi-styles-3.0.0" + ]; + }) + sources."color-convert-1.9.0" + sources."color-name-1.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Prettier is an opinionated JavaScript formatter"; + homepage = "https://github.com/prettier/prettier#readme"; + license = "MIT"; + }; + production = true; + }; react-tools = nodeEnv.buildNodePackage { name = "react-tools"; packageName = "react-tools"; @@ -27698,7 +27846,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."minimist-0.0.8" @@ -27802,7 +27950,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -27819,7 +27967,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -27834,7 +27982,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27909,14 +28057,14 @@ in ]; }) sources."commander-2.9.0" - sources."js-yaml-3.8.2" + sources."js-yaml-3.8.3" sources."cookies-0.7.0" sources."request-2.81.0" sources."async-0.9.2" sources."es6-shim-0.21.1" sources."semver-4.3.6" sources."minimatch-1.0.0" - sources."bunyan-1.8.9" + sources."bunyan-1.8.10" sources."handlebars-2.0.0" sources."highlight.js-8.9.1" sources."lunr-0.7.2" @@ -27929,6 +28077,7 @@ in (sources."readable-stream-1.1.14" // { dependencies = [ sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."fs-ext-0.6.0" @@ -27964,7 +28113,7 @@ in sources."serve-static-1.12.1" sources."setprototypeof-1.0.3" sources."statuses-1.3.1" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."utils-merge-1.0.0" sources."vary-1.1.1" sources."mime-types-2.1.15" @@ -27994,7 +28143,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -28010,7 +28159,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -28025,7 +28174,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28056,7 +28205,7 @@ in sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" sources."moment-2.18.1" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."ncp-2.0.0" sources."rimraf-2.4.5" (sources."glob-6.0.4" // { @@ -28068,7 +28217,7 @@ in sources."inherits-2.0.3" sources."once-1.4.0" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."optimist-0.3.7" @@ -28088,7 +28237,7 @@ in sources."uc.micro-1.0.3" (sources."htmlparser2-3.9.2" // { dependencies = [ - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" ]; }) sources."regexp-quote-0.0.0" @@ -28105,7 +28254,7 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."jsonparse-1.3.0" sources."through-2.3.8" @@ -28140,9 +28289,9 @@ in sources."graceful-readlink-1.0.1" sources."graceful-fs-4.1.11" sources."minimatch-3.0.3" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."buffer-shims-1.0.0" @@ -28150,7 +28299,7 @@ in sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -28249,7 +28398,7 @@ in sources."wrappy-1.0.2" sources."extsprintf-1.2.0" sources."core-util-is-1.0.2" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" sources."mkdirp-0.5.1" @@ -28261,7 +28410,7 @@ in sources."inherits-2.0.3" sources."minimatch-3.0.3" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."sshpk-agent-1.2.1" @@ -28284,11 +28433,11 @@ in ]; }) sources."json-schema-0.2.3" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" @@ -28326,7 +28475,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."amdefine-1.0.1" @@ -28397,21 +28546,21 @@ in sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" sources."errno-0.1.4" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."prr-0.0.0" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" ]; @@ -28501,7 +28650,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -28544,7 +28693,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28606,10 +28755,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.20"; + version = "2.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; - sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.22.tgz"; + sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0"; }; dependencies = [ sources."source-map-0.5.6" @@ -28640,10 +28789,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.11"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.11.tgz"; - sha1 = "a6391af1d6d132c2f995dbf9740b17b315b2f90f"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.14.tgz"; + sha1 = "e65f05f541bc8b829f9720f28e74c4a12c7b6dd2"; }; dependencies = [ sources."async-2.1.5" @@ -28654,12 +28803,24 @@ in sources."cookie-parser-1.4.3" sources."crossroads-0.12.2" sources."diff2html-2.3.0" - sources."express-4.14.1" - sources."express-session-1.14.2" + (sources."express-4.15.2" // { + dependencies = [ + sources."debug-2.6.1" + sources."qs-6.4.0" + sources."setprototypeof-1.0.3" + sources."ms-0.7.2" + ]; + }) + (sources."express-session-1.15.2" // { + dependencies = [ + sources."debug-2.6.3" + sources."ms-0.7.2" + ]; + }) sources."forever-monitor-1.1.0" sources."getmac-1.2.1" sources."hasher-1.2.0" - sources."ignore-3.2.6" + sources."ignore-3.2.7" sources."keen.io-0.1.3" sources."knockout-3.4.2" sources."lodash-4.17.4" @@ -28668,21 +28829,21 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.17.1" + sources."moment-2.18.1" sources."node-cache-4.1.1" - (sources."npm-4.1.2" // { + (sources."npm-4.5.0" // { dependencies = [ - sources."abbrev-1.0.9" + sources."bluebird-3.5.0" sources."nopt-4.0.1" - sources."request-2.79.0" + sources."request-2.81.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."qs-6.3.2" - sources."tunnel-agent-0.4.3" + sources."qs-6.4.0" + sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" @@ -28690,14 +28851,12 @@ in sources."sntp-1.0.9" ]; }) - (sources."npm-registry-client-7.4.6" // { + (sources."npm-registry-client-8.1.1" // { dependencies = [ sources."request-2.81.0" - sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" - sources."har-validator-4.2.1" + sources."form-data-2.1.4" sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" @@ -28715,22 +28874,22 @@ in sources."os-homedir-1.0.2" sources."passport-0.3.2" sources."passport-local-1.0.0" - (sources."raven-1.1.5" // { + (sources."raven-1.2.1" // { dependencies = [ sources."json-stringify-safe-5.0.1" sources."uuid-3.0.0" ]; }) - (sources."rc-1.1.7" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."semver-5.3.0" - sources."serve-static-1.11.2" + sources."serve-static-1.12.1" sources."signals-1.0.0" - sources."snapsvg-0.4.0" + sources."snapsvg-0.5.1" (sources."socket.io-1.7.3" // { dependencies = [ sources."debug-2.3.3" @@ -28749,6 +28908,7 @@ in sources."readable-stream-1.0.27-1" sources."async-0.9.2" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) (sources."temp-0.8.3" // { @@ -28762,7 +28922,11 @@ in sources."colors-1.0.3" ]; }) - sources."yargs-6.6.0" + (sources."yargs-7.1.0" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) sources."bytes-2.4.0" sources."content-type-1.0.2" sources."debug-2.2.0" @@ -28772,7 +28936,7 @@ in sources."on-finished-2.3.0" sources."qs-6.2.0" sources."raw-body-2.1.7" - sources."type-is-1.6.14" + sources."type-is-1.6.15" sources."ms-0.7.1" sources."inherits-2.0.3" sources."setprototypeof-1.0.2" @@ -28803,18 +28967,26 @@ in sources."content-disposition-0.5.2" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - sources."finalhandler-0.5.1" - sources."fresh-0.3.0" + sources."etag-1.8.0" + (sources."finalhandler-1.0.1" // { + dependencies = [ + sources."debug-2.6.3" + sources."ms-0.7.2" + ]; + }) + sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.4" sources."range-parser-1.2.0" - (sources."send-0.14.2" // { + (sources."send-0.15.1" // { dependencies = [ + sources."debug-2.6.1" + sources."http-errors-1.6.1" sources."ms-0.7.2" + sources."setprototypeof-1.0.3" ]; }) sources."utils-merge-1.0.0" @@ -28824,7 +28996,7 @@ in sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" sources."mime-1.3.4" - sources."crc-3.4.1" + sources."crc-3.4.4" sources."on-headers-1.0.1" sources."uid-safe-2.1.4" sources."random-bytes-1.0.0" @@ -28908,11 +29080,13 @@ in sources."underscore-1.5.2" sources."clone-2.1.1" sources."JSONStream-1.3.1" + sources."ansi-regex-2.1.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."archy-1.0.0" sources."asap-2.0.5" + sources."call-limit-1.1.0" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" sources."columnify-1.5.4" @@ -28930,22 +29104,20 @@ in }) sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.4.2" sources."iferr-0.1.5" sources."inflight-1.0.6" - (sources."init-package-json-1.9.5" // { - dependencies = [ - sources."validate-npm-package-name-3.0.0" - ]; - }) + sources."init-package-json-1.9.6" + sources."lazy-property-1.0.0" sources."lockfile-1.0.3" sources."lodash._baseuniq-4.6.0" sources."lodash.clonedeep-4.5.0" sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" - sources."mississippi-1.2.0" - (sources."node-gyp-3.5.0" // { + sources."mississippi-1.3.0" + sources."move-concurrently-1.0.1" + (sources."node-gyp-3.6.0" // { dependencies = [ sources."minimatch-3.0.3" sources."nopt-3.0.6" @@ -28967,7 +29139,7 @@ in sources."read-installed-4.0.3" sources."read-package-json-2.0.5" sources."read-package-tree-5.1.5" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."realize-package-specifier-3.0.3" sources."retry-0.10.1" sources."sha-2.0.1" @@ -28978,6 +29150,7 @@ in sources."from2-1.3.0" sources."readable-stream-1.1.14" sources."isarray-0.0.1" + sources."string_decoder-0.10.31" ]; }) sources."strip-ansi-3.0.1" @@ -28986,16 +29159,12 @@ in sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unique-filename-1.1.0" + sources."update-notifier-2.1.0" sources."uuid-3.0.1" - (sources."validate-npm-package-name-2.2.2" // { - dependencies = [ - sources."builtins-0.0.7" - ]; - }) + sources."validate-npm-package-name-3.0.0" sources."which-1.2.14" sources."wrappy-1.0.2" sources."write-file-atomic-1.3.1" - sources."ansi-regex-2.1.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -29020,13 +29189,12 @@ in sources."minimatch-3.0.3" ]; }) - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" - sources."builtins-1.0.3" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" sources."concat-stream-1.6.0" @@ -29039,13 +29207,17 @@ in sources."end-of-stream-1.4.0" sources."flush-write-stream-1.0.2" sources."from2-2.3.0" + sources."parallel-transform-1.1.0" sources."pump-1.0.2" sources."pumpify-1.3.5" sources."stream-each-1.2.0" sources."through2-2.0.3" sources."typedarray-0.0.6" sources."stream-shift-1.0.0" + sources."cyclist-0.2.2" sources."xtend-4.0.1" + sources."copy-concurrently-1.0.3" + sources."run-queue-1.0.3" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" sources."are-we-there-yet-1.1.2" @@ -29069,40 +29241,33 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."extend-3.0.0" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" + sources."performance-now-0.2.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.6" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."assert-plus-0.2.0" (sources."jsprim-1.4.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29130,23 +29295,70 @@ in sources."stream-iterate-1.2.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" + (sources."boxen-1.0.0" // { + dependencies = [ + sources."string-width-2.0.0" + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."chalk-1.1.3" + sources."configstore-3.0.0" + sources."is-npm-1.0.0" + sources."latest-version-3.1.0" + sources."lazy-req-2.0.0" + sources."semver-diff-2.1.0" + sources."xdg-basedir-3.0.0" + sources."ansi-align-1.1.0" + sources."camelcase-4.1.0" + sources."cli-boxes-1.0.0" + sources."term-size-0.1.1" + sources."widest-line-1.0.0" + sources."execa-0.4.0" + (sources."cross-spawn-async-2.2.5" // { + dependencies = [ + sources."lru-cache-4.0.2" + ]; + }) + sources."is-stream-1.1.0" + sources."npm-run-path-1.0.0" + sources."path-key-1.0.0" + sources."strip-eof-1.0.0" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."dot-prop-4.1.1" + sources."unique-string-1.0.0" + sources."is-obj-1.0.1" + sources."crypto-random-string-1.0.0" + sources."package-json-4.0.0" + sources."got-6.7.1" + sources."registry-auth-token-3.1.2" + sources."registry-url-3.1.0" + sources."create-error-class-3.0.2" + sources."duplexer3-0.1.4" + sources."get-stream-3.0.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."lowercase-keys-1.0.0" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."capture-stack-trace-1.0.0" + sources."prepend-http-1.0.4" + sources."builtins-1.0.3" sources."isexe-2.0.0" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."performance-now-0.2.0" - sources."safe-buffer-5.0.1" - sources."ajv-4.11.5" - sources."har-schema-1.0.5" - sources."co-4.6.0" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" sources."deep-extend-0.4.1" sources."strip-json-comments-2.0.1" - sources."eve-0.4.2" + sources."eve-0.5.3" (sources."engine.io-1.8.3" // { dependencies = [ sources."debug-2.3.3" @@ -29211,7 +29423,6 @@ in sources."formidable-1.0.14" sources."cookiejar-2.0.1" sources."reduce-component-1.0.1" - sources."camelcase-3.0.0" sources."cliui-3.2.0" sources."decamelize-1.2.0" sources."get-caller-file-1.0.2" @@ -29221,13 +29432,19 @@ in sources."require-main-filename-1.0.1" sources."which-module-1.0.0" sources."y18n-3.2.1" - sources."yargs-parser-4.2.1" + (sources."yargs-parser-5.0.0" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) sources."wrap-ansi-2.1.0" sources."lcid-1.0.0" sources."invert-kv-1.0.0" sources."find-up-1.1.2" sources."read-pkg-1.1.0" sources."path-exists-2.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" sources."parse-json-2.2.0" @@ -29315,7 +29532,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."minimatch-3.0.3" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."is-stream-1.1.0" @@ -29341,7 +29558,7 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.2.0" + sources."async-2.3.0" sources."lodash-4.17.4" sources."mime-db-1.27.0" sources."assert-plus-0.2.0" @@ -29350,7 +29567,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29410,29 +29627,38 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "2.3.2"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-2.3.2.tgz"; - sha1 = "7d521e6f0777a3a58985c69425263fdfe977b458"; + url = "https://registry.npmjs.org/webpack/-/webpack-2.4.1.tgz"; + sha1 = "15a91dbe34966d8a4b99c7d656efd92a2e5a6f6a"; }; dependencies = [ - sources."acorn-4.0.11" - sources."acorn-dynamic-import-2.0.2" - sources."ajv-4.11.5" + sources."acorn-5.0.3" + (sources."acorn-dynamic-import-2.0.2" // { + dependencies = [ + sources."acorn-4.0.11" + ]; + }) + sources."ajv-4.11.6" sources."ajv-keywords-1.5.1" - sources."async-2.2.0" + sources."async-2.3.0" sources."enhanced-resolve-3.1.0" sources."interpret-1.0.2" sources."json-loader-0.5.4" + sources."json5-0.5.1" sources."loader-runner-2.3.0" sources."loader-utils-0.2.17" sources."memory-fs-0.4.1" sources."mkdirp-0.5.1" - sources."node-libs-browser-2.0.0" + (sources."node-libs-browser-2.0.0" // { + dependencies = [ + sources."string_decoder-0.10.31" + ]; + }) sources."source-map-0.5.6" sources."supports-color-3.2.3" sources."tapable-0.2.6" - (sources."uglify-js-2.8.20" // { + (sources."uglify-js-2.8.22" // { dependencies = [ sources."yargs-3.10.0" ]; @@ -29453,16 +29679,15 @@ in sources."object-assign-4.1.1" sources."big.js-3.1.3" sources."emojis-list-2.1.0" - sources."json5-0.5.1" sources."errno-0.1.4" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."prr-0.0.0" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."inherits-2.0.3" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."minimist-0.0.8" sources."assert-1.4.1" @@ -29480,7 +29705,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.6.3" + sources."stream-http-2.7.0" sources."timers-browserify-2.0.2" sources."tty-browserify-0.0.0" (sources."url-0.11.0" // { @@ -29520,7 +29745,7 @@ in sources."parse-asn1-5.1.0" sources."brorand-1.1.0" sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" + sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" @@ -29569,7 +29794,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.1" + sources."arr-flatten-1.0.2" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -29589,14 +29814,14 @@ in sources."binary-extensions-1.8.0" sources."minimatch-3.0.3" sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."nan-2.5.1" + sources."nan-2.6.2" sources."node-pre-gyp-0.6.34" sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -29634,7 +29859,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -29663,7 +29888,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29729,7 +29954,7 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -29764,21 +29989,20 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "0.21.3"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-0.21.3.tgz"; - sha1 = "8dda3a63c798b383cfa577452c2b3cb3e4aa87e0"; + url = "https://registry.npmjs.org/yarn/-/yarn-0.22.0.tgz"; + sha1 = "fd8511dc29225b925be967dc185772cc59de5888"; }; dependencies = [ sources."babel-runtime-6.23.0" sources."bytes-2.5.0" - sources."camelcase-3.0.0" + sources."camelcase-4.1.0" sources."chalk-1.1.3" sources."cmd-shim-2.0.2" sources."commander-2.9.0" sources."death-1.1.0" sources."debug-2.6.3" - sources."defaults-1.0.3" sources."detect-indent-5.0.0" sources."ini-1.3.4" sources."inquirer-3.0.6" @@ -29802,6 +30026,7 @@ in sources."strip-bom-3.0.0" sources."tar-2.2.1" sources."tar-stream-1.5.2" + sources."v8-compile-cache-1.1.0" sources."validate-npm-package-license-3.0.1" sources."core-js-2.4.1" sources."regenerator-runtime-0.10.3" @@ -29814,7 +30039,6 @@ in sources."graceful-fs-4.1.11" sources."graceful-readlink-1.0.1" sources."ms-0.7.2" - sources."clone-1.0.2" sources."ansi-escapes-1.4.0" sources."cli-cursor-2.1.0" sources."cli-width-2.1.0" @@ -29840,7 +30064,7 @@ in sources."ci-info-1.0.0" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."minimist-0.0.8" @@ -29868,12 +30092,12 @@ in }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."aproba-1.1.1" sources."has-unicode-2.0.1" @@ -29895,7 +30119,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -29913,7 +30137,7 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -29928,7 +30152,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -30097,7 +30321,7 @@ in sources."node-status-codes-1.0.0" sources."parse-json-2.2.0" sources."read-all-stream-3.1.0" - sources."readable-stream-2.2.6" + sources."readable-stream-2.2.9" sources."timed-out-3.1.3" sources."unzip-response-1.0.2" sources."url-parse-lax-1.0.0" @@ -30108,7 +30332,7 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" + sources."string_decoder-1.0.0" sources."util-deprecate-1.0.2" sources."prepend-http-1.0.4" sources."decamelize-1.2.0" @@ -30152,7 +30376,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.2" + sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -30168,7 +30392,7 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-4.11.5" + sources."ajv-4.11.6" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" @@ -30183,7 +30407,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.11.0" // { + (sources."sshpk-1.13.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -30219,7 +30443,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.1" + sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -30230,14 +30454,14 @@ in sources."strip-indent-1.0.1" sources."get-stdin-4.0.1" sources."registry-url-3.1.0" - (sources."rc-1.2.0" // { + (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."deep-extend-0.4.1" sources."strip-json-comments-2.0.1" - sources."registry-auth-token-3.1.0" + sources."registry-auth-token-3.1.2" sources."execall-1.0.0" sources."clone-regexp-1.0.0" sources."is-regexp-1.0.0" @@ -30310,7 +30534,7 @@ in sources."walk-2.3.9" sources."minimatch-3.0.3" sources."foreachasync-3.0.0" - sources."brace-expansion-1.1.6" + sources."brace-expansion-1.1.7" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."diff-2.2.3" diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 80e6383a6f47..11c4368270cd 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -49,6 +49,7 @@ , "peerflix" , "peerflix-server" , "phantomjs" +, "prettier" , "react-tools" , "s3http" , "semver" diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index d3a373ab4dbc..53d5a25a39eb 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,19 +1,30 @@ { stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 , ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib -, ppx_tools, result +, ppx_tools, result, cppo , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" }: +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" + then { + version = "2.7.1"; + sha256 = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w"; + } else { + version = "2.6.0"; + sha256 = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; + }; +in + stdenv.mkDerivation rec { name = "ocaml-lwt-${version}"; - version = "2.6.0"; + inherit (param) version; src = fetchzip { url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; - sha256 = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; + inherit (param) sha256; }; - buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ] + buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] ++ stdenv.lib.optional ppxSupport ppx_tools; propagatedBuildInputs = [ result ocaml_react ocaml_ssl libev ]; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index a26109bd4f95..5e18d1fd6e42 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml , jsooSupport ? !(stdenv.lib.versionAtLeast ocaml.version "4.04") }: +with lib; + stdenv.mkDerivation { name = "ocaml${ocaml.version}-mtime-0.8.3"; @@ -15,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild opam ] ++ stdenv.lib.optional jsooSupport js_of_ocaml; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${if jsooSupport then "true" else "false"}"; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${boolToString jsooSupport}"; installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; @@ -23,7 +25,7 @@ stdenv.mkDerivation { description = "Monotonic wall-clock time for OCaml"; homepage = http://erratique.ch/software/mtime; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index f9240f7507cf..91ab694eb6f2 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildPhase = '' LD_LIBRARY_PATH=${cpuid}/lib/ocaml/${ocaml.version}/site-lib/stubslibs/ \ - ${topkg.buildPhase} --with-lwt ${if withLwt then "true" else "false"} + ${topkg.buildPhase} --with-lwt ${boolToString withLwt} ''; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index b967728d048c..950395bd7eaa 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -29,7 +29,7 @@ buildOcaml rec { optional withLwt lwt; buildPhase = topkg.buildPhase - + " --with-lwt ${if withLwt then "true" else "false"}"; + + " --with-lwt ${boolToString withLwt}"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index cb7878ac731e..ba33081486d7 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg , uchar, result, gg, uutf, otfm, js_of_ocaml, pdfBackend ? true, # depends on uutf and otfm htmlcBackend ? true # depends on js_of_ocaml }: +with lib; + let inherit (stdenv.lib) optionals versionAtLeast; pname = "vg"; version = "0.9.0"; webpage = "http://erratique.ch/software/${pname}"; - sob = b: if b then "true" else "false"; in assert versionAtLeast ocaml.version "4.02.0"; @@ -35,13 +36,14 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; buildPhase = topkg.buildPhase - + " --with-uutf ${sob pdfBackend} --with-otfm ${sob pdfBackend}" - + " --with-js_of_ocaml ${sob htmlcBackend}" - + " --with-cairo2 false"; + + " --with-uutf ${boolToString pdfBackend}" + + " --with-otfm ${boolToString pdfBackend}" + + " --with-js_of_ocaml ${boolToString htmlcBackend}" + + " --with-cairo2 false"; inherit (topkg) installPhase; - meta = with stdenv.lib; { + meta = { description = "Declarative 2D vector graphics for OCaml"; longDescription = '' Vg is an OCaml module for declarative 2D vector graphics. In Vg, images diff --git a/pkgs/development/python-modules/csscompressor.nix b/pkgs/development/python-modules/csscompressor.nix new file mode 100644 index 000000000000..a9aad8d40e5f --- /dev/null +++ b/pkgs/development/python-modules/csscompressor.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "csscompressor"; + version = "0.9.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0e12f125b88379d7b680636d94a3c8fa14bed1de2358f7f9a9e6749e222cff3b"; + }; + + doCheck = false; # No tests + + meta = { + description = "A python port of YUI CSS Compressor"; + homepage = https://pypi.python.org/pypi/csscompressor; + license = stdenv.lib.licenses.bsd3; + maintainers = [stdenv.lib.maintainers.ahmedtd]; + }; +} diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix new file mode 100644 index 000000000000..9b79d82328f7 --- /dev/null +++ b/pkgs/development/python-modules/distro/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "distro"; + version = "1.0.3"; + + buildInputs = [ pytest pytestcov tox]; + + checkPhase = '' + touch tox.ini + tox + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "1kmjdz1kxspsmps73m2kzhxz86jj43ikx825hmgmwbx793ywv69d"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/nir0s/distro; + description = "Linux Distribution - a Linux OS platform information API."; + license = licenses.asl20; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/htmlmin.nix b/pkgs/development/python-modules/htmlmin.nix new file mode 100644 index 000000000000..35f86479a4e3 --- /dev/null +++ b/pkgs/development/python-modules/htmlmin.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "htmlmin"; + version = "0.1.10"; + name = "${pname}-${version}"; + src = fetchPypi { + inherit pname version; + sha256 = "ca5c5dfbb0fa58562e5cbc8dc026047f6cb431d4333504b11853853be448aa63"; + }; + + # Tests run fine in a normal source checkout, but not when being built by nix. + doCheck = false; + + meta = { + description = "A configurable HTML Minifier with safety features"; + homepage = https://pypi.python.org/pypi/htmlmin; + license = stdenv.lib.licenses.bsd3; + maintainers = [stdenv.lib.maintainers.ahmedtd]; + }; +} diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix new file mode 100644 index 000000000000..f44bb7caf3d5 --- /dev/null +++ b/pkgs/development/python-modules/iso-639/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "iso-639"; + version = "0.4.5"; + + src = fetchurl { + url = "mirror://pypi/i/${pname}/${name}.tar.gz"; + sha256 = "dc9cd4b880b898d774c47fe9775167404af8a85dd889d58f9008035109acce49"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/noumar/iso639; + description = "ISO 639 library for Python"; + license = licenses.agpl3; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix new file mode 100644 index 000000000000..4d9792ebbb82 --- /dev/null +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "iso3166"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "deactivated"; + repo = "python-iso3166"; + # repo has no version tags + rev = "f04e499447bbff10af701cf3dd81f6bcdf02f7d7"; + sha256 = "0zs9za9dr2nl5srxir08yibmp6nffcapmzala0fgh8ny7y6rafrx"; + }; + + buildInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/deactivated/python-iso3166; + description = "Self-contained ISO 3166-1 country definitions"; + license = licenses.mit; + maintainers = with maintainers; [ zraexy ]; + }; +} diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix new file mode 100644 index 000000000000..0bd569fd4ad3 --- /dev/null +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "0.1.1"; + pname = "node-semver"; + + buildInputs = [ pytest tox ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1b3xiqgl436q33grbkh4chpfchl8i2dmcpggbb2q4vgv3vjy97p2"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/podhmo/python-semver; + description = "A port of node-semver"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix new file mode 100644 index 000000000000..ead0e3d858d6 --- /dev/null +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, buildPythonPackage }: + +buildPythonPackage rec { + name = "phonenumbers-8.4.0"; + + meta = { + description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers"; + homepage = "https://github.com/daviddrysdale/python-phonenumbers"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ fadenb ]; + }; + + src = fetchurl { + url = "mirror://pypi/p/phonenumbers/${name}.tar.gz"; + sha256 = "1c052gd7ra3v183jq2x5nwa428wxh1g3psfh0ay5jwwmcxy78vab"; + }; +} diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix new file mode 100644 index 000000000000..9d90c617fc16 --- /dev/null +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "0.5"; + pname = "pluginbase"; + + buildInputs = [ pytest tox ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1palagrlszs4f4f5j6npzl4d195vclrlza3qr524z2h758j31y5l"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/mitsuhiko/pluginbase; + description = "A support library for building plugins sytems in Python"; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyocr-tesseract.patch b/pkgs/development/python-modules/pyocr-tesseract.patch new file mode 100644 index 000000000000..d09a7c57352e --- /dev/null +++ b/pkgs/development/python-modules/pyocr-tesseract.patch @@ -0,0 +1,316 @@ +This patch is required for pyocr to work with Tesseract version 3.05.00 +and has been submitted upstream at the following URL: + +https://github.com/jflesch/pyocr/pull/62 + +diff --git a/src/pyocr/builders.py b/src/pyocr/builders.py +index 73c964d..20f390c 100644 +--- a/src/pyocr/builders.py ++++ b/src/pyocr/builders.py +@@ -240,8 +240,10 @@ class BaseBuilder(object): + cuneiform_args : Arguments passed to the Cuneiform command line. + """ + +- def __init__(self, file_extensions, tesseract_configs, cuneiform_args): ++ def __init__(self, file_extensions, tesseract_flags, tesseract_configs, ++ cuneiform_args): + self.file_extensions = file_extensions ++ self.tesseract_flags = tesseract_flags + self.tesseract_configs = tesseract_configs + self.cuneiform_args = cuneiform_args + +@@ -298,7 +300,7 @@ class TextBuilder(BaseBuilder): + def __init__(self, tesseract_layout=3, cuneiform_dotmatrix=False, + cuneiform_fax=False, cuneiform_singlecolumn=False): + file_ext = ["txt"] +- tess_conf = ["-psm", str(tesseract_layout)] ++ tess_flags = ["-psm", str(tesseract_layout)] + cun_args = ["-f", "text"] + # Add custom cuneiform parameters if needed + for par, arg in [(cuneiform_dotmatrix, "--dotmatrix"), +@@ -306,7 +308,7 @@ class TextBuilder(BaseBuilder): + (cuneiform_singlecolumn, "--singlecolumn")]: + if par: + cun_args.append(arg) +- super(TextBuilder, self).__init__(file_ext, tess_conf, cun_args) ++ super(TextBuilder, self).__init__(file_ext, tess_flags, [], cun_args) + self.tesseract_layout = tesseract_layout + self.built_text = [] + +@@ -540,9 +542,11 @@ class WordBoxBuilder(BaseBuilder): + + def __init__(self, tesseract_layout=1): + file_ext = ["html", "hocr"] +- tess_conf = ["hocr", "-psm", str(tesseract_layout)] ++ tess_flags = ["-psm", str(tesseract_layout)] ++ tess_conf = ["hocr"] + cun_args = ["-f", "hocr"] +- super(WordBoxBuilder, self).__init__(file_ext, tess_conf, cun_args) ++ super(WordBoxBuilder, self).__init__(file_ext, tess_flags, tess_conf, ++ cun_args) + self.word_boxes = [] + self.tesseract_layout = tesseract_layout + +@@ -614,9 +618,11 @@ class LineBoxBuilder(BaseBuilder): + + def __init__(self, tesseract_layout=1): + file_ext = ["html", "hocr"] +- tess_conf = ["hocr", "-psm", str(tesseract_layout)] ++ tess_flags = ["-psm", str(tesseract_layout)] ++ tess_conf = ["hocr"] + cun_args = ["-f", "hocr"] +- super(LineBoxBuilder, self).__init__(file_ext, tess_conf, cun_args) ++ super(LineBoxBuilder, self).__init__(file_ext, tess_flags, tess_conf, ++ cun_args) + self.lines = [] + self.tesseract_layout = tesseract_layout + +diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py +index 0c2259a..f7ab309 100644 +--- a/src/pyocr/libtesseract/tesseract_raw.py ++++ b/src/pyocr/libtesseract/tesseract_raw.py +@@ -263,11 +263,22 @@ if g_libtesseract: + ] + g_libtesseract.TessDeleteText.restype = None + +- g_libtesseract.TessBaseAPIDetectOS.argtypes = [ +- ctypes.c_void_p, # TessBaseAPI* +- ctypes.POINTER(OSResults), +- ] +- g_libtesseract.TessBaseAPIDetectOS.restype = ctypes.c_bool ++ if hasattr(g_libtesseract, 'TessBaseAPIDetectOrientationScript'): ++ g_libtesseract.TessBaseAPIDetectOrientationScript.argtypes = [ ++ ctypes.c_void_p, # TessBaseAPI* ++ ctypes.POINTER(ctypes.c_int), # orient_deg ++ ctypes.POINTER(ctypes.c_float), # orient_conf ++ ctypes.POINTER(ctypes.c_char_p), # script_name ++ ctypes.POINTER(ctypes.c_float), # script_conf ++ ] ++ g_libtesseract.TessBaseAPIDetectOrientationScript.restype = \ ++ ctypes.c_bool ++ else: ++ g_libtesseract.TessBaseAPIDetectOS.argtypes = [ ++ ctypes.c_void_p, # TessBaseAPI* ++ ctypes.POINTER(OSResults), ++ ] ++ g_libtesseract.TessBaseAPIDetectOS.restype = ctypes.c_bool + + + def init(lang=None): +@@ -526,15 +537,37 @@ def detect_os(handle): + global g_libtesseract + assert(g_libtesseract) + +- results = OSResults() +- r = g_libtesseract.TessBaseAPIDetectOS( +- ctypes.c_void_p(handle), +- ctypes.pointer(results) +- ) +- if not r: +- raise TesseractError("detect_orientation failed", +- "TessBaseAPIDetectOS() failed") +- return { +- "orientation": results.best_orientation_id, +- "confidence": results.best_oconfidence, +- } ++ # Use the new API function if it is available, because since Tesseract ++ # 3.05.00 the old API function _always_ returns False. ++ if hasattr(g_libtesseract, 'TessBaseAPIDetectOrientationScript'): ++ orientation_deg = ctypes.c_int(0) ++ orientation_confidence = ctypes.c_float(0.0) ++ ++ r = g_libtesseract.TessBaseAPIDetectOrientationScript( ++ ctypes.c_void_p(handle), ++ ctypes.byref(orientation_deg), ++ ctypes.byref(orientation_confidence), ++ None, # script_name ++ None # script_confidence ++ ) ++ ++ if not r: ++ raise TesseractError("detect_orientation failed", ++ "TessBaseAPIDetectOrientationScript() failed") ++ return { ++ "orientation": round(orientation_deg.value / 90), ++ "confidence": orientation_confidence.value, ++ } ++ else: # old API (before Tesseract 3.05.00) ++ results = OSResults() ++ r = g_libtesseract.TessBaseAPIDetectOS( ++ ctypes.c_void_p(handle), ++ ctypes.pointer(results) ++ ) ++ if not r: ++ raise TesseractError("detect_orientation failed", ++ "TessBaseAPIDetectOS() failed") ++ return { ++ "orientation": results.best_orientation_id, ++ "confidence": results.best_oconfidence, ++ } +diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py +index 99b0121..658c96b 100755 +--- a/src/pyocr/tesseract.py ++++ b/src/pyocr/tesseract.py +@@ -22,6 +22,8 @@ import os + import subprocess + import sys + import tempfile ++import contextlib ++import shutil + + from . import builders + from . import error +@@ -62,9 +64,11 @@ class CharBoxBuilder(builders.BaseBuilder): + + def __init__(self): + file_ext = ["box"] ++ tess_flags = [] + tess_conf = ["batch.nochop", "makebox"] + cun_args = [] +- super(CharBoxBuilder, self).__init__(file_ext, tess_conf, cun_args) ++ super(CharBoxBuilder, self).__init__(file_ext, tess_flags, tess_conf, ++ cun_args) + self.tesseract_layout = 1 + + @staticmethod +@@ -173,18 +177,19 @@ def detect_orientation(image, lang=None): + TesseractError --- if no script detected on the image + """ + _set_environment() +- with temp_file(".bmp") as input_file: +- command = [TESSERACT_CMD, input_file.name, 'stdout', "-psm", "0"] ++ with temp_dir() as tmpdir: ++ command = [TESSERACT_CMD, "input.bmp", 'stdout', "-psm", "0"] + if lang is not None: + command += ['-l', lang] + + if image.mode != "RGB": + image = image.convert("RGB") +- image.save(input_file.name) ++ image.save(os.path.join(tmpdir, "input.bmp")) + + proc = subprocess.Popen(command, stdin=subprocess.PIPE, shell=False, + startupinfo=g_subprocess_startup_info, + creationflags=g_creation_flags, ++ cwd=tmpdir, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) + proc.stdin.close() +@@ -224,8 +229,8 @@ def get_available_builders(): + ] + + +-def run_tesseract(input_filename, output_filename_base, lang=None, +- configs=None): ++def run_tesseract(input_filename, output_filename_base, cwd=None, lang=None, ++ flags=None, configs=None): + ''' + Runs Tesseract: + `TESSERACT_CMD` \ +@@ -238,6 +243,8 @@ def run_tesseract(input_filename, output_filename_base, lang=None, + input_filename --- image to read + output_filename_base --- file name in which must be stored the result + (without the extension) ++ cwd --- Run Tesseract in the specified working directory or use current ++ one if None + lang --- Tesseract language to use (if None, none will be specified) + config --- List of Tesseract configs to use (if None, none will be + specified) +@@ -252,10 +259,13 @@ def run_tesseract(input_filename, output_filename_base, lang=None, + if lang is not None: + command += ['-l', lang] + ++ if flags is not None: ++ command += flags ++ + if configs is not None: + command += configs + +- proc = subprocess.Popen(command, ++ proc = subprocess.Popen(command, cwd=cwd, + startupinfo=g_subprocess_startup_info, + creationflags=g_creation_flags, + stdout=subprocess.PIPE, +@@ -301,11 +311,18 @@ class ReOpenableTempfile(object): + self.name = None + + +-def temp_file(suffix): +- ''' Returns a temporary file ''' +- if os.name == 'nt': # Windows +- return ReOpenableTempfile(suffix) +- return tempfile.NamedTemporaryFile(prefix='tess_', suffix=suffix) ++@contextlib.contextmanager ++def temp_dir(): ++ """ ++ A context manager for maintaining a temporary directory ++ """ ++ # NOTE: Drop this as soon as we don't support Python 2.7 anymore, because ++ # since Python 3.2 there is a context manager called TemporaryDirectory(). ++ path = tempfile.mkdtemp(prefix='tess_') ++ try: ++ yield path ++ finally: ++ shutil.rmtree(path) + + + def image_to_string(image, lang=None, builder=None): +@@ -329,23 +346,20 @@ def image_to_string(image, lang=None, builder=None): + + if builder is None: + builder = builders.TextBuilder() +- with temp_file(".bmp") as input_file: +- with temp_file('') as output_file: +- output_file_name_base = output_file.name +- ++ with temp_dir() as tmpdir: + if image.mode != "RGB": + image = image.convert("RGB") +- image.save(input_file.name) +- (status, errors) = run_tesseract(input_file.name, +- output_file_name_base, ++ image.save(os.path.join(tmpdir, "input.bmp")) ++ (status, errors) = run_tesseract("input.bmp", "output", cwd=tmpdir, + lang=lang, ++ flags=builder.tesseract_flags, + configs=builder.tesseract_configs) + if status: + raise TesseractError(status, errors) + + output_file_name = "ERROR" + for file_extension in builder.file_extensions: +- output_file_name = ('%s.%s' % (output_file_name_base, ++ output_file_name = ('%s.%s' % (os.path.join(tmpdir, "output"), + file_extension)) + if not os.access(output_file_name, os.F_OK): + continue +diff --git a/tests/tests_libtesseract.py b/tests/tests_libtesseract.py +index ccddd07..1ac2a4b 100644 +--- a/tests/tests_libtesseract.py ++++ b/tests/tests_libtesseract.py +@@ -33,8 +33,9 @@ class TestContext(unittest.TestCase): + (3, 3, 0), + (3, 4, 0), + (3, 4, 1), ++ (3, 5, 0), + ), ("Tesseract does not have the expected version" +- " (3.4.0) ! Some tests will be skipped !")) ++ " (3.5.0) ! Some tests will be skipped !")) + + def test_langs(self): + langs = libtesseract.get_available_languages() +diff --git a/tests/tests_tesseract.py b/tests/tests_tesseract.py +index e29c512..fa4d483 100644 +--- a/tests/tests_tesseract.py ++++ b/tests/tests_tesseract.py +@@ -27,8 +27,9 @@ class TestContext(unittest.TestCase): + (3, 3, 0), + (3, 4, 0), + (3, 4, 1), ++ (3, 5, 0), + ), ("Tesseract does not have the expected version" +- " (3.4.0) ! Some tests will be skipped !")) ++ " (3.5.0) ! Some tests will be skipped !")) + + def test_langs(self): + langs = tesseract.get_available_languages() diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 02fe9f50558e..e115b2c679d9 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -211,7 +211,7 @@ in buildInputs = [ curl ]; }; - tzinfo = attrs: { + tzinfo = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { dontBuild = false; postPatch = '' substituteInPlace lib/tzinfo/zoneinfo_data_source.rb \ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index e25cb696a656..a394105faf4b 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45 }: +{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre }: stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.76.1"; + version = "1.78"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1l46bmzm5syfr9m5l0bqkj8lcyrynhw8gjf95s4fwhp2b7f0zisv"; + sha256 = "1cc60y2vjq4g88183jkan91ybzqy0n6p5ncs8z5rh6rjsvvrc9p4"; }; + buildInputs = [ pcre ]; nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; - makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg''; + makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg HAVE_RULES=yes''; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index bdd50421c1f7..5490790fe385 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -2,7 +2,7 @@ assert jdk != null; -let version = "3.3.9"; in +let version = "3.5.0"; in stdenv.mkDerivation rec { name = "apache-maven-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; - sha256 = "6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82"; + sha256 = "0d7hjnj77hc7qqnnfmqlwij8n6pcldfavvd6lilvv5ak4hci9fdy"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix new file mode 100644 index 000000000000..417e492f7d0b --- /dev/null +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "${pname}-${version}"; + version = "0.21.2"; + pname = "conan"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0x9s5h81d885xdrjw5x99q18lhmj11kalrs6xnjy2phrr8qzil8c"; + }; + + propagatedBuildInputs = with pythonPackages; [ + requests2 fasteners pyyaml pyjwt colorama patch + bottle pluginbase six distro pylint node-semver + ]; + + # enable tests once all of these pythonPackages available: + # [ nose nose_parameterized mock WebTest codecov ] + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://conan.io; + description = "Decentralized and portable C/C++ package manager"; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 28b6601cab6f..51aaf5e6a79a 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-3.4.1"; - nativeVersion = "0.13"; + name = "gradle-3.5"; + nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1cpria3qry4778pxcmqvnaqcyq36abj1fgw4pq115k3rsj9v27fv"; + sha256 = "046i268zkg89ps7c1sq8yx9lbn9kighh4gcskxmzf3qriiwm0x0b"; }; }; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 309a6e13606a..cf9b42abefd2 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "0.13.14"; + version = "0.13.15"; src = fetchurl { url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"; - sha256 = "1q4jnrva21s0rhcn561ayfp5yhd6rpxidgx6f4i5n3dla3p9zkr9"; + sha256 = "1vvsxpg1fwfzv3mcin69gnj44v6p7kfx3z9cm761sx01qbbp7q5n"; }; patchPhase = '' diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix new file mode 100644 index 000000000000..bad35e2422b5 --- /dev/null +++ b/pkgs/development/tools/compile-daemon/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "compile-daemon-unstable-${version}"; + version = "2017-03-08"; + rev = "d447e567232bcb84cedd3b2be012c7127f31f469"; + + goPackagePath = "github.com/githubnemo/CompileDaemon"; + + src = fetchFromGitHub { + owner = "githubnemo"; + repo = "CompileDaemon"; + inherit rev; + sha256 = "0jfbipp3gd89n6d7gds1qvfkqvz80qdlqqhijxffh8z8ss0xinqc"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Very simple compile daemon for Go"; + license = licenses.bsd2; + maintainers = with maintainers; [ profpatsch ]; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/development/tools/compile-daemon/deps.nix b/pkgs/development/tools/compile-daemon/deps.nix new file mode 100644 index 000000000000..53771ddad9f0 --- /dev/null +++ b/pkgs/development/tools/compile-daemon/deps.nix @@ -0,0 +1,48 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0-devel +[ + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "9131ab34cf20d2f6d83fdc67168a5430d1c7dc23"; + sha256 = "111x6rhpxfjhwkjrmrirqqh6nc68q5g7air9fl5kgr3bg85hybr5"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "a392f450ea64cee2b268dfaacdc2502b50a22b18"; + sha256 = "1msiq5nb1sdhwfjv65hjnvr2s4pfsp8mv6f5z8aa8n9bjf0cksyc"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "57fdcb988a5c543893cc61bce354a6e24ab70022"; + sha256 = "1fkhmi3nhz6vasfvjzjjwxkbpwsb9hzc0g5h1rygqrnzjykl2r39"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "99f16d856c9836c42d24e7ab64ea72916925fa97"; + sha256 = "0g2x5krfhnraq03v0b48y3xv3ffg92pbgvps0npj9l7wq8q9hkmx"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "629574ca2a5df945712d3079857300b5e4da0236"; + sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3"; + }; + } +] diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 7b42e5877520..5a0cb4911e10 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.49"; + version = "2.53"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "0c7qnrx87wrgxgh4im1i6sqlxq3hsrs119krh5vwjzx5wp6daa93"; + sha256 = "16lgwgp4n161j4vjwkzzdz4v2d6vv62rrqmcfmb6zalyvp6wpj9r"; }; buildCommand = '' diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 7ebbc1b88e30..a2ff84108899 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gcc, scons, pkgconfig, libX11, libXcursor , libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib -, libpulseaudio, mesa, mesa_glu, zlib }: +, libpulseaudio, mesa_glu, zlib }: stdenv.mkDerivation rec { name = "godot-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gcc scons pkgconfig libX11 libXcursor libXinerama libXrandr libXrender - freetype openssl alsaLib libpulseaudio mesa mesa_glu zlib + freetype openssl alsaLib libpulseaudio mesa_glu zlib ]; patches = [ ./pkg_config_additions.patch ]; diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index 75a06291b021..a952475b9673 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ascherer"; repo = "cwebbin"; - rev = name; + rev = "2016-05-20-22p"; sha256 = "0zf93016hm9i74i2v384rwzcw16y3hg5vc2mibzkx1rzvqa50yfr"; }; cweb = fetchurl { - url = https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb.tar.gz; + url = https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb-3.64ah.tgz; sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj"; }; @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "CP=cp" "RM=rm" "PDFTEX=echo" + "CC=c++" ]; buildPhase = '' diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 4b0768af1e20..1e04a10eccd9 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -55,6 +55,7 @@ let TextTable XMLSimple nixUnstable + nixUnstable.perl-bindings git boehmgc ]; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index e7520091d1d9..f644160b9a31 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps }: +, procps, autoconf, automake }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.17"; + name = "intel-gpu-tools-1.18"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "06pvmbsbff4bsi67n6x3jjngzy2llf8bplc75447ra1fwphc9jx6"; + sha256 = "1vp4czxp8xa6qk4pg3mrxhc2yadw2rv6p8r8247mkpcbb8dzjxyz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake ]; buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod libXext libXv libXrandr glib bison libunwind python3 procps ]; preBuild = '' patchShebangs debugger/system_routine/pre_cpp.py + substituteInPlace tools/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 1e6b6690e71b..e6c2467bc8a0 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl, python, zip, makeWrapper, nix, nix-prefetch-scripts +{ stdenv, fetchurl, pythonPackages, zip, makeWrapper, nix, nix-prefetch-git +, nix-prefetch-hg }: let - version = "1.6.0"; + version = "1.8.0"; src = fetchurl { url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz"; - sha256 = "08iad1ad2gnvsnd66ddw3lff19ms2yly4iq63c8800j603d0pdhn"; + sha256 = "133sjx8r1jdb5gi3caawa9m7v496jv4id2c3zqnx8hria22425za"; }; click = fetchurl { - url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz"; - sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc"; + url = "https://pypi.python.org/packages/95/d9/c3336b6b5711c3ab9d1d3a80f1a3e2afeb9d8c02a7166462f6cc96570897/click-6.7.tar.gz"; + sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; }; requests = fetchurl { - url = "https://pypi.python.org/packages/5b/0b/34be574b1ec997247796e5d516f3a6b6509c4e064f2885a96ed885ce7579/requests-2.12.4.tar.gz"; - sha256 = "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d"; + url = "https://pypi.python.org/packages/16/09/37b69de7c924d318e51ece1c4ceb679bf93be9d05973bb30c35babd596e2/requests-2.13.0.tar.gz"; + sha256 = "1s0wg4any4dsv5l3hqjxqk2zgb7pdbqhy9rhc8kh3aigfq4ws8jp"; }; in stdenv.mkDerivation rec { @@ -27,7 +28,11 @@ in stdenv.mkDerivation rec { click requests ]; - buildInputs = [ python zip makeWrapper nix.out nix-prefetch-scripts ]; + buildInputs = [ + pythonPackages.python pythonPackages.flake8 + zip makeWrapper nix.out nix-prefetch-git nix-prefetch-hg + ]; + sourceRoot = "."; postUnpack = '' @@ -47,13 +52,14 @@ in stdenv.mkDerivation rec { patchPhase = '' sed -i -e "s|default='nix-shell',|default='${nix.out}/bin/nix-shell',|" $out/pkgs/pypi2nix/cli.py - sed -i -e "s|nix-prefetch-git|${nix-prefetch-scripts}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py + sed -i -e "s|nix-prefetch-git|${nix-prefetch-git}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py + sed -i -e "s|nix-prefetch-hg|${nix-prefetch-hg}/bin/nix-prefetch-hg|" $out/pkgs/pypi2nix/stage2.py ''; commonPhase = '' mkdir -p $out/bin - echo "#!${python.interpreter}" > $out/bin/pypi2nix + echo "#!${pythonPackages.python.interpreter}" > $out/bin/pypi2nix echo "import pypi2nix.cli" >> $out/bin/pypi2nix echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix @@ -62,8 +68,16 @@ in stdenv.mkDerivation rec { export PYTHONPATH=$out/pkgs:$PYTHONPATH ''; + # flake8 doesn't run on python3 + doCheck = false; + checkPhase = '' + flake8 ${src}/src + ''; + installPhase = commonPhase + '' - wrapProgram $out/bin/pypi2nix --prefix PYTHONPATH : "$PYTHONPATH" + wrapProgram $out/bin/pypi2nix \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PATH : "${nix-prefetch-git}/bin:${nix-prefetch-hg}/bin" ''; shellHook = '' diff --git a/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch b/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch new file mode 100644 index 000000000000..3b429c1745e4 --- /dev/null +++ b/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch @@ -0,0 +1,75 @@ +From 36c053f37670c6003f9e8dc001741f7c49e9526a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Sat, 15 Apr 2017 20:42:10 +0200 +Subject: [PATCH] use hardcoded dynamic-linker +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + src/rustup-cli/common.rs | 3 ++- + src/rustup/toolchain.rs | 22 ++++++++++++++++++++-- + 2 files changed, 22 insertions(+), 3 deletions(-) + +diff --git a/src/rustup-cli/common.rs b/src/rustup-cli/common.rs +index 1abf345..21096e7 100644 +--- a/src/rustup-cli/common.rs ++++ b/src/rustup-cli/common.rs +@@ -220,7 +220,8 @@ pub fn rustc_version(toolchain: &Toolchain) -> String { + if toolchain.exists() { + let rustc_path = toolchain.binary_file("rustc"); + if utils::is_file(&rustc_path) { +- let mut cmd = Command::new(&rustc_path); ++ let mut cmd = Command::new("@dynamicLinker@"); ++ cmd.arg(&rustc_path); + cmd.arg("--version"); + toolchain.set_ldpath(&mut cmd); + +diff --git a/src/rustup/toolchain.rs b/src/rustup/toolchain.rs +index dc29c32..212a4ab 100644 +--- a/src/rustup/toolchain.rs ++++ b/src/rustup/toolchain.rs +@@ -315,7 +315,7 @@ impl<'a> Toolchain<'a> { + } + Path::new(&binary) + }; +- let mut cmd = Command::new(&path); ++ let mut cmd = wrap_elf_interpreter(&path); + self.set_env(&mut cmd); + Ok(cmd) + } +@@ -363,7 +363,7 @@ impl<'a> Toolchain<'a> { + } else { + src_file + }; +- let mut cmd = Command::new(exe_path); ++ let mut cmd = wrap_elf_interpreter(exe_path); + self.set_env(&mut cmd); + cmd.env("RUSTUP_TOOLCHAIN", &primary_toolchain.name); + Ok(cmd) +@@ -648,3 +648,21 @@ impl<'a> Toolchain<'a> { + path + } + } ++ ++fn wrap_elf_interpreter<S: AsRef<OsStr>>(p: S) -> Command { ++ use std::fs::File; ++ use std::io::Read; ++ let path = Path::new(&p); ++ let is_elf = File::open(path).map(|mut f| { ++ let mut buf = [0; 4]; ++ let _ = f.read(&mut buf); ++ buf == b"\x7fELF"[..] ++ }).unwrap_or(false); ++ if is_elf { ++ let mut cmd = Command::new("@dynamicLinker@"); ++ cmd.arg(&path); ++ cmd ++ } else { ++ Command::new(&path) ++ } ++} +-- +2.12.2 + diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix new file mode 100644 index 000000000000..b9e6a0e2d816 --- /dev/null +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -0,0 +1,55 @@ +{ stdenv, lib, runCommand +, fetchFromGitHub, rustPlatform +, pkgconfig, curl, Security }: + +rustPlatform.buildRustPackage rec { + name = "rustup-${version}"; + version = "1.2.0"; + + depsSha256 = "06bfz5kyj3k0yxv55dq0s1arx34sy1jjfrpgd83rf99026vcm5x2"; + + src = fetchFromGitHub { + owner = "rust-lang-nursery"; + repo = "rustup.rs"; + rev = version; + sha256 = "0qwl27wh7j03h511bd8fq5fif5xcmkiyy9rm3hri7czjqr01mw0v"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + curl + ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + cargoBuildFlags = [ "--features no-self-update" ]; + + patches = lib.optionals stdenv.isLinux [ + (runCommand "0001-use-hardcoded-dynamic-linker.patch" { CC=stdenv.cc; } '' + export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) + substituteAll ${./0001-use-hardcoded-dynamic-linker.patch} $out + '') + ]; + + postInstall = '' + pushd $out/bin + mv rustup-init rustup + for link in cargo rustc rustdoc rust-gdb rust-lldb; do + ln -s rustup $link + done + popd + + # tries to create .rustup + export HOME=$(mktemp -d) + mkdir -p "$out/share/"{bash-completion/completions,fish/completions,zsh/site-functions} + $out/bin/rustup completions bash > "$out/share/bash-completion/completions/rustup" + $out/bin/rustup completions fish > "$out/share/fish/completions/rustup.fish" + $out/bin/rustup completions zsh > "$out/share/zsh/site-functions/_rustup" + ''; + + meta = with stdenv.lib; { + description = "The Rust toolchain installer"; + homepage = https://www.rustup.rs/; + license = licenses.mit; + maintainer = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 73cb902ae695..d9459134feab 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper, fakeroot, file, getopt -, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr +, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr, udev , alsaLib, GConf, cups, libcap, fontconfig, freetype, pango , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi @@ -11,7 +11,7 @@ let libPath64 = lib.makeLibraryPath [ gcc.cc gtk2 gdk_pixbuf glib mesa_glu postgresql nss nspr alsaLib GConf cups libcap fontconfig freetype pango - cairo dbus expat zlib libpng12 + cairo dbus expat zlib libpng12 udev libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb ]; @@ -25,19 +25,16 @@ let gnome-sharp gtk-sharp-2_0 ]; - ver = "5.3.5"; + ver = "5.5.3"; build = "f1"; - date = "20160525"; - pkgVer = "${ver}${build}"; - fullVer = "${pkgVer}+${date}"; in stdenv.mkDerivation rec { name = "unity-editor-${version}"; - version = pkgVer; + version = "${ver}x${build}"; src = fetchurl { - url = "http://download.unity3d.com/download_unity/linux/unity-editor-installer-${fullVer}.sh"; - sha256 = "0lmc65175fdvbyn3565pjlg6cc4l5i58fj7bxzi5cqykkbzv5wdm"; + url = "http://beta.unity3d.com/download/a2454d41e248/unity-editor-installer-${version}Linux.sh"; + sha256 = "1hvas4n1hm0qp0265gk1nh03kypd9690fnxvzg70f5ni9q97pvm0"; }; nosuidLib = ./unity-nosuid.c; @@ -46,9 +43,10 @@ in stdenv.mkDerivation rec { outputs = [ "out" "monodevelop" ]; + sourceRoot = "unity-editor-${version}Linux"; + unpackPhase = '' echo -e 'q\ny' | fakeroot sh $src - sourceRoot="unity-editor-${pkgVer}" ''; buildPhase = '' @@ -125,6 +123,7 @@ in stdenv.mkDerivation rec { ''; dontStrip = true; + dontPatchELF = true; meta = with stdenv.lib; { homepage = https://unity3d.com/; diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index f3967b0d9235..56f15d62154c 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -3,7 +3,7 @@ , makeQtWrapper, qtbase, qtx11extras , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf -, freeglut, mesa, mesa_glu +, freeglut, mesa_glu }: stdenv.mkDerivation rec { name = "vogl-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { qtbase qtx11extras libdwarf libjpeg_turbo libunwind lzma tinyxml libX11 SDL2 SDL2_gfx SDL2_image SDL2_ttf - freeglut mesa mesa_glu + freeglut mesa_glu ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index 34fc5b0f6202..31692d9bee68 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -101,6 +101,54 @@ let Name = "$(EXECUTABLE_NAME)"; }; } + { + Identifier = "com.apple.package-type.wrapper"; + Type = "PackageType"; + Name = "Wrapper"; + DefaultBuildSettings = { + WRAPPER_SUFFIX = ".bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)/Contents"; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/MacOS"; + EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)"; + INFOPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/Info.plist"; + INFOSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings"; + PKGINFO_PATH = "$(CONTENTS_FOLDER_PATH)/PkgInfo"; + PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist"; + VERSIONPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/version.plist"; + PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; + PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; + EXECUTABLES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Executables"; + FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks"; + SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks"; + SHARED_SUPPORT_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedSupport"; + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources"; + LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj"; + DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation"; + PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns"; + SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts"; + }; + ProductReference = { + FileType = "wrapper.cfbundle"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Identifier = "com.apple.package-type.wrapper.application"; + Type = "PackageType"; + BasedOn = "com.apple.package-type.wrapper"; + Name = "Application Wrapper"; + DefaultBuildSettings = { + GENERATE_PKGINFO_FILE = "YES"; + }; + ProductReference = { + FileType = "wrapper.application"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "YES"; + }; + } ]; # Based off of the MacOSX Product Types.xcpsec file. All @@ -125,6 +173,39 @@ let Name = "Dynamic Library"; PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.bundle"; + Name = "Bundle"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(WRAPPER_NAME)"; + MACH_O_TYPE = "mh_bundle"; + WRAPPER_PREFIX = ""; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "non-global"; + }; + PackageTypes = [ "com.apple.package-type.wrapper" ]; + IsWrapper = "YES"; + HasInfoPlist = "YES"; + HasInfoPlistStrings = "YES"; + } + { + Identifier = "com.apple.product-type.application"; + Type = "ProductType"; + BasedOn = "com.apple.product-type.bundle"; + Name = "Application"; + DefaultBuildProperties = { + MACH_O_TYPE = "mh_execute"; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "app"; + }; + PackageTypes = [ "com.apple.package-type.wrapper.application" ]; + } ]; in diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index 4313f0051473..9e34360909f9 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -1,6 +1,7 @@ {stdenv, writeText, toolchainName, xcbuild, fetchurl , llvm, cctools, gcc, bootstrap_cmds, binutils -, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}: +, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper +, xib2nib}: let @@ -89,6 +90,8 @@ stdenv.mkDerivation { ln -s ${cctools}/bin/pagestuff ln -s ${cctools}/bin/ranlib ln -s ${cctools}/bin/redo_prebinding + + ln -s ${xib2nib}/bin/ibtool '' + # No point including the entire gcc closure if we don't already have it (if stdenv.cc.isClang then '' diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix new file mode 100644 index 000000000000..d585a35b0bc5 --- /dev/null +++ b/pkgs/development/tools/xib2nib/default.nix @@ -0,0 +1,22 @@ +{ stdenv, callPackage, fetchFromGitHub, pugixml, boost, PlistCpp }: + +stdenv.mkDerivation { + name = "xib2nib-730e177"; + + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "xib2nib"; + rev = "97c6a53aab83d919805efcae33cf80690e953d1e"; + sha256 = "08442f4xg7racknj35nr56a4c62gvdgdw55pssbkn2qq0rfzziqq"; + }; + + buildInputs = [ PlistCpp pugixml boost ]; + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ matthewbauer ]; + description = "Compiles CocoaTouch .xib files into .nib"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 27ffcf2e742e..649d69c6fe67 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + makeFlags = [ "DESTDIR=$(out)" ]; + postInstall = '' mkdir -p $out/share/exult/music diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 125566b8428c..1fbf5a9dd1aa 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -63,6 +63,7 @@ in buildFHSUserEnv rec { libdrm mono xorg.xkeyboardconfig + xlibs.libpciaccess (steamPackages.steam-runtime-wrapped.override { inherit nativeOnly runtimeOnly newStdcpp; diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 5cf55535db1b..6274a91625fa 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -50,7 +50,6 @@ let # Verified games requirements xlibs.libXmu xlibs.libxcb - xlibs.libpciaccess mesa_glu libuuid libogg diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 4419d8025a87..c38756bc48a3 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -31,15 +31,15 @@ in rec { }; unstable = fetchurl rec { - version = "2.4"; + version = "2.5"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "13klfadvd44zdfrzh38al99s53i02x3mlhcj5z7fq7vqwh3xzdc7"; + sha256 = "1lnc7dnhvm1ir1hrjmihx9r47bc8wr8rhlf6pfm3lcl3nix2py8k"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "052s4y7d8lw2k0hk17zwz9bgbsl013g8953ad001y2kqjxwcnilh"; + sha256 = "1l0sjbsajr4m7w3ar2ljwr3ffmwyv57g85a068ard3v8fv4nil22"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 90559742057f..f818962b8ae0 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -647,11 +647,11 @@ rec { }; vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2017-03-29"; + name = "vim-elixir-2017-04-13"; src = fetchgit { url = "https://github.com/elixir-lang/vim-elixir"; - rev = "9482415ab27fddf8125524f54d9e500bb9541756"; - sha256 = "1layanqayf2arg8cvpsx768p544znwsvwispnk01d0c73d2p5llq"; + rev = "8781ff7c675d0cbfb4859f91698365c2eecf3205"; + sha256 = "0990qbzs2cn3k07xrn4xcczl7kpapygpa0ypkwpgxamyk0lgjlr8"; }; dependencies = []; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 92c54d9b679e..ea5aac60ab95 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -76,7 +76,11 @@ appleDerivation rec { /usr/lib/libSystem.dylib \ -reexported_symbols_list ${./system_symbols} - libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }') + # We used to determine these impurely based on the host system, but then when we got some 10.12 Hydra boxes, + # one of them accidentally built this derivation, referenced libsystem_symptoms.dylib, which doesn't exist on + # 10.11, and then broke all subsequent builds on 10.11. By picking a 10.11 compatible subset of the libraries, + # we avoid scary impurity issues like that. + libs=$(cat ${./reexported_libraries} | grep -v '^#') for i in $libs; do if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries new file mode 100644 index 000000000000..00aaba1d4982 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries @@ -0,0 +1,41 @@ +# These are generated with otool -L /usr/lib/libSystem.dylib on a 10.11 machine +/usr/lib/system/libcache.dylib +/usr/lib/system/libcommonCrypto.dylib +/usr/lib/system/libcompiler_rt.dylib +/usr/lib/system/libcopyfile.dylib +/usr/lib/system/libcorecrypto.dylib +/usr/lib/system/libdispatch.dylib +/usr/lib/system/libdyld.dylib +/usr/lib/system/libkeymgr.dylib +/usr/lib/system/liblaunch.dylib +/usr/lib/system/libmacho.dylib +/usr/lib/system/libquarantine.dylib +/usr/lib/system/libremovefile.dylib +/usr/lib/system/libsystem_asl.dylib +/usr/lib/system/libsystem_blocks.dylib + +# We handle this specially in the expression +# /usr/lib/system/libsystem_c.dylib + +/usr/lib/system/libsystem_configuration.dylib +/usr/lib/system/libsystem_coreservices.dylib +/usr/lib/system/libsystem_coretls.dylib +/usr/lib/system/libsystem_dnssd.dylib +/usr/lib/system/libsystem_info.dylib + +# We handle this specially in the expression +# /usr/lib/system/libsystem_kernel.dylib + +/usr/lib/system/libsystem_m.dylib +/usr/lib/system/libsystem_malloc.dylib +/usr/lib/system/libsystem_network.dylib +/usr/lib/system/libsystem_networkextension.dylib +/usr/lib/system/libsystem_notify.dylib +/usr/lib/system/libsystem_platform.dylib +/usr/lib/system/libsystem_pthread.dylib +/usr/lib/system/libsystem_sandbox.dylib +/usr/lib/system/libsystem_secinit.dylib +/usr/lib/system/libsystem_trace.dylib +/usr/lib/system/libunc.dylib +/usr/lib/system/libunwind.dylib +/usr/lib/system/libxpc.dylib diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch deleted file mode 100644 index 9aae2be1d033..000000000000 --- a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp -index 09c0e12..ac6b085 100644 ---- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp -+++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp -@@ -187,6 +187,7 @@ struct DynamicLibrary { - ld::File::ObjcConstraint _objcConstraint; - Options::Platform _platform; - std::vector<Token> _allowedClients; -+ std::vector<Token> _allowableClients; - std::vector<Token> _reexportedLibraries; - std::vector<Token> _symbols; - std::vector<Token> _classes; -@@ -246,6 +247,14 @@ class TBDFile { - }); - } - -+ void parseAllowableClients(DynamicLibrary& lib) { -+ if ( !hasOptionalToken("allowable-clients") ) -+ return; -+ parseFlowSequence([&](Token name) { -+ lib._allowableClients.emplace_back(name); -+ }); -+ } -+ - void parseReexportedDylibs(DynamicLibrary& lib) { - if ( !hasOptionalToken("re-exports") ) - return; -@@ -306,6 +315,21 @@ class TBDFile { - return false; - } - -+ void skipUUIDs(DynamicLibrary& lib) { -+ expectToken("uuids"); -+ while ( true ) { -+ auto token = next(); -+ if ( token == "]" ) -+ break; -+ } -+ } -+ -+ void skipParentUmbrella(DynamicLibrary& lib) { -+ if (!hasOptionalToken("parent-umbrella")) -+ return; -+ next(); -+ } -+ - void parsePlatform(DynamicLibrary& lib) { - expectToken("platform"); - -@@ -410,6 +434,7 @@ class TBDFile { - } - - parseAllowedClients(lib); -+ parseAllowableClients(lib); - parseReexportedDylibs(lib); - parseSymbols(lib); - if ( !hasOptionalToken("-") ) -@@ -455,17 +480,21 @@ class TBDFile { - return result.front(); - } - -- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) { -+ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) { - auto selectedArchName = parseAndSelectArchitecture(requestedArchName); - if (selectedArchName.empty()) - throwf("invalid arch"); - -+ if(isTbdV2) -+ skipUUIDs(lib); - parsePlatform(lib); - parseInstallName(lib); - parseCurrentVersion(lib); - parseCompatibilityVersion(lib); - parseSwiftVersion(lib); - parseObjCConstraint(lib); -+ if(isTbdV2) -+ skipParentUmbrella(lib); - parseExportsBlock(lib, selectedArchName); - } - -@@ -476,7 +505,8 @@ public: - _tokenizer.reset(); - DynamicLibrary lib; - expectToken("---"); -- parseDocument(lib, requestedArchName); -+ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2"); -+ parseDocument(lib, requestedArchName, isTbdV2); - expectToken("..."); - return lib; - } -@@ -486,6 +516,7 @@ public: - auto token = next(); - if ( token != "---" ) - return false; -+ hasOptionalToken("!tapi-tbd-v2"); - return !parseAndSelectArchitecture(requestedArchName).empty(); - } - diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 202426e78726..0154d395216f 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -6,13 +6,13 @@ let baseParams = rec { name = "cctools-port-${version}"; - version = "886"; + version = "895"; src = fetchFromGitHub { owner = "tpoechtrager"; repo = "cctools-port"; - rev = "02f0b8ecd87a3951653d838a321ae744815e21a5"; - sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1"; + rev = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2 + sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52"; }; buildInputs = [ autoconf automake libtool_2 libuuid ] ++ @@ -22,10 +22,6 @@ let patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed. - ./undo-unknown-triple.patch - ./ld-tbd-v2.patch ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch deleted file mode 100644 index 7df9bdd16dab..000000000000 --- a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/cctools/as/driver.c b/cctools/as/driver.c -index b06d085..c03397a 100644 ---- a/cctools/as/driver.c -+++ b/cctools/as/driver.c -@@ -363,12 +363,6 @@ char **envp) - /* Add -c or clang will run ld(1). */ - new_argv[j] = "-c"; - j++; -- /* cctools-port start */ -- new_argv[j] = "-target"; -- j++; -- new_argv[j] = "unknown-apple-darwin"; -- j++; -- /* cctools-port end */ - new_argv[j] = NULL; - if(execute(new_argv, verbose)) - exit(0); diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix deleted file mode 100644 index 581eb31cc71c..000000000000 --- a/pkgs/os-specific/darwin/install_name_tool/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv }: - -assert stdenv.isDarwin; - -stdenv.mkDerivation { - name = "install_name_tool"; - src = "/usr/bin/install_name_tool"; - - unpackPhase = "true"; - dontBuild = true; - - installPhase = '' - mkdir -p "$out"/bin - ln -s "$src" "$out"/bin - ''; - - meta = with stdenv.lib; { - description = "Change dynamic shared library install names"; - homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/Manpages/man1/install_name_tool.1.html; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.darwin; - - longDescription = '' - Install_name_tool changes the dynamic shared library install names and or - adds, changes or deletes the rpaths recorded in a Mach-O binary. - ''; - }; -} - diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index c2e3fa4b9e1f..ab1a93b3a703 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -1,14 +1,10 @@ { stdenv, lib, fetchurl, kernel, perl, makeWrapper }: -# BLCR 0.8.5 should works for kernel version up to 3.7.1 -# BLCR 0.8.6 should works for kernel version up to 3.17.x +# BLCR version 0.8.6 should works with linux kernel up to version 3.17.x assert stdenv.isLinux; assert builtins.compareVersions "3.18" kernel.version == 1; -# it doesn't compile anymore on 3.12 -assert lib.versionAtLeast kernel.version "3.14"; - stdenv.mkDerivation { name = "blcr_${kernel.version}-0.8.6pre4"; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index c548b55105de..cb65b9d8403c 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation { ./gcc.patch (fetchpatch { name = "linux-4.8.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/004-linux48.patch?h=broadcom-wl-dkms"; - sha256 = "1g1gazxx67kxyw242cli6bf62il7ikzmf0w6v14k44j6b4bihcax"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms&id=8c6d80fc77eb20cbb4fd0eca71fa8a03b9447c3f"; + sha256 = "0b963540gaj06q6ynfg47z8k5y3k2503yahbwawclfq4cxhl472a"; }) ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 39c19ceeff7d..2c4dbc7d20fa 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -123,6 +123,7 @@ with stdenv.lib; ${optionalString (versionOlder version "3.13") '' IPV6_PRIVACY y ''} + NETFILTER y NETFILTER_ADVANCED y IP_ROUTE_VERBOSE y IP_MROUTE_MULTIPLE_TABLES y diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix index 252eb2498cc8..e24cb7ae38b5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.10.9"; + version = "4.10.10"; extraMeta.branch = "4.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1y8cpwhkcb8lsryiyqqr1w58snw26x3x6c4f9v1xnh9grz0s4j6h"; + sha256 = "0hbzbzykay1yyrqz06lx9rwhf1xzzjs21i561gi4fjkm1bazv8l4"; }; 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 718c76b8dfa1..c059a7708184 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, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.60"; + version = "4.4.61"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "18r0m991q62gy5i7gkkpyhz65h2d9z4x9qpys5f2i78smq2yk67f"; + sha256 = "1nii9a6sp6lfkj94m2ia8vzb5kmk0r4nzsm4xf283b8m8qbfgpih"; }; 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 6e36ab81aa53..ff022201c8b6 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, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.21"; + version = "4.9.22"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "093cbrzdpj9f3ddxh2p1n05lrrs8yc6hh9jibbjv75vrpx4kfl4p"; + sha256 = "0sh3p14y50f14m4m5pz2nvr48xgk8qr8zdhzgxi1143af1c1rnyv"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index 7df48850fd12..779a80208d15 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.21"; + version = "4.9.22"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha512 = "1l1m23qdcz4pqnawq2xxiw8pwapgf84ggvb16696qfsh36dhwr62hmg0k5vip2c7yp74dls2gw9qcwhgv9dp7ki74xhzbhpv3148fjd"; + sha512 = "1hnbadbfvsqsdp7rd1zy07wi3wvryfr0cibk7jq0f35zfkpf4qyry9l1p28kca64p6zg2qb2arnr2p2qgbpx8dzsnwq6q072qddq4hg"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index f56b1df61841..932c6602842e 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.11-rc5"; - modDirVersion = "4.11.0-rc5"; + version = "4.11-rc7"; + modDirVersion = "4.11.0-rc7"; extraMeta.branch = "4.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0qmb8sssh4f4zhvasy20k30r8cwc03qm5ql3b25cj16cn3frp0q7"; + sha256 = "0zifawlrc62gsqmg91858wxx7vbpz0drjbhzmmbpplj3j7pdlly5"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 0a3b51a4e6e9..2f0073ef25fa 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -100,9 +100,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.9.21"; - grrev = "201704091948"; - sha512 = "1pa9vchnii319w3jarp4aclyjpwpk2s3ddi9facvy0r148xxqsl30hk2l0ihb9wwr9pz5a8l2z85skkkp65hpaz6fr9wmy9d1lb1hwh"; + { kver = "4.9.22"; + grrev = "201704120836"; + sha512 = "3320r4myn9y5wf2i2aybl1aapcl9sms0z6p343xh5x0pvaphsjhksnh7cndrq0qxc7fqdwzh9nw1vf84qy02cg5nf8bq025jpkfp7qh"; }; # This patch relaxes grsec constraints on the location of usermode helpers, diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 138130fa82e4..5d0dca7b6bec 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, xz, zlib, pkgconfig, libxslt }: +{ stdenv, buildPackages, lib, fetchurl, autoreconfHook, pkgconfig, libxslt, xz }: let systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ]; @@ -14,13 +14,14 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; - buildInputs = [ xz /* zlib */ ]; + buildInputs = [ xz ]; + # HACK until BUG issue #21191 is addressed + crossAttrs.preUnpack = ''PATH="${buildPackages.xz}/bin''${PATH:+:}$PATH"''; configureFlags = [ "--sysconfdir=/etc" "--with-xz" "--with-modulesdirs=${modulesDirs}" - # "--with-zlib" ]; patches = [ ./module-dir.patch ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f04ff107ea66..f5e849e95e11 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,11 +22,11 @@ in }; legacy_340 = generic { - version = "340.101"; - sha256_32bit = "0qmhkvxj6h63sayys9gldpafw5skpv8nsm2gxxb3pxcv7nfdlpjz"; - sha256_64bit = "02k8j0xzxp2y4vay0kf982q382ny1i4g1kai93f2h5sak6sq3kyj"; - settingsSha256 = "1mavbhff24n0jn154af152fp04njd505scdlxdm850h1ycb2i3g9"; - persistencedSha256 = "1396bmmg9b1z805dzljgi2f219ji84wfnnifdbk32dpd5mrywjk0"; + version = "340.102"; + sha256_32bit = "0a484i37j00d0rc60q0bp6fd2wfrx2c4r32di9w5svqgmrfkvcb1"; + sha256_64bit = "0nnz51d48a5fpnnmlz1znjp937k3nshdq46fw1qm8h00dkrd55ib"; + settingsSha256 = "0nm5c06b09p6wsxpyfaqrzsnal3p1047lk6p4p2a0vksb7id9598"; + persistencedSha256 = "1jwmggbph9zd8fj4syihldp2a5bxff7q1i2l9c55xz8cvk0rx08i"; useGLVND = false; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/fs52243.patch b/pkgs/os-specific/linux/nvidia-x11/fs52243.patch new file mode 100644 index 000000000000..212df64fa615 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/fs52243.patch @@ -0,0 +1,14 @@ +--- a/kernel/nv-drm.c ++++ b/kernel/nv-drm.c +@@ -115,7 +115,11 @@ + }; + + static struct drm_driver nv_drm_driver = { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) ++ .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY, ++#else + .driver_features = DRIVER_GEM | DRIVER_PRIME, ++#endif + .load = nv_drm_load, + .unload = nv_drm_unload, + .fops = &nv_drm_fops, diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index d6d1daaf3ceb..9441ce772c83 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -8,7 +8,7 @@ , preferGtk2 ? false }: -{ stdenv, callPackage, callPackage_i686, buildEnv, fetchurl +{ stdenv, callPackage, callPackage_i686, fetchurl , kernel ? null, xorg, zlib, perl, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -43,8 +43,20 @@ let else throw "nvidia-x11 does not support platform ${stdenv.system}"; # patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10 - patches = if libsOnly || versionOlder version "375" + patches = if libsOnly then null + else if versionOlder version "340" + then null + else if versionOlder version "375" + then [ + (fetchurl { + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/4.10.0_kernel.patch?h=packages/nvidia-340xx; + sha256 = "08k2phr9kawg6a3v88d4zkj7gdlih29gm5a1gmhpgmvd926k0z5l"; + }) + # from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx + # with datestamps removed + ./fs52243.patch + ] else [ (fetchurl { url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia; sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z"; }) ]; diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index afe1a4388600..c52dfbe461ae 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, ncurses }: -stdenv.mkDerivation { - name = "procps-3.3.11"; +stdenv.mkDerivation rec { + name = "procps-${version}"; + version = "3.3.12"; src = fetchurl { - url = mirror://sourceforge/procps-ng/procps-ng-3.3.11.tar.xz; - sha256 = "1va4n0mpsq327ca9dqp4hnrpgs6821rp0f2m0jyc1bfjl9lk2jg9"; + url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz"; + sha256 = "1m57w6jmry84njd5sgk5afycbglql0al80grx027kwqqcfw5mmkf"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index b23da5451d1c..27a0d301acf9 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { stdenv.cc.cc ]; - postInstall = '' + postInstall = optionalString (!stdenv.isDarwin) '' patchelf --set-rpath "$libPath" "$out/bin/sysdig" patchelf --set-rpath "$libPath" "$out/bin/csysdig" '' + optionalString (kernel != null) '' diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 68966dd03998..641fb046c6d0 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18"; let name = "wireguard-${version}"; - version = "0.0.20170324"; + version = "0.0.20170409"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "2ec08a5d74cb3a63576f06d3cae695b6b8995acd9665e2fa4da91927b467ca51"; + sha256 = "065vxxvdsnxk9paqbafi0c622b4qayfh3ps6zzb853qp2i6kniri"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix new file mode 100644 index 000000000000..9249d7cc347d --- /dev/null +++ b/pkgs/servers/cayley/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "cayley-${version}"; + version = "0.6.1"; + + goPackagePath = "github.com/cayleygraph/cayley"; + + src = fetchFromGitHub { + owner = "cayleygraph"; + repo = "cayley"; + rev = "v${version}"; + sha256 = "1r0kw3y32bqm7g37svzrch2qj9n45p93xmsrf7dj1cg4wwkb65ry"; + }; + + goDeps = ./deps.nix; + + buildFlagsArray = '' + -ldflags= + -X=main.Version=${version} + ''; + + meta = { + homepage = "https://cayley.io/"; + description = "A graph database inspired by Freebase and Knowledge Graph"; + maintainers = with stdenv.lib.maintainers; [ sigma ]; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/servers/cayley/deps.nix b/pkgs/servers/cayley/deps.nix new file mode 100644 index 000000000000..1e6fadf9f4d8 --- /dev/null +++ b/pkgs/servers/cayley/deps.nix @@ -0,0 +1,272 @@ +[ + { + goPackagePath = "github.com/badgerodon/peg"; + fetch = { + type = "git"; + url = "https://github.com/badgerodon/peg"; + rev = "9e5f7f4d07ca576562618c23e8abadda278b684f"; + sha256 = "12vd7hzdgknn8byz77lmvcrz9m5lvmffdnz2wwk83304przkra11"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "a705895fdad108f053eae7ee011ed94a0541ee13"; + sha256 = "0ql67l2hmjhplkl80j9a49qlra4qx671il5rgn58afkvk20cgq2r"; + }; + } + { + goPackagePath = "github.com/cznic/mathutil"; + fetch = { + type = "git"; + url = "https://github.com/cznic/mathutil"; + rev = "f9551431b78e71ee24939a1e9d8f49f43898b5cd"; + sha256 = "1158mlwzryyna1qslr9v88i0k8x6m8vs4rljnnwh04rmd63ksj75"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "2df174808ee097f90d259e432cc04442cf60be21"; + sha256 = "0jghd5dmwqpcjbxij9yjj8sjzll9s65i2qnxd8rdzwh77xdsfm9g"; + }; + } + { + goPackagePath = "github.com/dlclark/regexp2"; + fetch = { + type = "git"; + url = "https://github.com/dlclark/regexp2"; + rev = "4009c9dc49dd8906bfd4d479c255470d6a477ce5"; + sha256 = "1r6f0q1jvn1lkwqlrmmg5d90p6zss8s64jyp91hp6i97vpahq8xz"; + }; + } + { + goPackagePath = "github.com/dop251/goja"; + fetch = { + type = "git"; + url = "https://github.com/dop251/goja"; + rev = "64f863c4eb0329df18ecd1dab1e03609556bfaca"; + sha256 = "0smipfs7fja286nvlr7q4b8f815br0nia0k4xp8y5fvprrzrm64h"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "50d1bd39ce4e7a96b75e3e040be9caf79dbb4c61"; + sha256 = "09cad9j98pdqh1sp191j92ng6lvw9la3k3v6m5mv38nwirpwzra1"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "888eb0692c857ec880338addf316bd662d5e630e"; + sha256 = "1vhx2dwr71hma9z3dfb3l1yrkjlry0glwxknxzyp9ds51i6pjiq0"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "ad28ea4487f05916463e2423a55166280e8254b5"; + sha256 = "0xw0qas3ixg8p2xh09hhc81km0mfn9lbnfgrdb309hzcwhmiyqjm"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "b59a38004596b696aca7aa2adccfa68760864d86"; + sha256 = "0j1w2fkcghyw3lcsc13lwf2zqar9xyni2g7fqp4aq8g08ii7paac"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "0dad96c0b94f8dee039aa40467f767467392a0af"; + sha256 = "06c38iy37251mh8jy9s8n97b01pjnqpq8ii77nnmqh1dsph37jz4"; + }; + } + { + goPackagePath = "github.com/linkeddata/gojsonld"; + fetch = { + type = "git"; + url = "https://github.com/linkeddata/gojsonld"; + rev = "a223ef39bb925d36d4c410d3e35b0e34e370cc31"; + sha256 = "1i3vl7gbkq2xl2wyv0kszj0x32vp8jw1cf0ngpdqdhdvnbfi1w7i"; + }; + } + { + goPackagePath = "github.com/pborman/uuid"; + fetch = { + type = "git"; + url = "https://github.com/pborman/uuid"; + rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; + sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner"; + rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced"; + sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; + sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; + }; + } + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "d1b4d8ef0e0e4b088c8328c95ca63ab9ebd8fc9d"; + sha256 = "0i31p3paz3n7qi2v1g77lm3cx2hssgwgcfpar4qc2vj7m4766884"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "17bb7999de6cfb791d4f8986cc00b3309b370cdb"; + sha256 = "1md0sjw69mj359cb4c8ghzllcbn2lnkvby1203wl0pf5wbyfvm5s"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "8e87604bec3c645a4eeaee97dfec9f25811ff20d"; + sha256 = "05b6yj23c3xx446kanhaj1l83av8676z7si8n1f4sqy2pp7s966v"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "08a8a7c27e3d058a8989316a850daad1c10bf4ab"; + sha256 = "1fbh1b42alvpbw87v0v2hanliaqp6fm4h9n7byk921mcv6dai8fl"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f390dcf405f7b83c997eac1b06768bb9f44dec18"; + sha256 = "1l3z0ggdcjspfmm6k9glmh52a9x50806k6yldxql73p4bpynsd9g"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/goleveldb"; + rev = "4875955338b0a434238a31165cb87255ab6e9e4a"; + sha256 = "0786j6kizrlskqz196ng4d13363d44whl849jcv1q07yab2nq40i"; + }; + } + { + goPackagePath = "github.com/syndtr/gosnappy"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/gosnappy"; + rev = "156a073208e131d7d2e212cb749feae7c339e846"; + sha256 = "08lf8smnp4imj5fkph9sbqzb4a5n191q9m6b2c5kamp19i9h2y6z"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "6a513affb38dc9788b449d59ffed099b8de18fa0"; + sha256 = "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8"; + sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5a42fa2464759cbb7ee0af9de00b54d69f09a29c"; + sha256 = "0far6mb2ikwzr7icn0yqi9ygl8kv2wsaasyprbqb9qapr0dqjw0s"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "4f7eeb5305a4ba1966344836ba4af9996b7b4e05"; + sha256 = "09pgvlk5ay3f0avi1bawpy8khi3rmkfl36l2yr3ryp8z12i9k2qj"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a"; + sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034"; + sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5"; + }; + } + { + goPackagePath = "github.com/dennwc/graphql"; + fetch = { + type = "git"; + url = "https://github.com/dennwc/graphql"; + rev = "fd5c4aa13f2119414084f229600de0d73f174436"; + sha256 = "11f9jwfc2j646732gkcjb332ih9fxh04j31zmhvqswx75gvk9wzs"; + }; + } +] diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 9e0de290143f..f88b82675da2 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.10"; + version = "3.2.12"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0qqqaxlmcy3nfygbfy1bjc188x8k461nckj1sxfvy6wiv6jjfc25"; + sha256 = "0vbb7ax3100djz6zl8vji04a1x3r9vrrgkar605sc2w9n1j1msp2"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index a9f3d74e99cb..388c355c3f7f 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.11.10"; - sha256 = "0gak6pcsn1m8fsz0g95z4b72nn12ivy35vlxrmagfcvnn2mkr2vp"; + version = "1.11.13"; + sha256 = "1lqm2ixld5b55s4i1yy5337c6ifp7jzjfsm51z49hagdz0g602rn"; }) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 2d5ad9e2742c..85ebb5a80431 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -24,13 +24,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.19.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "0dnlv2rgda94zlgwkpryjsypcf995l7zdp19d2xiq7zpd13x6yag"; + sha256 = "1ss89dd4xn80y0zafs6dc9c24ba1kxk20jhjvqbcbbng6mlynj9h"; }; patches = [ ./matrix-synapse.patch ]; @@ -41,6 +41,7 @@ in pythonPackages.buildPythonApplication rec { signedjson systemd twisted ujson unpaddedbase64 pyyaml matrix-angular-sdk bleach netaddr jinja2 psycopg2 psutil msgpack lxml matrix-synapse-ldap3 + phonenumbers jsonschema ]; # Checks fail because of Tox. diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock index ee425b6edf97..0d01c2271458 100644 --- a/pkgs/servers/monitoring/sensu/Gemfile.lock +++ b/pkgs/servers/monitoring/sensu/Gemfile.lock @@ -12,51 +12,54 @@ GEM em-worker (0.0.2) eventmachine eventmachine (1.2.2) - ffi (1.9.17) - oj (2.14.6) + ffi (1.9.18) + oj (2.18.1) parse-cron (0.1.4) - sensu (0.28.0) + sensu (0.29.0) em-http-server (= 0.1.8) eventmachine (= 1.2.2) parse-cron (= 0.1.4) sensu-extension (= 1.5.1) - sensu-extensions (= 1.7.1) - sensu-json (= 2.0.1) + sensu-extensions (= 1.9.0) + sensu-json (= 2.1.0) sensu-logger (= 1.2.1) - sensu-redis (= 2.1.0) - sensu-settings (= 9.9.0) + sensu-redis (= 2.1.1) + sensu-settings (= 10.0.0) sensu-spawn (= 2.2.1) sensu-transport (= 7.0.2) sensu-extension (1.5.1) eventmachine - sensu-extensions (1.7.1) + sensu-extensions (1.9.0) sensu-extension + sensu-extensions-check-dependencies (= 1.0.1) sensu-extensions-debug (= 1.0.0) sensu-extensions-json (= 1.0.0) - sensu-extensions-occurrences (= 1.1.0) + sensu-extensions-occurrences (= 1.2.0) sensu-extensions-only-check-output (= 1.0.0) sensu-extensions-ruby-hash (= 1.0.0) sensu-json (>= 1.1.0) sensu-logger sensu-settings + sensu-extensions-check-dependencies (1.0.1) + sensu-extension sensu-extensions-debug (1.0.0) sensu-extension sensu-extensions-json (1.0.0) sensu-extension - sensu-extensions-occurrences (1.1.0) + sensu-extensions-occurrences (1.2.0) sensu-extension sensu-extensions-only-check-output (1.0.0) sensu-extension sensu-extensions-ruby-hash (1.0.0) sensu-extension - sensu-json (2.0.1) - oj (= 2.14.6) + sensu-json (2.1.0) + oj (= 2.18.1) sensu-logger (1.2.1) eventmachine sensu-json - sensu-redis (2.1.0) + sensu-redis (2.1.1) eventmachine - sensu-settings (9.9.0) + sensu-settings (10.0.0) parse-cron sensu-json (>= 1.1.0) sensu-spawn (2.2.1) @@ -76,4 +79,4 @@ DEPENDENCIES sensu BUNDLED WITH - 1.14.4 + 1.14.6 diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix index 273496e2fb42..1df8d419cb63 100644 --- a/pkgs/servers/monitoring/sensu/gemset.nix +++ b/pkgs/servers/monitoring/sensu/gemset.nix @@ -50,18 +50,18 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7"; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; type = "gem"; }; - version = "1.9.17"; + version = "1.9.18"; }; oj = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0pa9vmbxivplphad4ddjy30ylbb3bi61y13vmwx4llz3svl8r8kk"; + sha256 = "147whmq8h2n04chskl3v4a132xhz5i6kk6vhnz83jwng4vihin5f"; type = "gem"; }; - version = "2.14.6"; + version = "2.18.1"; }; parse-cron = { source = { @@ -74,10 +74,10 @@ sensu = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1dbyc1wylg9ligr1slv60myhbzdbja96v3srb3xrirv6vl33npqx"; + sha256 = "0931qccqhwmvqf4jj3jwip25xwkg7rf1yxxpkdhiyi2yndyfb8x7"; type = "gem"; }; - version = "0.28.0"; + version = "0.29.0"; }; sensu-extension = { source = { @@ -90,10 +90,18 @@ sensu-extensions = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0axjqak7yhhznhs9f4q8km7ikha5khglwqsc33scck13hsvw9l6g"; + sha256 = "1r09mdbbnh5cg9yvqw78sxbhlb8xqld1vwbr4hsjw6k3x1xpnnr9"; type = "gem"; }; - version = "1.7.1"; + version = "1.9.0"; + }; + sensu-extensions-check-dependencies = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0clgvf2abvwz549f28ny3zd6q7z6y7m49i8pp91ll10jp1vsy4b2"; + type = "gem"; + }; + version = "1.0.1"; }; sensu-extensions-debug = { source = { @@ -114,10 +122,10 @@ sensu-extensions-occurrences = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xi9888gp3lz5fik1k32bc1c6sjp7rr551p8dr5i3hsm5ii7blja"; + sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; sensu-extensions-only-check-output = { source = { @@ -138,10 +146,10 @@ sensu-json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08bn8a5fscbhc9mcjg5avwjjbwxn28b48336bdxx87yng0wyafm4"; + sha256 = "02qkh86jddv7gha39vjx6g9hi7vkq7r433dr86bwmm9c7lqkgyl9"; type = "gem"; }; - version = "2.0.1"; + version = "2.1.0"; }; sensu-logger = { source = { @@ -154,18 +162,18 @@ sensu-redis = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10axrjg2q569bjdchpjsdillzszifkgkayaz390hnf876mssqwcg"; + sha256 = "1nqk2046g6nldpiqy40f805gms8r856v2zxm53j0c8ni03sgz2a3"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; sensu-settings = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0bs66zmhs7yrwywvfhbld051d83f3nypmk2rf8dfn19ijzk4ch9i"; + sha256 = "0fb3wgqll5cq5akgmqhx6vgjvmcpcjyx68qqs8hb106b07gdpmli"; type = "gem"; }; - version = "9.9.0"; + version = "10.0.0"; }; sensu-spawn = { source = { diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 122d5bd7dc9c..618bc17d0a76 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.3.3.3148"; - vsnHash = "b38628e"; - sha256 = "1dx8z27l1dwigr3ipcdzn25hnj0206255ihxh9rnh2qchrcqmb5y"; + version = "1.5.5.3634"; + vsnHash = "995f1dead"; + sha256 = "0zk2zv7r4mf582gfbv4ahxzl8pbspzkf3514qmqhhx2z4grng49h"; }; in stdenv.mkDerivation rec { @@ -36,7 +36,14 @@ in stdenv.mkDerivation rec { # Now we need to patch up the executables and libraries to work on Nix. # Side note: PLEASE don't put spaces in your binary names. This is stupid. - for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner" "Plex Script Host" "Plex Transcoder" "Plex Relay"; do + for bin in "Plex Media Server" \ + "Plex DLNA Server" \ + "Plex Media Scanner" \ + "Plex Media Server Tests" \ + "Plex Relay" \ + "Plex Script Host" \ + "Plex Transcoder" \ + "Plex Tuner Service" ; do patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin" done @@ -67,7 +74,7 @@ in stdenv.mkDerivation rec { homepage = http://plex.tv/; license = licenses.unfree; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice pjones ]; description = "Media / DLNA server"; longDescription = '' Plex is a media server which allows you to store your media and play it diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 446927745a90..a2b8a072fa29 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.535"; + version = "0.2.0.596"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "1ccvblklqn5iki7gc16bzzbwms28mv4kxzv1nwhlm9vf0cw4qxbr"; + sha256 = "0pcvd41ls90h12j0kfxn9yrcap5dhb22vjm87xa5pg031fca7xy0"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix index 9781414895b8..37471e9ce426 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix @@ -1,12 +1,12 @@ { busybox = import <nix/fetchurl.nix> { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/busybox; - sha256 = "03i90dwkly1j2a7i12qixkybjz2b24ixjrl7zsr17s1sv6m27zba"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/busybox; + sha256 = "00mxas5xg2j9n1g0q0nklr0dy87qqxk0jja5qz1yi7xl7zzsnpnw"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv5tel/bootstrap-tools.tar.xz; - sha256 = "1sikiydjlbv8v35fgjvr5swgvj6bc83gmrbjrhpi0hyzyfcinxbn"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/bootstrap-tools.tar.xz; + sha256 = "0fhiy9l3mbmlhpkby31c2s63bhjiqx25qqr3wdp8cb7fxz8ayx2f"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix index 76fe900b9ae9..447189756821 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix @@ -1,12 +1,12 @@ { busybox = import <nix/fetchurl.nix> { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/busybox; - sha256 = "1vl1nx7ccalp2w8d5ymj6i2vs0s9w80xvxpsxl2l24k5ibbspcy0"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/busybox; + sha256 = "06n8dy8y2v28yx9ws8x64wxrvn9pszgpd299hc90nv9x21m79jzd"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv6l/bootstrap-tools.tar.xz; - sha256 = "106f3r1ndl9h1cbxn44vwn3kkhgi8a937xx1v9n40zfx6dzzfv25"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/bootstrap-tools.tar.xz; + sha256 = "1gg2q3sw81vi65g1gmpvx0nnd6hxb76vlz73wfp292m90z1mym7f"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix index 91452d639c47..b97fd9967eae 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix @@ -1,12 +1,12 @@ { busybox = import <nix/fetchurl.nix> { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/busybox; - sha256 = "0kb439p37rzlascp6ldm4kwf5kwd6p3lv17c41zwj20wbv8sdilq"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/busybox; + sha256 = "187xwzsng5lpak1nanrk88y4mlydmrbhx6la00rrd6kjx376s565"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = http://nixos-arm.dezgeg.me/bootstrap-2016-07-20-33a1d8/armv7l/bootstrap-tools.tar.xz; - sha256 = "0h75xbpkyzhvmjzhj9i598p0cq60py7v0b8lryrvcqw7qjlbgrsd"; + url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/bootstrap-tools.tar.xz; + sha256 = "05ayki2kak3i5lw97qidd5h9jv00dmlhx9h7l771bj331yamyqdn"; }; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 1a762bd87c79..613edfafd954 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -221,8 +221,7 @@ rec { # GCC has certain things built in statically. See # pkgs/stdenv/linux/default.nix for the details. cp -d ${isl}/lib/libisl*.so* $out/lib - # Also this is needed since bzip2 uses a custom build system - # for native builds but autoconf (via a patch) for cross builds + cp -d ${bzip2.out}/lib/libbz2.so* $out/lib # Copy binutils. diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 42015a79a3e0..2ce73eb781d8 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -122,6 +122,8 @@ rec { cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib + cp -d ${bzip2.out}/lib/libbz2.so* $out/lib + # Copy binutils. for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils.out}/bin/$i $out/bin diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 7c410a1a4f4f..67bbb510b13d 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -7,23 +7,23 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stden stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "150.0.0"; + version = "151.0.0"; src = if stdenv.system == "i686-linux" then fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; - sha256 = "0zg6jnn93dq53glds4cghksyghb4d4z0i2h38na0r88mr8hzmx1l"; + sha256 = "1d1h6jiqs3grsb6c61v6dkb4l2qv6v8g7wbzgaqkmn09xdbaq40l"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz"; - sha256 = "1vbc360z2da3blwx51asw7jh0v0v6wsrv20z36yq0hccmljlh24w"; + sha256 = "05idf0g505s8diaz28ij9yqig2wwn43lyppfs483m7vnx5hk62j5"; } else fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; - sha256 = "1q66aap3qidfsa8gm13jff3dprx8qarhjkx5ib65439fy4zj0bca"; + sha256 = "01hf7pp1v57dxx6f2pz7j13fjdnrfp7gjmzjdlhlx4rnvxrd6i3f"; }; buildInputs = [python27 makeWrapper]; diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index bb2df52f84c5..3cfb9a05b2dc 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig , libjack2, alsaLib, libpulseaudio , faac, lame, libogg, libopus, libvorbis, libsamplerate }: diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix new file mode 100644 index 000000000000..e98667b8c04a --- /dev/null +++ b/pkgs/tools/audio/glyr/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake +, curl, glib, sqlite, pkgconfig }: + +stdenv.mkDerivation rec { + version = "1.0.10"; + name = "glyr-${version}"; + + src = fetchFromGitHub { + owner = "sahib"; + repo = "glyr"; + rev = "${version}"; + sha256 = "1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ sqlite glib curl ]; + + configurePhase = '' + cmake -DCMAKE_INSTALL_PREFIX=$out + ''; + + meta = with stdenv.lib; { + license = licenses.lgpl3; + description = "A music related metadata searchengine"; + homepage = https://github.com/sahib/glyr; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.linux; # TODO macOS would be possible + }; +} + + diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 3092bd840c4f..55ab89993c7c 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "xz-5.2.2"; + name = "xz-5.2.3"; src = fetchurl { url = "http://tukaani.org/xz/${name}.tar.bz2"; - sha256 = "1da071wyx921pyx3zkxlnbpp14p6km98pnp66mg1arwi9dxgbxbg"; + sha256 = "1ha08wxcldgcl81021x5nhknr47s1p95ljfkka4sqah5w5ns377x"; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/pkgs/tools/compression/zstdmt/default.nix b/pkgs/tools/compression/zstdmt/default.nix index 14dd4f21b2dc..5cf88e68c64b 100644 --- a/pkgs/tools/compression/zstdmt/default.nix +++ b/pkgs/tools/compression/zstdmt/default.nix @@ -17,9 +17,7 @@ stdenv.mkDerivation rec { zstd lz4 ]; - buildPhase = '' - make zstdmt lz4mt - ''; + makeFlags = [ "CC=cc" "zstdmt" "lz4mt" ]; installPhase = '' mkdir -p $out/bin/ diff --git a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch deleted file mode 100644 index e4903143f11c..000000000000 --- a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch +++ /dev/null @@ -1,157 +0,0 @@ -Copyright 2009-2016 Homebrew contributors. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -# Changes included in this patchset: -# 1) Explicitly use clang/clang++ in Makefile -# 2) __min() and __max() macros break bon_csv2html.cpp: "redefinition of 'min' as different kind of symbol" -# Remove the construct in favor of macro targets min()/max() provided by the library -# Files affected: port.h.in port.h duration.cpp bonnie++.cpp -# 3) Remove the #ifdef _LARGEFILE64_SOURCE macros which not only prohibits the intended functionality of -# splitting into 2 GB files for such filesystems but also incorrectly tests for it in the first place. -# The ideal fix would be to replace the AC_TRY_RUN() in configure.in if the fail code actually worked. -# Files affected: bonnie++.cp - -diff --git i/Makefile w/Makefile -index 4bb5103..8f7ed41 100644 ---- i/Makefile -+++ w/Makefile -@@ -10,8 +10,8 @@ eprefix=${prefix} - #MORE_WARNINGS=-Weffc++ - WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS) - CFLAGS=-O2 -DNDEBUG $(WFLAGS) $(MORECFLAGS) --CXX=g++ $(CFLAGS) --LINK=g++ -+CXX=clang++ $(CFLAGS) -+LINK=clang++ - THREAD_LFLAGS=-lpthread - - INSTALL=/usr/bin/install -c -diff --git i/bonnie++.cpp w/bonnie++.cpp -index 8c5a43a..8a4b3dc 100644 ---- i/bonnie++.cpp -+++ w/bonnie++.cpp -@@ -73,7 +73,7 @@ public: - void set_io_chunk_size(int size) - { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; } - void set_file_chunk_size(int size) -- { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; } -+ { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; } - - // Return the page-aligned version of the local buffer - char *buf() { return m_buf_pa; } -@@ -138,7 +138,7 @@ CGlobalItems::CGlobalItems(bool *exitFlag) - , m_buf(NULL) - , m_buf_pa(NULL) - { -- pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); -+ pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); - SetName("."); - } - -@@ -294,11 +294,7 @@ int main(int argc, char *argv[]) - { - char *sbuf = _strdup(optarg); - char *size = strtok(sbuf, ":"); --#ifdef _LARGEFILE64_SOURCE - file_size = size_from_str(size, "gt"); --#else -- file_size = size_from_str(size, "g"); --#endif - size = strtok(NULL, ""); - if(size) - { -@@ -384,17 +380,8 @@ int main(int argc, char *argv[]) - if(file_size % 1024 > 512) - file_size = file_size + 1024 - (file_size % 1024); - } --#ifndef _LARGEFILE64_SOURCE -- if(file_size == 2048) -- file_size = 2047; -- if(file_size > 2048) -- { -- fprintf(stderr, "Large File Support not present, can't do %dM.\n", file_size); -- usage(); -- } --#endif -- globals.byte_io_size = __min(file_size, globals.byte_io_size); -- globals.byte_io_size = __max(0, globals.byte_io_size); -+ globals.byte_io_size = min(file_size, globals.byte_io_size); -+ globals.byte_io_size = max(0, globals.byte_io_size); - - if(machine == NULL) - { -@@ -465,14 +452,6 @@ int main(int argc, char *argv[]) - && (directory_max_size < directory_min_size || directory_max_size < 0 - || directory_min_size < 0) ) - usage(); --#ifndef _LARGEFILE64_SOURCE -- if(file_size > (1 << (31 - 20 + globals.io_chunk_bits)) ) -- { -- fprintf(stderr -- , "The small chunk size and large IO size make this test impossible in 32bit.\n"); -- usage(); -- } --#endif - if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) ) - { - fprintf(stderr -diff --git i/duration.cpp w/duration.cpp -index efa3fd3..f943155 100644 ---- i/duration.cpp -+++ w/duration.cpp -@@ -38,7 +38,7 @@ double Duration_Base::stop() - getTime(&tv); - double ret; - ret = tv - m_start; -- m_max = __max(m_max, ret); -+ m_max = max(m_max, ret); - return ret; - } - -diff --git i/port.h w/port.h -index 8d53622..2e1f112 100644 ---- i/port.h -+++ w/port.h -@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE; - #endif - - typedef int FILE_TYPE; --#define __min min --#define __max max - typedef unsigned int UINT; - typedef unsigned long ULONG; - typedef const char * PCCHAR; -diff --git i/port.h.in w/port.h.in -index 69c8f24..8359d72 100644 ---- i/port.h.in -+++ w/port.h.in -@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE; - #endif - - typedef int FILE_TYPE; --#define __min min --#define __max max - typedef unsigned int UINT; - typedef unsigned long ULONG; - typedef const char * PCCHAR; diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix index 65a722c74084..c120073866d4 100644 --- a/pkgs/tools/filesystems/bonnie/default.nix +++ b/pkgs/tools/filesystems/bonnie/default.nix @@ -7,8 +7,6 @@ stdenv.mkDerivation rec { sha256 = "0vkl42rsrsy95fc1ykc6g8rsdbnpxayvdaihnnkly1fww1m3hyz2"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./bonnie-homebrew.patch; - enableParallelBuilding = true; meta = { diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 76df4f41257b..d6a4e83a533b 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { name = "dosfstools-${version}"; - version = "3.0.28"; + version = "4.1"; src = fetchFromGitHub { owner = "dosfstools"; repo = "dosfstools"; rev = "v${version}"; - sha256 = "0lqirpxcn8ml0anq8aqmaljfsji9h6mdzz0jrs0yqqfhgg90bkg2"; + sha256 = "1a2zn1655d5f1m6jp9vpn3bp8yfxhcmxx3mx23ai9hmxiydiykr1"; }; - makeFlags = "PREFIX=$(out)"; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + configureFlags = [ "--enable-compat-symlinks" ]; meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index acc3b5183fe1..d56c5e2ed9a7 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, autoreconfHook, libselinux, libuuid, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }: stdenv.mkDerivation rec { name = "f2fs-tools-${version}"; - version = "1.7.0"; + version = "1.8.0"; - src = fetchurl { - url = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/${name}.tar.gz"; - sha256 = "1m6bn1ibq0p53m0n97il91xqgjgn2pzlz74lb5bfzassx7159m1k"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; + rev = "refs/tags/v${version}"; + sha256 = "0mbpg6mng6jcm5vxq0ivhklgpkwvjbhjwgkhzxr50ln46h5kbd2f"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libselinux libuuid pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libselinux libuuid ]; meta = with stdenv.lib; { homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/"; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 70f9e29d0f5d..8b26f4ce3c83 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "icoutils-0.31.1"; + name = "icoutils-0.31.3"; src = fetchurl { url = "mirror://savannah/icoutils/${name}.tar.bz2"; - sha256 = "14rhd7p7v0rvxsfnrgxf5l4rl6n52h2aq09583glqpgjg0y9vqi6"; + sha256 = "d4651de8e3f9e28d24b5343a2b7564f49754e5fe7d211c5d4dd60dcd65c8a152"; }; buildInputs = [ makeWrapper libpng perl ]; diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix new file mode 100644 index 000000000000..9fd8711a3d08 --- /dev/null +++ b/pkgs/tools/misc/clac/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchFromGitHub}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "clac"; + version = "0.0.0.20170416"; + + src = fetchFromGitHub { + owner = "soveran"; + repo = "clac"; + rev = "828600b01e80166bc435d4d73506f0c3e16f2459"; + sha256 = "08fhhvjrc7rn5fjjdqlallr76m6ybj3wm5gx407jbgfbky0fj7mb"; + }; + + buildInputs = []; + makeFlags = ["PREFIX=$(out)"]; + + postInstall = '' + mkdir -p "$out/share/doc/${pname}" + cp README* LICENSE "$out/share/doc/${pname}" + ''; + + meta = { + inherit version; + description = "Interactive stack-based calculator"; + license = stdenv.lib.licenses.bsd2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/soveran/clac"; + }; +} diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 455937f3a67c..d87976cbc5e8 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ++ optional aclSupport acl.crossDrv ++ optional attrSupport attr.crossDrv ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ] - ++ optional (stdenv.ccCross.libc ? libiconv) + ++ optional (stdenv ? ccCross.libc.libiconv) stdenv.ccCross.libc.libiconv.crossDrv; # Prevents attempts of running 'help2man' on cross-built binaries. diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 84b074de6cc9..6001a785c7a3 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.16.4"; + version = "0.16.6"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0kq4j6q1xk17ryzzcb8s6l2zqsjkk75lrwalias9gwcriqs6k6yn"; + sha256 = "0nzjbm40c4w9d0d34s5qnr9jkrh1vkn508xl2lfwfvmnzsnb9xbn"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix index 170761078c9e..2f033c5b1c2b 100644 --- a/pkgs/tools/misc/fzf/deps.nix +++ b/pkgs/tools/misc/fzf/deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/junegunn/go-runewidth"; - rev = "63c378b851290989b19ca955468386485f118c65"; - sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d"; + rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50"; + sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "854ae91cdcbf914b499b1d7641d07859f3653481"; - sha256 = "19hj2nv2awc6zhpiapv8xv2yjdwfpxhvx5wnr99if6kg0y1ybsa7"; + rev = "abc5fa7ad02123a41f02bf1391c9760f7586e608"; + sha256 = "1kdfbz46jnpm2hip79db6jvw5m4z4vh7x7rr798mzqdn6fsad7jb"; }; } ] diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index d32ed0b0d837..9abfdea5f7b9 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib; platforms.linux ++ platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ sigma ]; }; } diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix new file mode 100644 index 000000000000..98489358738c --- /dev/null +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}: + +let + version = "0.92.1-unstable"; +in +stdenv.mkDerivation rec { + name = "osm2pgsql-${version}"; + + src = fetchgit { + url = "https://github.com/openstreetmap/osm2pgsql.git"; + rev = "2b72b2121e91b72b0db6911d65c5165ca46d9d66"; + # Still waiting on release after: + # https://github.com/openstreetmap/osm2pgsql/pull/684 + # https://github.com/openstreetmap/osm2pgsql/issues/634 + #rev = "refs/tags/${version}"; + sha256 = "1v6s863zsv9p2mni35gfamawj0xr2cv2p8a31z7sijf8m6fn0vpy"; + }; + nativeBuildInputs = [cmake]; + buildInputs = [expat proj bzip2 zlib boost postgresql lua]; + + meta = { + description = "OpenStreetMap data to PostgreSQL converter"; + version = "0.92.1-unstable"; + homepage = https://github.com/openstreetmap/osm2pgsql; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index de4c97731ef5..3d2666add420 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff -, tcl-8_5 }: +, tcl-8_5, darwin }: stdenv.mkDerivation rec { name = "rrdtool-1.6.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext perl libxml2 pango cairo groff ] - ++ stdenv.lib.optional stdenv.isDarwin tcl-8_5; + ++ stdenv.lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ]; postInstall = '' # for munin and rrdtool support diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 3000aacafa38..3f2d81249d11 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,20 +1,14 @@ { stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }: -let version = "18"; in +let version = "19.1"; in stdenv.mkDerivation { name = "cjdns-"+version; src = fetchurl { url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz"; - sha256 = "1as7n730ppn93cpal7s6r6iq1qx46m0c45iwy8baypbpp42zxrap"; + sha256 = "53c568a500215b055a9894178eb4477bd93a6e1abf751d0bc5ef2a03ea01a188"; }; - patches = [(fetchpatch { - name = "glibc-2.25.diff"; - url = https://github.com/cjdelisle/cjdns/pull/1017.diff; - sha256 = "1k05d1w04lngcki56b6brkwg9xakzsbr5ibkcba8112v6jdzw51f"; - })]; - buildInputs = [ which python27 nodejs ] ++ # for flock stdenv.lib.optional stdenv.isLinux utillinux; diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index b1f726ad27d6..aeace91df191 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, zlib, enableStatic ? false, -sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: +{ stdenv, lib, fetchurl, glibc, zlib +, enableStatic ? false +, sftpPath ? "/run/current-system/sw/libexec/sftp-server" +}: stdenv.mkDerivation rec { name = "dropbear-2016.74"; @@ -11,7 +13,7 @@ stdenv.mkDerivation rec { dontDisableStatic = enableStatic; - configureFlags = stdenv.lib.optional enableStatic "LDFLAGS=-static"; + configureFlags = lib.optional enableStatic "LDFLAGS=-static"; CFLAGS = "-DSFTPSERVER_PATH=\\\"${sftpPath}\\\""; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { ./pass-path.patch ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] ++ lib.optionals enableStatic [ glibc.static zlib.static ]; meta = with stdenv.lib; { homepage = "http://matt.ucc.asn.au/dropbear/dropbear.html"; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index d6ae4a0e5a94..ae62195342f6 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "lftp-${version}"; - version = "4.7.6"; + version = "4.7.7"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.bz2" "http://lftp.yar.ru/ftp/old/${name}.tar.bz2" ]; - sha256 = "6b46389e9c2e67af9029a783806facea4c8f0b4d6adca5c1088e948d2fd68ae7"; + sha256 = "104jvzmvbmblfg8n8ffrnrrg8za5l25n53lbkawwy5x3m4h1yi7y"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 9933b512006f..ef539cbb51fd 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ pkgconfig libbsd ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libbsd ]; + sourceRoot = name; patches = [ "../debian/patches/*.patch" ]; diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index 70f3d7e9c70a..23cce602875a 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { unpackPhase = ":"; buildPhase = '' - gcc -O2 -o nuttcp $src + cc -O2 -o nuttcp $src ''; installPhase = '' diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1c66900c06b7..0bcb0baaab8b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam +{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false , withKerberos ? false @@ -12,17 +12,12 @@ assert withGssapiPatches -> withKerberos; let - hpnSrc = fetchurl { - url = mirror://sourceforge/hpnssh/openssh-6.6p1-hpnssh14v5.diff.gz; - sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950"; - }; - # **please** update this patch when you update to a new openssh release. gssapiSrc = fetchpatch { name = "openssh-gssapi.patch"; url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian" - + "/patches/gssapi.patch?id=255b8554a50b5c75fca63f76b1ac837c0d4fb7aa"; - sha256 = "0yg9iq7vb2fkvy36ar0jxk29pkw0h3dhv5vn8qncc3pgwx3617n2"; + + "/patches/gssapi.patch?id=a18d56bd84f04292ec9178b4b17ef6d56a0c7aef"; + sha256 = "1sb929lfc3s45km2vpylmlbb6mpqcbr74xl6gx2s4cgnsrfd9kp3"; }; in @@ -31,18 +26,18 @@ stdenv.mkDerivation rec { # Please ensure that openssh_with_kerberos still builds when # bumping the version here! name = "openssh-${version}"; - version = "7.4p1"; - - src = fetchurl { - url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv"; - }; - - prePatch = optionalString hpnSupport - '' - gunzip -c ${hpnSrc} | patch -p1 - export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" - ''; + version = "7.5p1"; + + src = if hpnSupport then + fetchurl { + url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_5_P1.tar.gz"; + sha256 = "1hasdcfjl6xf5nbbbvqyyq5v7ad10nywrq89j7naxz9wln58nhnn"; + } + else + fetchurl { + url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; + sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq"; + }; patches = [ @@ -55,7 +50,8 @@ stdenv.mkDerivation rec { ++ optional withGssapiPatches gssapiSrc; buildInputs = [ zlib openssl libedit pkgconfig pam ] - ++ optional withKerberos kerberos; + ++ optional withKerberos kerberos + ++ optional hpnSupport autoreconfHook; # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. @@ -94,6 +90,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ eelco aneeshusa ]; - broken = hpnSupport; # probably after 6.7 update }; } diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index f609c90ad504..a8f3a5a19ae7 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { sha256 = "0zpqnbhjaifdalyxwmvk5kcyd7cpxbcigbn7967nbsyvl54vl8vg"; }; - patches = optional stdenv.isLinux ./systemd-notify.patch; - buildInputs = [ lzo openssl pkgconfig ] ++ optionals stdenv.isLinux [ pam systemd iproute ] ++ optional pkcs11Support pkcs11helper; diff --git a/pkgs/tools/networking/openvpn/systemd-notify.patch b/pkgs/tools/networking/openvpn/systemd-notify.patch deleted file mode 100644 index c0ac8ae89d3c..000000000000 --- a/pkgs/tools/networking/openvpn/systemd-notify.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ru -x '*~' openvpn-2.3.1-orig/src/openvpn/init.c openvpn-2.3.1/src/openvpn/init.c ---- openvpn-2.3.1-orig/src/openvpn/init.c 2013-03-20 09:28:14.000000000 +0100 -+++ openvpn-2.3.1/src/openvpn/init.c 2014-04-22 13:02:21.351026640 +0200 -@@ -48,6 +48,8 @@ - - #include "occ-inline.h" - -+#include <systemd/sd-daemon.h> -+ - static struct context *static_context; /* GLOBAL */ - - /* -@@ -1375,6 +1375,9 @@ - /* Reset the unsuccessful connection counter on complete initialisation */ - c->options.unsuccessful_attempts = 0; - -+ /* Tell systemd we're ready. */ -+ sd_notify(0, "READY=1"); -+ - /* If we delayed UID/GID downgrade or chroot, do it now */ - do_uid_gid_chroot (c, true); - diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 3be1d194d82b..8ccc924d9f6e 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "sivel"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "160m1liinbpbmjxi3cvdw5x3k9sb4j51ly92lynylpamcqcv8m83"; + sha256 = "13i7bvhvwv8h2lxnz9pfxq6jv915lb948d6xjiy5p7rqbki40ng2"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix new file mode 100644 index 000000000000..4a34e62322d2 --- /dev/null +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, zlib, openssl }: + +with rustPlatform; + +buildRustPackage rec { + name = "cargo-edit-${version}"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "killercup"; + repo = "cargo-edit"; + rev = "v${version}"; + sha256 = "16wvix2zkpzl1hhlsvd6mkps8fw5k4n2dvjk9m10gg27pixmiync"; + }; + + buildInputs = [ zlib openssl ]; + + depsSha256 = "1v7ir56j6biximnnhyvadd98azcj3i5hc8aky0am2nf0swq0jimq"; + + meta = with stdenv.lib; { + description = "A utility for managing cargo dependencies from the command line"; + homepage = https://github.com/killercup/cargo-edit; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ jb55 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 93463509b791..eaab261adef8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -16,7 +16,8 @@ let outputs = [ "out" "dev" "man" "doc" ]; nativeBuildInputs = - [ perl pkgconfig ] + [ pkgconfig ] + ++ lib.optionals (!lib.versionAtLeast version "1.12pre") [ perl ] ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ]; buildInputs = [ curl openssl sqlite xz ] @@ -43,12 +44,12 @@ let [ "--with-store-dir=${storeDir}" "--localstatedir=${stateDir}" "--sysconfdir=/etc" - "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" - "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" "--disable-init-state" "--enable-gc" ] - ++ lib.optional (!lib.versionAtLeast version "1.12pre") [ + ++ lib.optionals (!lib.versionAtLeast version "1.12pre") [ + "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" + "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" ]; @@ -97,38 +98,59 @@ let maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; + + passthru = { inherit fromGit; }; + }; + + perl-bindings = { nix }: stdenv.mkDerivation { + name = "nix-perl-" + nix.version; + + inherit (nix) src; + + postUnpack = "sourceRoot=$sourceRoot/perl"; + + nativeBuildInputs = + [ perl pkgconfig curl nix libsodium ] + ++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ]; + + configureFlags = + [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" + "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" + "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" + ]; }; in rec { nix = nixStable; - nixStable = common rec { + nixStable = (common rec { name = "nix-1.11.8"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67"; }; - # 1.11.8 doesn't yet have the patch to work on LLVM 4, so we patch it for now. Take this out once - # we move to a higher version. I'd pull the specific patch from upstream but it doesn't apply cleanly. + # Until 1.11.9 is released, we do this :) patchPhase = '' substituteInPlace src/libexpr/json-to-value.cc \ --replace 'std::less<Symbol>, gc_allocator<Value *>' \ 'std::less<Symbol>, gc_allocator<std::pair<const Symbol, Value *> >' + + sed -i '/if (settings.readOnlyMode) {/a curSchema = getSchema();' src/libstore/local-store.cc ''; - }; + }) // { perl-bindings = nixStable; }; - nixUnstable = lib.lowPrio (common rec { + nixUnstable = (lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre5122_c60715e"; + suffix = "pre5152_915f62fa"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5"; - sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p"; + rev = "915f62fa19790d8f826aeb4dd3d2bb5bde2f67e9"; + sha256 = "0mf7y7hvzw2x5dp482qy8774djr3vzcjaqq58cp82zdil8l7kwjd"; }; fromGit = true; - }); + })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 6c3a63119b06..78d815eb7c19 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, autoreconfHook }: +{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, binutils, autoreconfHook }: stdenv.mkDerivation rec { - name = "rpm-4.13.0-rc1"; + name = "rpm-${version}"; + version = "4.13.0.1"; src = fetchurl { - url = "http://www.rpm.org/releases/testing/rpm-4.13.0-rc1.tar.bz2"; - sha256 = "097mc0kkrf09c01hrgi71df7maahmvayfgsvspnxigvl3xysv8hp"; + url = "http://ftp.rpm.org/releases/rpm-4.13.x/rpm-${version}.tar.bz2"; + sha256 = "27fc7ba7d419622b1ce34d6507aa70b0808bc344021d298072a0c2ec165f9b0d"; }; outputs = [ "out" "dev" "man" ]; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements - propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive ]; + propagatedBuildInputs = [ popt elfutils nss db bzip2 libarchive binutils ]; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; @@ -25,6 +26,8 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; + patches = [ ./rpm-4.13.0.1-bfd-config.patch ]; + postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} @@ -43,6 +46,10 @@ stdenv.mkDerivation rec { for tool in ld nm objcopy objdump strip; do sed -i $out/lib/rpm/macros -e "s/^%__$tool.*/%__$tool $tool/" done + + # symlinks produced by build are incorrect + ln -sf $out/bin/{rpm,rpmquery} + ln -sf $out/bin/{rpm,rpmverify} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch new file mode 100644 index 000000000000..b8192b24f134 --- /dev/null +++ b/pkgs/tools/package-management/rpm/rpm-4.13.0.1-bfd-config.patch @@ -0,0 +1,11 @@ +diff -ru rpm-4.13.0.1/tools/sepdebugcrcfix.c rpm-4.13.0.1.new/tools/sepdebugcrcfix.c +--- rpm-4.13.0.1/tools/sepdebugcrcfix.c 2017-02-16 10:40:09.988649399 +0100 ++++ rpm-4.13.0.1.new/tools/sepdebugcrcfix.c 2017-04-15 00:02:21.151359876 +0200 +@@ -28,6 +28,7 @@ + #include <error.h> + #include <libelf.h> + #include <gelf.h> ++#include <config.h> + #include <bfd.h> + + #define _(x) x diff --git a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch index 74e466069d93..7acd7239b392 100644 --- a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch +++ b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch @@ -1,57 +1,11 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -251,23 +251,23 @@ - # ${CMAKE_SOURCE_DIR}/data/icons/48x48 - # ${CMAKE_SOURCE_DIR}/data/icons/128x128 - ${CMAKE_SOURCE_DIR}/data/icons/ -- DESTINATION usr/share/icons/ -+ DESTINATION share/icons/ - ) - - install(FILES - ${CMAKE_SOURCE_DIR}/data/nitrokey-app.desktop -- DESTINATION usr/share/applications -+ DESTINATION share/applications - ) - - install(FILES - ${CMAKE_SOURCE_DIR}/data/icons/hicolor/128x128/apps/nitrokey-app.png -- DESTINATION usr/share/pixmaps -+ DESTINATION share/pixmaps - ) - - # Install Nitrokey udev rules - install(FILES - ${CMAKE_SOURCE_DIR}/data/40-nitrokey.rules -- DESTINATION usr/lib/udev/rules.d -+ DESTINATION lib/udev/rules.d - ) - +@@ -273,7 +273,7 @@ # Install autocompletion scripts -@@ -278,7 +278,7 @@ - install(FILES - ${CMAKE_SOURCE_DIR}/po/de_DE/nitrokey-app.mo -- DESTINATION usr/share/locale/de_DE/LC_MESSAGES -+ DESTINATION share/locale/de_DE/LC_MESSAGES + ${CMAKE_SOURCE_DIR}/data/bash-autocomplete/nitrokey-app +- DESTINATION /etc/bash_completion.d ++ DESTINATION etc/bash_completion.d ) install(FILES -@@ -286,7 +286,7 @@ - ${CMAKE_SOURCE_DIR}/images/quit.png - ${CMAKE_SOURCE_DIR}/images/safe_zahlenkreis.png - ${CMAKE_SOURCE_DIR}/images/settings.png -- DESTINATION usr/share/nitrokey -+ DESTINATION share/nitrokey - ) - - ENDIF () # NOT WIN32 -@@ -299,7 +299,7 @@ - ${resources_ouput} - ) - --INSTALL(TARGETS nitrokey-app DESTINATION usr/bin) -+INSTALL(TARGETS nitrokey-app DESTINATION bin) - - TARGET_LINK_LIBRARIES(nitrokey-app - ${QT_LIBRARIES} diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 91d5e75272bc..5e1baa4f57bf 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -2,27 +2,29 @@ stdenv.mkDerivation rec { name = "nitrokey-app"; - version = "0.5.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "Nitrokey"; repo = "nitrokey-app"; rev = "v${version}"; - sha256 = "0acb2502r3wa0mry6h8sz1k16zaa4bgnhxwxqd1vd1y42xc6g9bw"; + sha256 = "1l5l4lwxmyd3jrafw19g12sfc42nd43sv7h7i4krqxnkk6gfx11q"; }; buildInputs = [ - cmake libusb1 - pkgconfig qt5.qtbase ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; patches = [ ./FixInstallDestination.patch ./HeaderPath.patch ]; cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO"; - meta = { + meta = with stdenv.lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; longDescription = '' The nitrokey-app provides a QT system tray widget with wich you can @@ -31,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/Nitrokey/nitrokey-app; repositories.git = https://github.com/Nitrokey/nitrokey-app.git; - license = stdenv.lib.licenses.gpl3; - maintainer = stdenv.lib.maintainers.kaiha; + license = licenses.gpl3; + maintainer = maintainers.kaiha; }; } diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 62f1a3a05dd0..83394d984ad7 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { sha256 = "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; + patches = [ ./set-correct-program-name-for-sleep.patch + ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch new file mode 100644 index 000000000000..782e06e20fd9 --- /dev/null +++ b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch @@ -0,0 +1,69 @@ +From 25b44e00ed5df8ffe2782d38ad5cd9f514379599 Mon Sep 17 00:00:00 2001 +From: "Andrew R. M" <andrewmiller237@gmail.com> +Date: Sat, 8 Apr 2017 13:50:01 -0400 +Subject: [PATCH] Patch the clip() function to work even when using + single-binary coreutils + +--- + src/password-store.sh | 4 ++-- + src/platform/cygwin.sh | 4 ++-- + src/platform/darwin.sh | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/password-store.sh b/src/password-store.sh +index 6a4172d..4dbd6b8 100755 +--- a/src/password-store.sh ++++ b/src/password-store.sh +@@ -155,11 +155,11 @@ clip() { + # variable. Specifically, it cannot store nulls nor (non-trivally) store + # trailing new lines. + local sleep_argv0="password store sleep on display $DISPLAY" +- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 ++ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 + local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | base64)" + echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard" + ( +- ( exec -a "$sleep_argv0" bash <<<"trap 'kill %1' TERM; sleep '$CLIP_TIME' & wait" ) ++ ( exec -a "$sleep_argv0" bash <(echo trap 'kill %1' TERM\; sleep "$CLIP_TIME & wait") ) + local now="$(xclip -o -selection "$X_SELECTION" | base64)" + [[ $now != $(echo -n "$1" | base64) ]] && before="$now" + +diff --git a/src/platform/cygwin.sh b/src/platform/cygwin.sh +index 6e5dd86..f3574c4 100644 +--- a/src/platform/cygwin.sh ++++ b/src/platform/cygwin.sh +@@ -3,11 +3,11 @@ + + clip() { + local sleep_argv0="password store sleep on display $DISPLAY" +- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 ++ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 + local before="$(base64 < /dev/clipboard)" + echo -n "$1" > /dev/clipboard + ( +- ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" ) ++ ( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") ) + local now="$(base64 < /dev/clipboard)" + [[ $now != $(echo -n "$1" | base64) ]] && before="$now" + echo "$before" | base64 -d > /dev/clipboard +diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh +index 86eb325..deb04c4 100644 +--- a/src/platform/darwin.sh ++++ b/src/platform/darwin.sh +@@ -3,11 +3,11 @@ + + clip() { + local sleep_argv0="password store sleep for user $(id -u)" +- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5 ++ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5 + local before="$(pbpaste | openssl base64)" + echo -n "$1" | pbcopy + ( +- ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" ) ++ ( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") ) + local now="$(pbpaste | openssl base64)" + [[ $now != $(echo -n "$1" | openssl base64) ]] && before="$now" + echo "$before" | openssl base64 -d | pbcopy +-- +2.12.2 + diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix index 7116d1777d6d..4cba1c7e6172 100644 --- a/pkgs/tools/security/pinentry-mac/default.nix +++ b/pkgs/tools/security/pinentry-mac/default.nix @@ -1,20 +1,22 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, fetchFromGitHub, xcbuild, libiconv, Cocoa, ncurses }: stdenv.mkDerivation rec { name = "pinentry-mac-0.9.4"; - src = fetchurl { - url = "https://github.com/GPGTools/pinentry-mac/archive/v0.9.4.tar.gz"; - sha256 = "037ebb010377d3a3879ae2a832cefc4513f5c397d7d887d7b86b4e5d9a628271"; + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "pinentry-mac"; + rev = "d60aa902644a1f0126ec50e79937423a3a7c3bc4"; + sha256 = "0xp4rdyj0mw6gg1z1wraggb1qlkjb5845mibrz3nj0l692da52nq"; }; - postPatch = '' - substituteInPlace ./Makefile --replace "xcodebuild" "/usr/bin/xcodebuild" - ''; + buildInputs = [ xcbuild libiconv Cocoa ncurses ]; + + dontUseXcbuild = true; installPhase = '' mkdir -p $out/Applications - mv build/Release/pinentry-mac.app $out/Applications + mv pinentry-mac-*/Build/Products/Release/pinentry-mac.app $out/Applications ''; passthru = { diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 9c2a42eeb5ae..40cee73dcd29 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { Logcheck helps spot problems and security violations in your logfiles automatically and will send the results to you by e-mail. Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. ''; - homepage = http://logcheck.org; + homepage = http://logcheck.alioth.debian.org/; license = licenses.gpl2; maintainers = [ maintainers.bluescreen303 ]; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix new file mode 100644 index 000000000000..38eadf40ae37 --- /dev/null +++ b/pkgs/tools/text/fanficfare/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, python27Packages }: + +python27Packages.buildPythonApplication rec { + version = "2.9.0"; + name = "fanficfare-${version}"; + nameprefix = ""; + + src = fetchurl { + url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; + sha256 = "781e9095d8152345a6106135e87c46eb306ff234b847de5073faca2f78544398"; + }; + + propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; + + meta = with stdenv.lib; { + description = "FanFicFare is a tool for making eBooks from fanfiction web sites"; + homepage = "https://github.com/JimmXinu/FanFicFare"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ lucas8 ]; + inherit version; + }; +} diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 271a89b784d9..3a504e9478ca 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -5,22 +5,23 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gawk-4.1.3"; + name = "gawk-4.1.4"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.xz"; - sha256 = "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3"; + sha256 = "0rn2mmjxm767zliqzd67j7h2ncjn4j0321c60y9fy3grs3i89qak"; }; # When we do build separate interactive version, it makes sense to always include man. outputs = [ "out" "info" ] ++ stdenv.lib.optional (!interactive) "man"; - doCheck = !( + # FIXME: 4.1.4 testsuite breaks when only C locales are available + doCheck = false /*!( stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1 || stdenv.isDarwin # XXX: `locale' segfaults || stdenv.isSunOS # XXX: `_backsmalls1' fails, locale stuff? || stdenv.isFreeBSD - ); + )*/; nativeBuildInputs = [ xz.bin ]; buildInputs = diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix index 75922a6c830c..8a066864d220 100644 --- a/pkgs/tools/text/patchutils/default.nix +++ b/pkgs/tools/text/patchutils/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "patchutils-0.3.3"; + name = "patchutils-0.3.4"; src = fetchurl { url = "http://cyberelk.net/tim/data/patchutils/stable/${name}.tar.xz"; - sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i"; + sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg"; }; - patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one - hardeningDisable = [ "format" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/patchutils/drop-comments.patch b/pkgs/tools/text/patchutils/drop-comments.patch deleted file mode 100644 index e02693a5683d..000000000000 --- a/pkgs/tools/text/patchutils/drop-comments.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 58987954647f51dc42fb13b7759923c6170dd905 Mon Sep 17 00:00:00 2001 -From: Tim Waugh <twaugh@redhat.com> -Date: Fri, 9 May 2014 16:23:27 +0100 -Subject: Make --clean drop comments after '@@' lines as well (trac #29). - - -diff --git a/Makefile.am b/Makefile.am -index 99ad2a3..f3c6dbc 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -198,6 +198,7 @@ TESTS = tests/newline1/run-test \ - tests/convert1/run-test \ - tests/convert2/run-test \ - tests/clean1/run-test \ -+ tests/clean2/run-test \ - tests/stdin/run-test - - # These ones don't work yet. -diff --git a/src/filterdiff.c b/src/filterdiff.c -index 383e72b..6ca2316 100644 ---- a/src/filterdiff.c -+++ b/src/filterdiff.c -@@ -2,7 +2,7 @@ - * filterdiff - extract (or exclude) a diff from a diff file - * lsdiff - show which files are modified by a patch - * grepdiff - show files modified by a patch containing a regexp -- * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011 Tim Waugh <twaugh@redhat.com> -+ * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011, 2013, 2014 Tim Waugh <twaugh@redhat.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -408,7 +408,8 @@ do_unified (FILE *f, char *header[2], int match, char **line, - " Hunk #%lu, %s", - hunknum, bestname); - -- fputs (trailing, output_to); -+ fputs (clean_comments ? "\n" : trailing, -+ output_to); - break; - case Before: - // Note the initial line number -diff --git a/tests/clean2/run-test b/tests/clean2/run-test -new file mode 100755 -index 0000000..42320df ---- /dev/null -+++ b/tests/clean2/run-test -@@ -0,0 +1,34 @@ -+#!/bin/sh -+ -+# This is a filterdiff(1) testcase. -+# Test: Make sure --clean removes hunk-level comments. -+ -+ -+. ${top_srcdir-.}/tests/common.sh -+ -+cat << EOF > diff -+non-diff line -+--- a/file1 -++++ b/file1 -+@@ -0,0 +1 @@ this is a hunk-level comment -++a -+EOF -+ -+${FILTERDIFF} --clean diff 2>errors >filtered || exit 1 -+[ -s errors ] && exit 1 -+ -+cat << EOF | cmp - filtered || exit 1 -+--- a/file1 -++++ b/file1 -+@@ -0,0 +1 @@ -++a -+EOF -+ -+${FILTERDIFF} --clean -x file1 diff 2>errors >filtered || exit 1 -+[ -s errors ] && exit 1 -+cat << EOF | cmp - filtered || exit 1 -+--- a/file1 -++++ b/file1 -+@@ -0,0 +1 @@ -++a -+EOF --- -cgit v0.10.1 - diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/tools/typesetting/lout/builder.sh index ec52adc225bc..cd3b9c67e3c9 100755 --- a/pkgs/tools/typesetting/lout/builder.sh +++ b/pkgs/tools/typesetting/lout/builder.sh @@ -39,6 +39,6 @@ cat makefile | \ > "$nixMakefile" && \ mkdir -p "$out/bin" && mkdir -p "$out/lib" \ mkdir -p "$out/man" && mkdir -p "$out/doc/lout" && \ -make -f "$nixMakefile" install installman && \ +make -f "$nixMakefile" CC=cc install installman && \ installDoc && \ fixupPhase diff --git a/pkgs/tools/video/atomicparsley/casts.patch b/pkgs/tools/video/atomicparsley/casts.patch deleted file mode 100644 index b70a3cbcf854..000000000000 --- a/pkgs/tools/video/atomicparsley/casts.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- AtomicParsley-source-0.9.0/AtomicParsley.cpp.orig 2015-03-13 15:38:16.817904490 -0600 -+++ AtomicParsley-source-0.9.0/AtomicParsley.cpp 2015-03-13 15:48:07.595273416 -0600 -@@ -1447,7 +1447,7 @@ - uint32_t atom_offsets = 0; - char* uuid_outfile = (char*)calloc(1, sizeof(char)*MAXPATHLEN+1); //malloc a new string because it may be a cli arg for a specific output path - if (output_path == NULL) { -- char* orig_suffix = strrchr(originating_file, '.'); -+ char* orig_suffix = strrchr((char*)originating_file, (int)'.'); - if (orig_suffix == NULL) { - fprintf(stdout, "AP warning: a file extension for the input file was not found.\n\tGlobbing onto original filename...\n"); - path_len = strlen(originating_file); -@@ -4464,7 +4464,7 @@ - void APar_DeriveNewPath(const char *filePath, char* temp_path, int output_type, const char* file_kind, char* forced_suffix, bool random_filename = true) { - char* suffix = NULL; - if (forced_suffix == NULL) { -- suffix = strrchr(filePath, '.'); -+ suffix = strrchr((char*)filePath, (int)'.'); - } else { - suffix = forced_suffix; - } -@@ -4480,7 +4480,7 @@ - memcpy(temp_path, filePath, base_len); - memcpy(temp_path + base_len, file_kind, strlen(file_kind)); - #else -- char* file_name = strrchr(filePath, '/'); -+ char* file_name = strrchr((char*)filePath, (int)'/'); - size_t file_name_len = strlen(file_name); - memcpy(temp_path, filePath, filepath_len-file_name_len+1); - memcpy(temp_path + strlen(temp_path), ".", 1); -@@ -5006,7 +5006,7 @@ - free_modified_name = true; - if (forced_suffix_type == FORCE_M4B_TYPE) { //using --stik Audiobook with --overWrite will change the original file's extension - uint16_t filename_len = strlen(m4aFile); -- char* suffix = strrchr(m4aFile, '.'); -+ char* suffix = strrchr((char*)m4aFile, (int)'.'); - memcpy(originating_file, m4aFile, filename_len+1 ); - memcpy(originating_file + (filename_len - strlen(suffix) ), ".m4b", 5 ); - } diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index b2eb53666181..701850758bcb 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,39 +1,32 @@ -{ stdenv, fetchurl, unzip, darwin }: +{ stdenv, fetchhg, autoreconfHook, zlib, darwin }: stdenv.mkDerivation rec { name = "atomicparsley-${version}"; - product = "AtomicParsley"; - version = "0.9.0"; + version = "0.9.6"; - src = fetchurl { - url = "mirror://sourceforge/atomicparsley/${product}-source-${version}.zip"; - sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e"; + src = fetchhg { + url = "https://bitbucket.org/wez/atomicparsley"; + sha256 = "05n4kbn91ps52h3wi1qb2jwygjsc01qzx4lgkv5mvwl5i49rj8fm"; }; - patches = stdenv.lib.optional (!stdenv.cc.isClang) ./casts.patch; + buildInputs = + [ autoreconfHook + zlib + ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - buildInputs = [ unzip ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - - setSourceRoot = "sourceRoot=${product}-source-${version}"; - - buildPhase = "bash build"; installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; - postPatch = '' - substituteInPlace build \ - --replace 'g++' 'c++' - substituteInPlace AP_NSImage.mm \ - --replace '_NSBitmapImageFileType' 'NSBitmapImageFileType' - ''; - meta = with stdenv.lib; { description = '' A lightweight command line program for reading, parsing and setting metadata into MPEG-4 files ''; - homepage = http://atomicparsley.sourceforge.net/; + longDescription = '' + This is a maintained fork of the original AtomicParsley. + ''; + + homepage = https://bitbucket.org/wez/atomicparsley; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ pjones ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9dca8e7e26cd..1046b86dbb44 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -62,6 +62,7 @@ doNotDisplayTwice rec { gnustep-make = gnustep.make; # added 2016-7-6 htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 + idea = jetbrains; # added 2017-04-03 inherit (haskell.compiler) jhc uhc; # 2015-05-15 inotifyTools = inotify-tools; joseki = apache-jena-fuseki; # added 2016-02-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11816f580dad..4033340df105 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -325,7 +325,7 @@ with pkgs; findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; wrapGAppsHook = makeSetupHook { - deps = [ gnome3.dconf.lib gnome3.gtk makeWrapper ]; + deps = [ gnome3.dconf.lib gnome3.gtk librsvg makeWrapper ]; } ../build-support/setup-hooks/wrap-gapps-hook.sh; separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; @@ -539,6 +539,8 @@ with pkgs; gcsfuse = callPackage ../tools/filesystems/gcsfuse { }; + glyr = callPackage ../tools/audio/glyr { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; pass = callPackage ../tools/security/pass { }; @@ -555,8 +557,6 @@ with pkgs; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; - install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; - xcodeenv = callPackage ../development/mobile/xcodeenv { }; titaniumenv = callPackage ../development/mobile/titaniumenv { @@ -654,6 +654,10 @@ with pkgs; blink = callPackage ../applications/networking/instant-messengers/blink { }; + quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; + + tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; + blink1-tool = callPackage ../tools/misc/blink1-tool { }; blitz = callPackage ../development/libraries/blitz { @@ -768,6 +772,8 @@ with pkgs; ckbcomp = callPackage ../tools/X11/ckbcomp { }; + clac = callPackage ../tools/misc/clac {}; + clasp = callPackage ../tools/misc/clasp { }; cli53 = callPackage ../tools/admin/cli53 { }; @@ -826,6 +832,8 @@ with pkgs; daemontools = callPackage ../tools/admin/daemontools { }; + dale = callPackage ../development/compilers/dale { }; + dante = callPackage ../servers/dante { }; datamash = callPackage ../tools/misc/datamash { }; @@ -940,6 +948,8 @@ with pkgs; gdrivefs = python27Packages.gdrivefs; + gdrive = callPackage ../applications/networking/gdrive { }; + go-dependency-manager = callPackage ../development/tools/gdm { }; gencfsm = callPackage ../tools/security/gencfsm { }; @@ -1717,6 +1727,8 @@ with pkgs; pillow; }; + fanficfare = callPackage ../tools/text/fanficfare { }; + fastd = callPackage ../tools/networking/fastd { }; fatsort = callPackage ../tools/filesystems/fatsort { }; @@ -2481,6 +2493,8 @@ with pkgs; jsduck = callPackage ../development/tools/jsduck { }; + jucipp = callPackage ../applications/editors/jucipp { }; + jwhois = callPackage ../tools/networking/jwhois { }; k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; @@ -3492,7 +3506,9 @@ with pkgs; libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_mac = callPackage ../tools/security/pinentry-mac { }; + pinentry_mac = callPackage ../tools/security/pinentry-mac { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; pingtcp = callPackage ../tools/networking/pingtcp { }; @@ -5085,7 +5101,7 @@ with pkgs; cross = null; libcCross = if targetPlatform != buildPlatform then libcCross else null; - isl = if !stdenv.isDarwin then isl_0_14 else null; + isl = isl_0_17; })); gfortran = gfortran5; @@ -5228,6 +5244,8 @@ with pkgs; all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { }; purescript = haskell.lib.justStaticExecutables haskellPackages.purescript; + psc-package = haskell.lib.justStaticExecutables + (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); inherit (ocamlPackages) haxe; @@ -5243,6 +5261,10 @@ with pkgs; fsharp = callPackage ../development/compilers/fsharp { }; + fsharp41 = callPackage ../development/compilers/fsharp41 { + mono = mono46; + }; + fstar = callPackage ../development/compilers/fstar { ocamlPackages = ocaml-ng.ocamlPackages_4_02; }; @@ -5576,6 +5598,8 @@ with pkgs; cargo = rust.cargo; rustc = rust.rustc; + cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + rustPlatform = recurseIntoAttrs (makeRustPlatform rust); makeRustPlatform = rust: lib.fix (self: @@ -5596,6 +5620,9 @@ with pkgs; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; + rustup = callPackage ../development/tools/rust/rustup { + inherit (darwin.apple_sdk.frameworks) Security; + }; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; @@ -6073,7 +6100,9 @@ with pkgs; pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); - pypi2nix = callPackage ../development/tools/pypi2nix { python = python35; }; + pypi2nix = callPackage ../development/tools/pypi2nix { + pythonPackages = python3Packages; + }; svg2tikz = python27Packages.svg2tikz; @@ -6401,8 +6430,12 @@ with pkgs; coan = callPackage ../development/tools/analysis/coan { }; + compile-daemon = callPackage ../development/tools/compile-daemon { }; + complexity = callPackage ../development/tools/misc/complexity { }; + conan = callPackage ../development/tools/build-managers/conan { }; + cookiecutter = pythonPackages.cookiecutter; ctags = callPackage ../development/tools/misc/ctags { }; @@ -7735,9 +7768,15 @@ with pkgs; gnutls = gnutls35; - gnutls35 = callPackage ../development/libraries/gnutls/3.5.nix { - guileBindings = config.gnutls.guile or false; - }; + gnutls35 = callPackage + (if stdenv.isDarwin + # Avoid > 3.5.10 due to frameworks for now; see discussion on: + # https://github.com/NixOS/nixpkgs/commit/d6454e6a1 + then ../development/libraries/gnutls/3.5.10.nix + else ../development/libraries/gnutls/3.5.nix) + { + guileBindings = config.gnutls.guile or false; + }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { guileBindings = config.gnutls.guile or false; @@ -7846,6 +7885,10 @@ with pkgs; gtk = gtk2; }; + gtk-mac-integration-gtk3 = callPackage ../development/libraries/gtk-mac-integration { + gtk = gtk3; + }; + gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {}; gtkspell2 = callPackage ../development/libraries/gtkspell { }; @@ -8059,9 +8102,7 @@ with pkgs; levmar = callPackage ../development/libraries/levmar { }; - leptonica = callPackage ../development/libraries/leptonica { - libpng = libpng12; - }; + leptonica = callPackage ../development/libraries/leptonica { }; lib3ds = callPackage ../development/libraries/lib3ds { }; @@ -9051,10 +9092,12 @@ with pkgs; in mo.drivers ); + # Please, avoid using this attribute. It was meant as transitional hack + # for packages that assume that libGLU and libGL live in the same prefix. + # Otherwise it's better to use mesa_glu or mesa_noglu, depending on whether + # you need libGLU or not (_glu propagates _noglu). mesa = mesaDarwinOr (buildEnv { name = "mesa-${mesa_noglu.version}"; - # FIXME: this causes mesa to have a runtime dependency on - # mesa_noglu.dev. paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu mesa_glu.dev ]; meta = { platforms = lib.platforms.unix; @@ -9261,7 +9304,7 @@ with pkgs; openslp = callPackage ../development/libraries/openslp {}; - libressl = libressl_2_4; + libressl = libressl_2_5; libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix { fetchurl = fetchurlBoot; }; @@ -9549,6 +9592,10 @@ with pkgs; libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; + libqtav = callPackage ../development/libraries/libqtav { + libva = libva-full; # also wants libva-x11 + }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { ffmpeg = ffmpeg_2; }; @@ -9697,6 +9744,8 @@ with pkgs; sad = callPackage ../applications/science/logic/sad { }; + safefile = callPackage ../development/libraries/safefile {}; + sbc = callPackage ../development/libraries/sbc { }; schroedinger = callPackage ../development/libraries/schroedinger { }; @@ -10579,6 +10628,8 @@ with pkgs; bosun = callPackage ../servers/monitoring/bosun { }; scollector = bosun; + cayley = callPackage ../servers/cayley { }; + charybdis = callPackage ../servers/irc/charybdis {}; couchdb = callPackage ../servers/http/couchdb { @@ -12431,6 +12482,8 @@ with pkgs; encode-sans = callPackage ../data/fonts/encode-sans { }; + envypn-font = callPackage ../data/fonts/envypn-font { }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; @@ -13714,7 +13767,7 @@ with pkgs; inherit (callPackages ../applications/networking/browsers/firefox { inherit (gnome2) libIDL; libpng = libpng_apng; - enableGTK3 = false; + enableGTK3 = true; python = python2; gnused = gnused_422; }) firefox-unwrapped firefox-esr-unwrapped; @@ -13756,15 +13809,15 @@ with pkgs; flac = callPackage ../applications/audio/flac { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer { - debug = config.flashplayer.debug or false; + debug = config.flashplayer.debug or false; }; flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix { - debug = config.flashplayer.debug or false; + debug = config.flashplayer.debug or false; }; flashplayer-standalone-debugger = flashplayer-standalone.override { - debug = true; + debug = true; }; fluxbox = callPackage ../applications/window-managers/fluxbox { }; @@ -13814,6 +13867,8 @@ with pkgs; getxbook = callPackage ../applications/misc/getxbook {}; + ghq = gitAndTools.ghq; + gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { inherit (gnome2) libart_lgpl; webkit = null; @@ -13892,7 +13947,7 @@ with pkgs; libart = pkgs.gnome2.libart_lgpl; }; - idea = recurseIntoAttrs (callPackages ../applications/editors/idea { androidsdk = androidsdk_extras; }); + jetbrains = recurseIntoAttrs (callPackages ../applications/editors/jetbrains { androidsdk = androidsdk_extras; }); libquvi = callPackage ../applications/video/quvi/library.nix { }; @@ -13985,7 +14040,9 @@ with pkgs; gosmore = callPackage ../applications/misc/gosmore { }; - gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; + gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { + inherit (darwin) IOKit; + }; gpscorrelate = callPackage ../applications/misc/gpscorrelate { }; @@ -14753,6 +14810,8 @@ with pkgs; oroborus = callPackage ../applications/window-managers/oroborus {}; + osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; + ostinato = callPackage ../applications/networking/ostinato { }; panamax_api = callPackage ../applications/networking/cluster/panamax/api { @@ -15689,6 +15748,7 @@ with pkgs; }; tesseract = callPackage ../applications/graphics/tesseract { }; + tesseract_4 = lowPrio (callPackage ../applications/graphics/tesseract/4.x.nix { }); tetraproc = callPackage ../applications/audio/tetraproc { }; @@ -15697,6 +15757,7 @@ with pkgs; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome2) libIDL; libpng = libpng_apng; + enableGTK3 = true; }; thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { @@ -17186,6 +17247,8 @@ with pkgs; bcftools = callPackage ../applications/science/biology/bcftools { }; + diamond = callPackage ../applications/science/biology/diamond { }; + ecopcr = callPackage ../applications/science/biology/ecopcr { }; emboss = callPackage ../applications/science/biology/emboss { }; @@ -18177,10 +18240,10 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_8_5 terraform_0_8_8 - terraform_0_9_2; + terraform_0_9_3; terraform_0_8 = terraform_0_8_8; - terraform_0_9 = terraform_0_9_2; + terraform_0_9 = terraform_0_9_3; terraform = terraform_0_9; terragrunt = callPackage ../applications/networking/cluster/terragrunt { @@ -18433,7 +18496,7 @@ with pkgs; discord = callPackage ../applications/networking/instant-messengers/discord { }; - golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = libsForQt56.callPackage ../applications/misc/golden-cheetah {}; linkchecker = callPackage ../tools/networking/linkchecker { }; @@ -18472,4 +18535,11 @@ with pkgs; ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {}; + + NSPlist = callPackage ../development/libraries/NSPlist {}; + + PlistCpp = callPackage ../development/libraries/PlistCpp {}; + + xib2nib = callPackage ../development/tools/xib2nib {}; + } diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 71f2326b9379..ac4c5eaac64c 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -46,6 +46,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net40/*" ]; }; + FSharpCore = fetchNuGet { + baseName = "FSharp.Core"; + version = "4.0.0.1"; + sha256 = "01nhjcxdz8l1r5vvdzhmgy5x7z5fqppab3ki34qg14axgf8jjygn"; + outputFiles = [ "*" ]; + }; + + FSharpData225 = fetchNuGet { + baseName = "FSharp.Data"; + version = "2.2.5"; + sha256 = "1c9l6bk0d2srccash2980y9phq3kmfm0m76k4wghnysnq94vm724"; + outputFiles = [ "*" ]; + }; + FSharpDataSQLProvider = fetchNuGet { baseName = "SQLProvider"; version = "0.0.9-alpha"; @@ -60,6 +74,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net45/*" ]; }; + FsCheck262 = fetchNuGet { + baseName = "FsCheck"; + version = "2.6.2"; + sha256 = "0fh9yvsc4i61z31qf00d6gjv6xxd54pv1ykf5bpv95a5crc3qfvl"; + outputFiles = [ "*" ]; + }; + FsCheckNunit = fetchNuGet { baseName = "FsCheck.Nunit"; version = "1.0.4"; @@ -67,6 +88,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net45/*" ]; }; + FSharpCompilerTools = fetchNuGet { + baseName = "FSharp.Compiler.Tools"; + version = "4.1.4"; + sha256 = "0vsp0khlnwh15ibg8s161rw6a6i8rlriclpq53paga447jllf0m8"; + outputFiles = [ "*" ]; + }; + FsLexYacc = fetchNuGet { baseName = "FsLexYacc"; version = "6.1.0"; @@ -74,6 +102,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "build/*" ]; }; + FsLexYacc704 = fetchNuGet { + baseName = "FsLexYacc"; + version = "7.0.4"; + sha256 = "01zpdb0pybdf0by02rwd7pb1g0cmnn8jxm2pibzxjxw6f4l43ywi"; + outputFiles = [ "*" ]; + }; + FsPickler = fetchNuGet { baseName = "FsPickler"; version = "1.2.9"; @@ -102,6 +137,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/*" ]; }; + NUnit350 = fetchNuGet { + baseName = "NUnit"; + version = "3.5.0"; + sha256 = "19fxq9cf754ygda5c8rn1zqs71pfxi7mb96jwqhlichnqih6i16z"; + outputFiles = [ "*" ]; + }; + NUnit2 = fetchNuGet { baseName = "NUnit"; version = "2.6.4"; @@ -153,6 +195,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "tools/*" ]; }; + SystemValueTuple = fetchNuGet { + baseName = "System.ValueTuple"; + version = "4.3.0"; + sha256 = "00p5s753xh5417arw3k6npf1pc1k3m1s9mrlkw5vmc7pg8lm6n88"; + outputFiles = [ "*" ]; + }; + RestSharp = fetchNuGet { baseName = "RestSharp"; version = "105.2.3"; @@ -195,6 +244,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/*" ]; }; + MicrosoftDiaSymReader = fetchNuGet { + baseName = "Microsoft.DiaSymReader"; + version = "1.1.0"; + sha256 = "04dgwy6nyxksd1nb24k5c5vz8naggg7hryadvwqnm2v3alkh6g88"; + outputFiles = [ "*" ]; + }; + + MicrosoftDiaSymReaderPortablePdb = fetchNuGet { + baseName = "Microsoft.DiaSymReader.PortablePdb"; + version = "1.2.0"; + sha256 = "0qa8sqg0lzz9galkkfyi8rkbkali0nxm3qd5y4dlxp96ngrq5ldz"; + outputFiles = [ "*" ]; + }; + NUnitRunners = fetchNuGet { baseName = "NUnit.Runners"; version = "2.6.4"; @@ -210,6 +273,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ]; }; + SystemCollectionsImmutable131 = fetchNuGet { + baseName = "System.Collections.Immutable"; + version = "1.3.1"; + sha256 = "149fcp7k7r9iw24dv5hbaij0c38kcv28dyhzbkggilfh4x2hy8c2"; + outputFiles = [ "*" ]; + }; + + SystemReflectionMetadata = fetchNuGet { + baseName = "System.Reflection.Metadata"; + version = "1.4.2"; + sha256 = "19fhdgd35yg52gyckhgwrphq07nv7v7r73hcg69ns94xfg1i6r7i"; + outputFiles = [ "*" ]; + }; + Suave = fetchNuGet { baseName = "Suave"; version = "0.29.0"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 74b00ad6ff2c..a3e0b3feaa9b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -118,6 +118,8 @@ in { }; }; + phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + agate-dbf = buildPythonPackage rec { name = "agate-dbf-0.1.0"; disabled = isPy3k; @@ -1625,11 +1627,11 @@ in { awscli = buildPythonPackage rec { name = "awscli-${version}"; - version = "1.11.45"; + version = "1.11.75"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/a/awscli/${name}.tar.gz"; - sha256 = "0sv9dw4zsra8fm7ddbnwhlh80w534z4h8llz2p8asssaaj5nq2ya"; + sha256 = "0bkjyrgb78f29vvr8j2id0386d30w340wrl7krwiha725c9y3pz1"; }; # No tests included @@ -2522,6 +2524,8 @@ in { doCheck = false; # lazy packager }; + csscompressor = callPackage ../development/python-modules/csscompressor.nix {}; + csvkit = buildPythonPackage rec { name = "csvkit-${version}"; version = "0.9.1"; @@ -2984,11 +2988,10 @@ in { to do lots of things, you're probably outside the use cases. Either trust those users, or don't. ''; - homepage = https://github.com/jsocol/bleach; - downloadPage = https://github.com/jsocol/bleach/releases; + homepage = https://github.com/mozilla/bleach; + downloadPage = https://github.com/mozilla/bleach/releases; license = licenses.asl20; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; }; }; @@ -3187,6 +3190,9 @@ in { runHook postCheck ''; + # Network access + doCheck = false; + meta = { homepage = https://github.com/boto/boto3; license = stdenv.lib.licenses.asl20; @@ -3200,11 +3206,11 @@ in { }; botocore = buildPythonPackage rec { - version = "1.5.8"; # This version is required by awscli + version = "1.5.38"; # This version is required by awscli name = "botocore-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/b/botocore/${name}.tar.gz"; - sha256 = "1qhrq2l9kvhi3gnrgwqhvy42aqbsk93j8mfr4ixqx18yqgbnylvz"; + sha256 = "04cvsi8g8p3r5vr3vr2nb5ldyrsm0y4c2phimabbpk33wv718qyx"; }; propagatedBuildInputs = @@ -7743,6 +7749,9 @@ in { }; }); + + htmlmin = callPackage ../development/python-modules/htmlmin.nix {}; + httpauth = buildPythonPackage rec { version = "0.3"; name = "httpauth-${version}"; @@ -10381,31 +10390,6 @@ in { }; }; - - django_1_7 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.7.11"; - disabled = pythonOlder "2.7"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz"; - sha256 = "18arf0zr98q2gxhimm2fgh0avwcdax1mcnps0cyn06wgrr7i8f90"; - }; - - # too complicated to setup - doCheck = false; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - meta = { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - }; - }; - django_1_6 = buildPythonPackage rec { name = "Django-${version}"; version = "1.6.11.5"; @@ -10597,7 +10581,7 @@ in { sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0"; }; - propagatedBuildInputs = with self; [ django_1_7 ]; + propagatedBuildInputs = with self; [ django ]; # tests appear to be broken on 0.6.1 at least doCheck = ( version != "0.6.1" ); @@ -13294,6 +13278,10 @@ in { license = with licenses; [ lgpl21 ]; }; }; + + iso-639 = callPackage ../development/python-modules/iso-639 {}; + + iso3166 = callPackage ../development/python-modules/iso3166 {}; iso8601 = buildPythonPackage rec { name = "iso8601-${version}"; @@ -20699,11 +20687,11 @@ in { }; PyICU = buildPythonPackage rec { - name = "PyICU-1.9.5"; + name = "PyICU-1.9.6"; src = pkgs.fetchurl { url = "mirror://pypi/P/PyICU/${name}.tar.gz"; - sha256 = "16rmxy9y0qhqqna2v49i7nzwm09as699rbyvh4raw7w602w55c3k"; + sha256 = "0l151zhhyiazzdz8skpxgrw1x4nqa9pq2cwni6d97anmg97i7hn5"; }; buildInputs = [ pkgs.icu ]; @@ -20873,16 +20861,18 @@ in { pyocr = buildPythonPackage rec { name = "pyocr-${version}"; - version = "0.4.4"; + version = "0.4.6"; # Don't fetch from PYPI because it doesn't contain tests. src = pkgs.fetchFromGitHub { owner = "jflesch"; repo = "pyocr"; rev = version; - sha256 = "09s7dxin8ams0f3xab60f45l3nn236a8win9yfyq9aqy9mm946ak"; + sha256 = "0amyhkkm400qzbw65ivyzrzxl2r7vxqgsgqm7ml95m7gwkwhnzz0"; }; + patches = [ ../development/python-modules/pyocr-tesseract.patch ]; + postPatch = '' sed -i \ -e 's,^\(TESSERACT_CMD *= *\).*,\1"${pkgs.tesseract}/bin/tesseract",' \ @@ -28927,8 +28917,7 @@ EOF }; propagatedBuildInputs = with self; [ cffi ]; - buildInputs = [ pkgs.libspotify ] - ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool; + buildInputs = [ pkgs.libspotify ]; # python zip complains about old timestamps preConfigure = '' @@ -32209,6 +32198,12 @@ EOF nitpick = callPackage ../applications/version-management/nitpick { }; + pluginbase = callPackage ../development/python-modules/pluginbase { }; + + node-semver = callPackage ../development/python-modules/node-semver { }; + + distro = callPackage ../development/python-modules/distro { }; + }); in fix' (extends overrides packages) diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index edb760939cb3..ddc449ae59c1 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,6 +1,8 @@ { supportedSystems , packageSet ? (import ../..) , scrubJobs ? true +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: let @@ -9,11 +11,7 @@ in with lib; rec { - # Ensure that we don't build packages marked as unfree. - allPackages = args: packageSet (args // { - config.allowUnfree = false; - config.inHydra = true; - }); + allPackages = args: packageSet (args // nixpkgsArgs); pkgs = pkgsFor "x86_64-linux"; inherit lib; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 2eae99eaef11..cf4d54fe0496 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -15,9 +15,11 @@ supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] , # Strip most of attributes when evaluating to spare memory usage scrubJobs ? true +, # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: -with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; +with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; let jobs = @@ -28,6 +30,21 @@ let manual = import ../../doc; lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs supportedSystems scrubJobs; }; + darwin-tested = pkgs.releaseTools.aggregate + { name = "nixpkgs-darwin-${jobs.tarball.version}"; + meta.description = "Release-critical builds for the Nixpkgs darwin channel"; + constituents = + [ jobs.tarball + jobs.stdenv.x86_64-darwin + jobs.ghc.x86_64-darwin + jobs.cabal2nix.x86_64-darwin + jobs.ruby.x86_64-darwin + jobs.python.x86_64-darwin + jobs.rustc.x86_64-darwin + jobs.go.x86_64-darwin + ]; + }; + unstable = pkgs.releaseTools.aggregate { name = "nixpkgs-${jobs.tarball.version}"; meta.description = "Release-critical builds for the Nixpkgs unstable channel"; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index ce8605a27e83..7f866f69660c 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2017-04-08"; - rev = "9876afbb35a2fe28748990f76d91eaae827e2aae"; - sha256 = "14wk74s0mqhxzmgaq07y75y8v4jkffzhs981y9cz806asdcxlrwh"; + version = "2017-04-13"; + rev = "5758a926a647716bd650978ad53aeb4a0c5f9b45"; + sha256 = "1fnwh62k8fbflciv1qg3r9fsqn1xy72flyv15ii3mpja2vqzkdi2"; src = fetchFromGitHub { inherit rev; |