diff options
Diffstat (limited to 'pkgs')
616 files changed, 8491 insertions, 5798 deletions
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 30bbcb2c8393..25f223d57441 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.16.0"; + version = "0.16.1"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "0h7flgsfjzbqajwv8ih686yyxxljhf8krhm8jxranb4kglww1glc"; + sha256 = "1zkqp93yircd3pbxczxfnibkpq0sgcv5r7wg6d196b9pwgr9zd39"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 3ba2495d45a2..707889b23eea 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.10.6"; - sha256 = "1x2sm262z8fdkx8zin6r8nwbb7znziw9nm224pr6ap3p0jmv7fcq"; - cargoSha256 = "1wf1lh32f9dlhv810gdcssv92g1yximx09lw63m0mxcjbn9813bs"; + version = "1.10.7"; + sha256 = "0syhvr4n9zyxhx20xln7sf70ljzj6ab36xjz4710ivnwwz2pjajf"; + cargoSha256 = "0zwk8xv71s7xkwvssh27772qfb23yhq5jlcny617qik6bwpcdh6b"; patches = [ ./patches/vendored-sources-1.10.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix index a4ac2943bfbc..461fc260207d 100644 --- a/pkgs/applications/audio/amarok/kf5.nix +++ b/pkgs/applications/audio/amarok/kf5.nix @@ -21,6 +21,8 @@ in mkDerivation { sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh"; }; + patches = [ ./qt5_11.patch ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ qca-qt5 qjson qtscript qtwebkit diff --git a/pkgs/applications/audio/amarok/qt5_11.patch b/pkgs/applications/audio/amarok/qt5_11.patch new file mode 100644 index 000000000000..36041c136c8b --- /dev/null +++ b/pkgs/applications/audio/amarok/qt5_11.patch @@ -0,0 +1,11 @@ +--- a/src/aboutdialog/ExtendedAboutDialog.cpp ++++ b/src/aboutdialog/ExtendedAboutDialog.cpp +@@ -30,6 +30,7 @@ + #include <QLayout> + #include <QPushButton> + #include <QScrollBar> ++#include <QStyle> + #include <QTabWidget> + + #include <qapplication.h> + diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index 246e02c53c72..fc01a543e285 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,13 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.0.16"; + version = "4.0.17"; pname = "fldigi"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "1gcahm1lv3yfscaxanrx6q7dydxjznw98vdc0f8zgdb15na3f0g7"; + sha256 = "1z8w0dxfc2nm1iy1vv18s5s88ys9vvbqawjvhsymxj56jqjzzp4q"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 68315373a023..678ea529dc44 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { name = "gpodder-${version}"; - version = "3.10.2"; + version = "3.10.3"; format = "other"; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "gpodder"; repo = "gpodder"; rev = version; - sha256 = "0nbhyh44cympslcf4miwc2n1gccm5ghjf9slg0r8xnpvg921jv04"; + sha256 = "0j0amjq1wvr5p10vckg900a8xfnxw6z028qw72ayh58216m5jb5l"; }; postPatch = with stdenv.lib; '' diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 50356eaadd50..3b967186112b 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -3,18 +3,20 @@ , python36Packages, gnome3, glib, gst_all_1 }: stdenv.mkDerivation rec { - version = "0.9.514"; + version = "0.9.516"; name = "lollypop-${version}"; src = fetchgit { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0ny8c5apldhhrcjl3wz01pbyjvf60b7xy39mpvbshvdpnqlnqsca"; + sha256 = "0ln77cmcl5wi4xis9kmzg0knbykzwsd1n78rr7ff5y35m9p2zgrf"; }; nativeBuildInputs = with python36Packages; [ + appstream-glib desktop-file-utils + gobjectIntrospection meson ninja pkgconfig @@ -22,9 +24,7 @@ stdenv.mkDerivation rec { wrapPython ]; - buildInputs = [ - appstream-glib glib gobjectIntrospection - ] ++ (with gnome3; [ + buildInputs = [ glib ] ++ (with gnome3; [ easytag gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser ]) ++ (with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix new file mode 100644 index 000000000000..3afd73493b05 --- /dev/null +++ b/pkgs/applications/audio/snapcast/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +, asio, alsaLib, avahi, libogg, libvorbis, flac }: + +let + + popl = stdenv.mkDerivation rec { + name = "popl-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "popl"; + rev = "v${version}"; + sha256 = "1zgjgcingyi1xw61azxxasaidbgqidncml5c2y2cj90mz23yam1i"; + }; + nativeBuildInputs = [ cmake ]; + }; + + aixlog = stdenv.mkDerivation rec { + name = "aixlog-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "aixlog"; + rev = "v${version}"; + sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr"; + }; + nativeBuildInputs = [ cmake ]; + }; + +in + +stdenv.mkDerivation rec { + name = "snapcast-${version}"; + version = "0.14.0"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "snapcast"; + rev = "v${version}"; + sha256 = "14f5jrsarjdk2mixmznmighrh22j6flp7y47r9j3qzxycmm1mcf6"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ asio popl aixlog alsaLib avahi libogg libvorbis flac ]; + + meta = with lib; { + description = "Synchronous multi-room audio player"; + homepage = https://github.com/badaix/snapcast; + maintainers = with maintainers; [ fpletz ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix index 86eefc395569..6614e3702247 100644 --- a/pkgs/applications/audio/spectrojack/default.nix +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "spectrojack-${version}"; - version = "0.4"; + version = "0.4.1"; src = fetchurl { url = "http://sed.free.fr/spectrojack/${name}.tar.gz"; - sha256 = "0p5aa55hnazv5djw0431mza068h7mjkb9pnglxfpqkx5z0czisdx"; + sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjack2 fftwFloat gtk2 ]; diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 311686d0c77b..797a00f4fc4a 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -19,8 +19,13 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit coreutils; }) + ./hardcode-gsettings.patch ]; + postPatch = '' + substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas + ''; + nativeBuildInputs = [ meson ninja pkgconfig vala_0_40 gettext itstool appstream-glib desktop-file-utils libxml2 wrapGAppsHook diff --git a/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch b/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch new file mode 100644 index 000000000000..50bf2ba4fbd5 --- /dev/null +++ b/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch @@ -0,0 +1,38 @@ +--- a/deja-dup/nautilus/NautilusExtension.c ++++ b/deja-dup/nautilus/NautilusExtension.c +@@ -24,6 +24,8 @@ + #include <glib/gi18n-lib.h> + + GList *dirs = NULL; ++GSettingsSchemaSource *schema_source = NULL; ++GSettingsSchema *schema = NULL; + GSettings *settings = NULL; + + // This will treat a < b iff a is 'lower' in the file tree than b +@@ -313,7 +315,13 @@ + bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR); + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + +- settings = g_settings_new("org.gnome.DejaDup"); ++ schema_source = g_settings_schema_source_new_from_directory ("@DEJA_DUP_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default (), TRUE, NULL); ++ ++ schema = g_settings_schema_source_lookup (schema_source, ++ "org.gnome.DejaDup", FALSE); ++ ++ settings = g_settings_new_full (schema, NULL, NULL); + g_signal_connect(settings, "changed::include-list", + update_include_excludes, NULL); + g_signal_connect(settings, "changed::exclude-list", +@@ -329,7 +337,11 @@ + + void nautilus_module_shutdown(void) + { ++ g_settings_schema_source_unref(schema_source); ++ g_settings_schema_unref(schema); + g_object_unref(settings); ++ schema_source = NULL; ++ schema = NULL; + settings = NULL; + + update_include_excludes(); /* will clear it now that settings is NULL */ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index ea5dce4fa1a6..a82e0bf20358 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq"; }; latestVersion = { - version = "3.2.0.17"; # "Android Studio 3.2 Canary 18" - build = "181.4830125"; - sha256Hash = "14yarl1vqhy21ljrn5k2dy8z0y407g9nqw4lqzjbxb7zmascnlx4"; + version = "3.2.0.18"; # "Android Studio 3.2 Beta 1" + build = "181.4847800"; + sha256Hash = "1ipdvrx3qxwygq72jlf0dl4haxviscl41q18kclg519r1zbzd4cw"; }; in rec { # Old alias @@ -40,7 +40,7 @@ in rec { }; }); - beta = mkStudio (stableVersion // { + beta = mkStudio (latestVersion // { pname = "android-studio-preview"; #pname = "android-studio-beta"; # TODO: Rename and provide symlink diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index b13e9fe12587..c37064ee6000 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -60,12 +60,12 @@ let }; in stdenv.lib.mapAttrs common { atom = { - version = "1.27.2"; - sha256 = "0xriv142asc82mjxzkqsafaqalxa3icz4781z2fsgyfkkw6zbz2v"; + version = "1.28.0"; + sha256 = "0k09316897qb9ypkqm6w78nz7sj5385xfdm9bm97m8pka7v61g7h"; }; atom-beta = { - version = "1.28.0-beta3"; - sha256 = "07mmzkbc7xzcwh6ylrs2w1g3l5gmyfk0gdmr2kzr6jdr00cq73y0"; + version = "1.29.0-beta0"; + sha256 = "05xk63wsjfssf8ckph2bgrxaf99fhz3gs8n8pira8cc9yjk7diz7"; }; } diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index f381064c92cf..801583299ab0 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -532,11 +532,12 @@ rec { spotbugs = buildEclipseUpdateSite rec { name = "spotbugs-${version}"; - version = "3.1.3"; + version = "3.1.5"; src = fetchzip { + stripRoot = false; url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip"; - sha256 = "01zrmk497bxzqgwgbpsvi5iz5qk9b4q949h4918abm54zvkgndlg"; + sha256 = "0fxdirz6ik9rqykm2lcr720apsaqgngr4c7q793rjb9b3bn30c85"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 9a32ea7f19f2..8f74aca44885 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -75,10 +75,10 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - description = "GNU Emacs 25, the extensible, customizable text editor"; + description = "The extensible, customizable text editor"; homepage = http://www.gnu.org/software/emacs/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with maintainers; [ jwiegley matthewbauer ]; platforms = platforms.darwin; longDescription = '' @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { extensions are distributed with GNU Emacs; others are available separately. - This is "Mac port" addition to GNU Emacs 25. This provides a native + This is the "Mac port" addition to GNU Emacs 26. This provides a native GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later already contain the official GUI support via the NS (Cocoa) port for Mac OS X 10.4 and later. So if it is good enough for you, then you diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 9e97a1d755aa..fb390c0995e0 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-35"; - sha256 = "1gn4frzxa1v712pcwwkmi0m2a6gbrg2564dbxxr7130zc66licpz"; + version = "7.0.8-2"; + sha256 = "06cpvvv8xikw5jm1pa2xxxlnsy743ham67yshpndn2x3fyf48267"; patches = []; }; in diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 87565a1e53e5..8001080a170a 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, hdf5, vtk, medfile, boost, zlib, python27Packages, swig, gfortran +, hdf5, vtk, medfile, boost, zlib, python27Packages, swig, gfortran, fetchpatch , soqt, libf2c, makeWrapper, makeDesktopItem , mpi ? null }: @@ -16,9 +16,18 @@ in stdenv.mkDerivation rec { sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df"; }; - buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost - zlib python swig gfortran soqt libf2c makeWrapper matplotlib mpi vtk hdf5 medfile - pycollada pyside pysideShiboken pysideTools pivy + buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts + zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile + ] ++ (with pythonPackages; [ + matplotlib pycollada pyside pysideShiboken pysideTools pivy python boost + ]); + + patches = [ + # Fix for finding boost_python. Boost >= 1.67.0 appends the Python version. + (fetchpatch { + url = https://github.com/FreeCAD/FreeCAD/commit/3c9e6b038ed544e446c61695dab62f83e781a28a.patch; + sha256 = "0f09qywzn0y41hylizb5g8jy74fi53iqmvqr5zznaz16wpw4hqbp"; + }) ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 0d01a6313585..639f1928f8a4 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' ''; - nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env ]; + nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env perl perlXMLParser ]; buildInputs = [ - perl perlXMLParser libXft libpng zlib popt boehmgc + libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext gsl poppler imagemagick libwpg librevenge libvisio libcdr libexif potrace diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix index d27fdb8b53be..48a94a5253d0 100644 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Plugins for KDE-based image applications"; license = stdenv.lib.licenses.gpl2; - homepage = http://www.digikam.org; + homepage = https://www.digikam.org; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 60391eee6927..d5818614b9e0 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper }: +{ stdenv, fetchzip }: stdenv.mkDerivation rec { name = "1password-${version}"; @@ -6,25 +6,24 @@ stdenv.mkDerivation rec { src = if stdenv.system == "i686-linux" then fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_386_v${version}.zip"; - sha256 = "0mv2m6rm6bdpca8vhyx213bg4kh06jl2sx8q7mnrp22c3f0yzh7f"; + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; + sha256 = "1yzzh1f6hx7vwdgzp0znsjarjiw4xqmmrkc5xwywgjpg81qqpl8c"; stripRoot = false; } else if stdenv.system == "x86_64-linux" then fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_amd64_v${version}.zip"; - sha256 = "016h5jcy6jic8j3mvlnpcig9jxs22vj71gh6rrap2q950bzi6fi1"; + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; + sha256 = "0dgj1zqmpdbnsz2v2j7nqm232cdgyp9wagc089dxi4hbzkmfcvzx"; stripRoot = false; } else if stdenv.system == "x86_64-darwin" then fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_darwin_amd64_v${version}.zip"; - sha256 = "1l0bi0f6gd4q19wn3v409gj64wp51mr0xpb09da1fl33rl5fpszb"; + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; + sha256 = "116bvyfg38npdhlzaxan5y47cbw7jvj94q5w6v71kxsjzxk9l44a"; stripRoot = false; } else throw "Architecture not supported"; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -D op $out/bin/op ''; diff --git a/pkgs/applications/misc/gnss-sdr/default.nix b/pkgs/applications/misc/gnss-sdr/default.nix index 68b494927915..0bb0926f048a 100644 --- a/pkgs/applications/misc/gnss-sdr/default.nix +++ b/pkgs/applications/misc/gnss-sdr/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source Global Navigation Satellite Systems software-defined receiver"; - homepage = http://gnss-sdr.org/; + homepage = https://gnss-sdr.org/; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index d5576ccbeb7c..30e36c3dcf0f 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -1,13 +1,12 @@ { stdenv -, python +, python3 }: -with python.pkgs; +with python3.pkgs; buildPythonApplication rec { pname = "jrnl"; version = "1.9.8"; - disabled = isPy3k; src = fetchPypi { inherit pname version; @@ -15,7 +14,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ - pytz six tzlocal keyring argparse dateutil_1_5 + pytz six tzlocal keyring argparse dateutil parsedatetime pycrypto ]; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6b37f9b9145d..5c5769db1b46 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -47,7 +47,11 @@ stdenv.mkDerivation rec { --replace "/usr/local/share/man" "../share/man" ''; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; - patches = [ ./darwin.patch ]; + + patches = [ + ./darwin.patch + ./qt511.patch + ]; cmakeFlags = [ "-DKEEPASSXC_BUILD_TYPE=Release" diff --git a/pkgs/applications/misc/keepassx/qt511.patch b/pkgs/applications/misc/keepassx/qt511.patch new file mode 100644 index 000000000000..b4d312c8c263 --- /dev/null +++ b/pkgs/applications/misc/keepassx/qt511.patch @@ -0,0 +1,15 @@ +diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp +index 6fd65c1a..e99275b0 100644 +--- a/src/gui/entry/EditEntryWidget.cpp ++++ b/src/gui/entry/EditEntryWidget.cpp +@@ -29,6 +29,7 @@ + #include <QMenu> + #include <QSortFilterProxyModel> + #include <QTemporaryFile> ++#include <QButtonGroup> + #include <QMimeData> + #include <QEvent> + #include <QColorDialog> +-- +2.17.1 + diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index bfb658098b73..ca9a90777e33 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A 2D CAD package based upon Qt"; - homepage = http://librecad.org; + homepage = https://librecad.org; repositories.git = git://github.com/LibreCAD/LibreCAD.git; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix index 4599fab0c6d6..070073ea3e2c 100644 --- a/pkgs/applications/misc/limesuite/default.nix +++ b/pkgs/applications/misc/limesuite/default.nix @@ -4,7 +4,7 @@ } : let - version = "18.04.1"; + version = "18.06.0"; in stdenv.mkDerivation { name = "limesuite-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "1aaqnwif1j045hvj011k5dyqxgxx72h33r4al74h5f8al81zvzj9"; + sha256 = "0j6mxlvij2k6ib1d9jwzvilmqgm1h0q7wy9sf8a6bvidwlphvy25"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index d78caa24e462..1857c3118ddd 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://mupdf.com; + homepage = https://mupdf.com; repositories.git = git://git.ghostscript.com/mupdf.git; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index ca381e14dd17..6b057186eaf3 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -6,29 +6,37 @@ let overrides = self: super: with self; { backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2; + flask = super.flask.overridePythonAttrs (oldAttrs: rec { + version = "0.12.4"; + src = oldAttrs.src.override { + inherit version; + sha256 = "2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd"; + }; + }); + tornado = buildPythonPackage rec { - name = "tornado-${version}"; + pname = "tornado"; version = "4.0.2"; propagatedBuildInputs = [ backports_ssl_match_hostname certifi ]; - src = fetchurl { - url = "mirror://pypi/t/tornado/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h"; }; }; flask_login = buildPythonPackage rec { - name = "Flask-Login-${version}"; + pname = "Flask-Login"; version = "0.2.2"; - src = fetchurl { - url = "mirror://pypi/F/Flask-Login/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; }; propagatedBuildInputs = [ flask ]; - buildInputs = [ nose ]; + checkInputs = [ nose ]; # No tests included doCheck = false; @@ -37,10 +45,9 @@ let jinja2 = buildPythonPackage rec { pname = "Jinja2"; version = "2.8.1"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m"; }; @@ -53,14 +60,14 @@ let }; in pythonPackages.buildPythonApplication rec { - name = "OctoPrint-${version}"; - version = "1.3.6"; + pname = "OctoPrint"; + version = "1.3.8"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "0pgpkjw5zjnks5bky51gjaksq8mhrzkl52kpgf799hl35pd08xr3"; + sha256 = "00zd5yrlihwfd3ly0mxibr77ffa8r8vkm6jhml2ml43dqb99caa3"; }; # We need old Tornado @@ -70,9 +77,10 @@ in pythonPackages.buildPythonApplication rec { psutil pyserial flask_login netaddr markdown sockjs-tornado pylru pyyaml sarge feedparser netifaces click websocket_client scandir chainmap future dateutil futures wrapt monotonic emoji + frozendict ]; - buildInputs = with pythonPackages; [ nose mock ddt ]; + checkInputs = with pythonPackages; [ nose mock ddt ]; # Jailbreak dependencies. postPatch = '' @@ -88,7 +96,7 @@ in pythonPackages.buildPythonApplication rec { -e 's,PyYAML>=[^"]*,PyYAML,g' \ -e 's,scandir>=[^"]*,scandir,g' \ -e 's,werkzeug>=[^"]*,werkzeug,g' \ - -e 's,psutil>=[^"]*,psutil,g' \ + -e 's,psutil==[^"]*,psutil,g' \ -e 's,requests>=[^"]*,requests,g' \ -e 's,future>=[^"]*,future,g' \ -e 's,pyserial>=[^"]*,pyserial,g' \ diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 7448b8e6648b..7fdfbd84d2f6 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pcman.ptt.cc; + homepage = https://pcman.ptt.cc; license = licenses.gpl2; description = "Telnet BBS browser with GTK+ interface"; maintainers = [ maintainers.sifmelcara ]; diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index d08b183d9d00..23ab0f8d34ad 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pgmanage-${version}"; - version = "10.1.1"; + version = "10.3.0"; src = fetchFromGitHub { owner = "pgManage"; repo = "pgManage"; rev = "v${version}"; - sha256 = "1gv96an1ff9amh16lf71wknshmxl3l4hsl3ga7wb106c10i14zzc"; + sha256 = "105gmwkifq04qmp5kpgybwjyx01528r6m3x1pxbvnfyni8sf74qj"; }; patchPhase = '' diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 3f3956961617..e44690a5bd79 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses, taskwarrior }: +{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses5, taskwarrior }: stdenv.mkDerivation rec { version = "2017-05-15"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { perl # For generating the man pages with pod2man ]; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses5 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index e282e752b318..0fa0495cedac 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.17.1"; + version = "0.18.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "${version}"; - sha256 = "05fzsakm089bn03z8gip6yp4xfmwa054v40x2f3gqpl04r504gis"; + sha256 = "0snvxn7ifbkrdnml66pdna7vny3qa0s6gcjjz69s7scc0razwrh8"; }; checkInputs = with python3Packages; [ pytest ]; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 91fdb37432ea..340d84fd2aaf 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "09dcjvnm74j1d26mvdiz0sl1qwns5xfkdwx46nqd4xlgvg9x4rpx"; + sha256 = "1ssiq2yv8b3xg4kfp2cfzl41m5apjw2r2k74lh3fz0g0ix3cq55b"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 8dd7d4752b76..b5e17363a51d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,995 @@ { - version = "61.0b14"; + version = "62.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ach/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ach/firefox-62.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "1b8e2e92cc7489a9876aa4b8082f3285a1db6ced460597f05f4843f3858eb4fe858b5d87e641480836526bd7b718d033a24fc1a2b9bdf0504dfebbc5e7a292c8"; + sha512 = "e8a73275e443ca96a98e7be86aed6fde2d260c679d8e6c6abe14cee34a7cce6546fe2d67e3f6e459e70aa1c24cea4e1fea5989e1e445c010eb09c6c380e92836"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/af/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/af/firefox-62.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "d1b77553f03b06de6fa6d8e3a308105b885690d2eaa21a066f89ad35c5475633a3f4d63536dca33c737dfe2e84dba9c05a09c011cab7bc4356b4158dc122662e"; + sha512 = "a8840407317ba6c78d8107eed1dda66b1cadbcbb3974408a7591a0b707d48a315d8510bab6745928ff373557b322abaa5004e4ec72ac47a10b8f3e844a739078"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/an/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/an/firefox-62.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b8ff7e36c2b826da7d69352abd2f2ce6661298ea09b1f457ccfeaf9d271ad49358b2a6947bba47bee506c102c59fc1426a92f09e3e9591693e4fd6c8fe84ea18"; + sha512 = "592cc4f177c6a66c25c1921f15446e2358a2cf248747e7f528b9f0c0bba068454c7adcea39a7c1b07dacb17512ce530bef57015a3c3292fd87a312855209df32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ar/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ar/firefox-62.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "108a6b8f7af9915c20a11bce0bf1c2096d8ee09fcec394325faf0142eff1452d493e5a5c894ae3061ffdb63b2f19b127446f2b86339ddff309120df37e113bdf"; + sha512 = "8914a43999c7c48bd2d6b898cf809f1a7bffb41f64f12eabf6821eb7bae9dfd47431636976bcd746a219e951ec546b45257d03280e4d1805098d14fc2c2b66db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/as/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/as/firefox-62.0b2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "b4368567ebe0ca46aeaf48b23e75bb972f88af82ed692d72b4fa1aab8f89e16f09974810c4fb333bcb30b5d2f9cdb50a39a42ff73fa53c2511a1adbd0713c060"; + sha512 = "b25747a2c9fab1e0137f39d7c620ef8d0f6d997dded045c8c7f8eaa1167393357ad555f7e82597169bd2f61cb88eca83269e3e4f6f4a257a1cf97dbe9520cca0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ast/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ast/firefox-62.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "3ca40ec6844c55e7beb3e6ee7a3a7604a92560830ad060feb7cca5118bffe4d2b5f6ca8af6f98d07eb6a970814a33d38b0516ea339f07b0e2c8e55a79a031bae"; + sha512 = "d577dbd473dab2fc618ada2d6ebceae37796a5401f5d7dbdf6f78fbd2078df79d612280c816105a6776f8a0f49dd18f46af4def052af351f7e846a90a4dfeff4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/az/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/az/firefox-62.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "3bcd5e17dcd0debd02bb79aae488ad6f158e6e45aad6ef49ba6e6d69e894e5513c7b1e27c4d90df9423717d1d8f1b5f02c1dcc42e2255d5ad0727095e9ade169"; + sha512 = "c7713c7464582b96584f4d16f1cb70321503c971052d135dfac46df661cc8569661041b5c9dde1d78e7c9dce7a8f3794210611f961cdafab11445fb8907e606d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/be/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/be/firefox-62.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "bb1168d80f4947e5de3872c02ec5f472381b1b59aec5cb4a05788556db462702c99e36f67ecbd52029856badaf255a9a8ff692f37b6d5c7166d73255b097057c"; + sha512 = "4b1129d50cd2948ba7168bec3a9f2e380672da29a5ffd86ba69a7a1fcdc7a154b35192176da97bf0bab284be53f5aff64c7c9d07ddae3f7a38395b97e669d365"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bg/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bg/firefox-62.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "52b93a4eb34c083ee824cbeed17a65396c8916b4313a080d43dddbe0fbc1e80b84030a201e98ce259e24eca7bbcf89f83442779c60660104d28c683471ff4f78"; + sha512 = "be0dd58530cbf5a2d1a45ac83b8a5c6876f27ff603ed7e38c26993ed9730984ad7314d2191494f3e30eaccac19aab24ef0d2148e965162975f24d2dbbe92bce1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bn-BD/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bn-BD/firefox-62.0b2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f387009c1e447e276dc042e1ad0c39661d32dde20e3ae1a4c5f57c6c3acd154ffeacce170843f8a5d04f26d9c1c44fb933899f8253f38690944bed38dc339d72"; + sha512 = "17d9323b7e6bd65e4af89be8aa7fdfcfe3e090e9d8a911c0e6403f9a8aad4238acdb5e259e958e78b11fbdb51b65d9eb62b1c0e322e8cced623250d921234887"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bn-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bn-IN/firefox-62.0b2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "fbfd8c0d7ba2038505bde3172d736d851e64600738c28ac9a414e0f859ac7c7b264b23a9a2921e20b2cb9a99d5c371dad7e186e1a5910415debb203dd08bcc3f"; + sha512 = "544f72273a6db0d219878d3ed49567fe2f0e5e72e5c8e3b85ba0ecacb60813a5a3ccdb1466a9c0156ca44622a2d451a6b93fd3303b2512135da89d0430bfb928"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/br/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/br/firefox-62.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "c0a7900802be77222c156690df96e3ee03d88d4888b0dc31d45dd46d29d19a13b97141c68b002f39b657cd96463152c358b45e78368f72884529af51991b8512"; + sha512 = "cff328e9154f5c73722f9245f07177a97d46eaed99a03b3177f3eaa83157a9e584caf8731e55c73896eb2f8c01d16e7ca899ac6ceaa8bdc43bbe68c21d90fc13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bs/firefox-62.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "391a2b1aa85ec4bf010c7051565b9168b0bb71dca5a4f40368781efb690d838412859c8bab34c14ae168d3bb9bdbe538c6a38dff11e138aec9f179ae52cda7d4"; + sha512 = "eb419f8a8cf848ed8913511c8f7fb5585e4171d9c2062900f693face140d91bb5cdfd7ac413be4df928793f5b5d7780ab3b877da596848b8255d7fc0139efeb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ca/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ca/firefox-62.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7655c923e92f356e3d893dddb01a966bcc7ee89f035ae1e8caee681605fcd54c3e6497225700d9eacd099374f0a3fff3050a529354018963e3df40ee3fccc86e"; + sha512 = "6e113bdc0ec10629d285a15dce967699d5299ac82e99744d6b707f338b0e407d0a03803e3c70da94fd13e460887e66919edf7d5ed07d12b9d0d1c21de811dc40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/cak/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/cak/firefox-62.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "daea430b504dbc276e6b7b8091acced1b7842a97045184bad7867f98033feed98b7ebbab922f25f828c031e189b3d437aade6cc7060eb982068c2cd8d977409b"; + sha512 = "639a98dc336f0b11dcb9b98c4c3e2a81f47086cc6ef4eb9f22eacb232832a3fedb071302bafec8df0c4f819afb4b0dc95c8c709be69a06ac16eea50dd44c8f9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/cs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/cs/firefox-62.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "a6cc36eda14619d4fce6fd2304f0027130ad92cdbaf0e88e3077deb721b9740bfd99d62d22c67cd35286c082374c53df782452227e69364e414f92f16dd96741"; + sha512 = "5fdb22988c3f04be8974e8746c2b3f3b794d5dc5c317830883e3ffee67c82a2dca21f45c2e8b695be3612c906d03bfc54db5fc086c63a35eb9b204eb7177e18c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/cy/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/cy/firefox-62.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "df0589ec3b22f6a320b3890a6f2beefa99fc2688de6c4afa0f8a879b830d249f4aac4cae1599895edb7e6196ffc02213188d461b07c7242ad29ffbc9901c1c66"; + sha512 = "2c89c1ab0808d85cfb148690265c51a2c5af3a507799cca510c3c1901d2561a27a077d0f7f1136f61b7db1a0eee1ef98da61d6c16718d0effe8621c71368264e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/da/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/da/firefox-62.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d6c97c376384c742bf0cba9eb4cfa011ecf1500a7e6c518041c30acd6227df9b8300b156935216ea112956bb0291bd925935b940d372ef8b57a19357e5074d15"; + sha512 = "40544a20f4826d7b91904690ba0c3e2a37b422309447adff63515405ee46a73ee6e9741f42a29e36055420bfd917fb732c179174f7536c97fe8e745aa791eb77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/de/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/de/firefox-62.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "a5781c0515280f5b4fb80f4eaf373a62f591e924466668667885554dc1086e48006cfe0645140bf53b877d078a08c4a1ce209c9dd0985ea28b9fa5579137045b"; + sha512 = "4b2354b069925c77e3cca77c49013ff3f5fbf8586c0158b83762dad1ab3028a35f26eb3f80cc79f8f7c729adf23d1ad8f28f81b1210f2a79c01b3ce0b8e9bdfb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/dsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/dsb/firefox-62.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ec5eaa244ad1f6bafec67ed2017d16560be5ba2f66e5788c54fc643a748e1e834a7eb11869c5aef233f1d1d7322b15bdbabfc0a6bd6a46011397203911607cc5"; + sha512 = "ee0922e704593acda845e4d5e211e364625fb5749794e1d945178462a2351d12617823917d0f79fefbe9dcee24f4dafdc174742d12a778ec6959471e31bc1005"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/el/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/el/firefox-62.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8e4a7d9e778b85caf16e2144189338bf3beb577d057c3416dc45be315eaa4d8a9f26180aabdf1de28cfbc3a6545ed8304e04bb112392a5c49046261a7976fc33"; + sha512 = "f07de19cc17675c777e66341d771a3271b558318358af1b379dbe90ca23c01451217680fab80980fbbadd9a82bfc6bea84f8b8568dad00304b22cab19ba933f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/en-GB/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-CA/firefox-62.0b2.tar.bz2"; + locale = "en-CA"; + arch = "linux-x86_64"; + sha512 = "ceed256dd96a3b356f3cb89e01d10450f33f5dae8f4224145cea553fc825c315c2f3b9bf670c80cd0648e31be56cf2f988ec62d95f0bc554684baa35f59294bc"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-GB/firefox-62.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "bf5cfef892fb906accc0db406b5e3b3389f338719ee29605b2296151ef8a0f2d4916f8b3dd31cd52e79262a4747252d4b553b170c185e181ed2895aa7130cffb"; + sha512 = "723cb9937c49bb44a425c4a8f8ea4379ca97f11ab1aa4d7108204211925aefe370a7ca3fa2ed68dc38ec4157b866c0c2988c5c1b375bda07e9acd8b3b40c53d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/en-US/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-US/firefox-62.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "52c5502b6423b7ce3140f3eb62e274874595761dc996a200442f21b5611c97534734fd93b90340f719d01d0557e2aa18d88137217f8c40a23b2bf50577a820f3"; + sha512 = "386a86c641c225508d7efa4a467b981154ea41c06a5948d09e7d6c3ebe4e8cd9236e52ab6a5ec1e543b80f9402b1e0aea26d2a7b2bed81b742f3923e2420e92c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/en-ZA/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-ZA/firefox-62.0b2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "55f251447753564f7db3973c72e1007f1ebc356cdf6c3765dcc6a5352c931f39f7d7e46ffae72b1b4dda59bf2917a09eaecf33cc30b976f78bc7922466a2a9e5"; + sha512 = "60138c99ad5413379646ae8939be17bcf4bdc205c850a21d759b1b15a53740326cd4bbdacdc86e1affb7a6f522064b3f6a61a14c0590b5a50755c5a5713d3703"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/eo/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/eo/firefox-62.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d008d4e0614e3490ffc7951ad7413ee57d84ce1d17563bd69ebb7bed7f5d362231b497d6ac142003aaaba8129683b24fc3fe6c2612b674ead893ed0e500d9ca6"; + sha512 = "f03d76e59a2ec73cbefe815595febd99225b3a88b6eaee721dd714c6104122f7d6380f43270808ac7d58a958bca77f346941a88cca0ce8d280988e3e7f8b56a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-AR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-AR/firefox-62.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ebee62d32b2e7d48561ebab7a387b06f06f4c1553cacf814b846bc8cd58a708c397b2e642b67f31617047e34b3baecce7ea9e0177606cf92e386d22f7276a941"; + sha512 = "43b3d2e06b37e41bdade831238d025bc9ed244ae47c05c97059136926bc07cbf5468ae18d31479daabd57200a03cee3e076dbe2fbe9c82393b649b74dc640aea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-CL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-CL/firefox-62.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "35f964ebc3133704d95cc1ecdf0cfab7c7902b7d22608d0711dfc5badabd262df52f10516a5a3c4635bbc3fa5dfce2e7c73a9362c58768f54a38abbb4a8ff55c"; + sha512 = "50fb64e738d45199b7244586093f939392d9a4aa4b94f34724d8390a749f55b0da32278a7b239f48802fad45a2e497cff5b745d6bd805f98de5c214057192d4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-ES/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-ES/firefox-62.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c728a0cf0d75739be5db224a49e1c91e779456b75769898d1097b443e3348e12ec11e6626bd72512e5d81ae22201be55043bc0f82ca74123178cb637f8e44bbb"; + sha512 = "d0252a66a1222b1fcbb3fcd57cbd5e11da901409b714911da4642961e854174f9b082bd0694da0afbbc6864fe6df16a60c7a02087c1d4ebd9443306ed63cd292"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-MX/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-MX/firefox-62.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "58c2ab98acc72d0e5421f6d14194a0c6a14a443290fb1461ee45abed3086b5bd6977c0ad4f083ad2c7b7cc84e39f02621b248c6ec0c50823d15c2778636ff6d2"; + sha512 = "1a989fa0f586bab19a4b4247e11fc9a74280ee8c66e6655c309fa8413864628742e9d41f60a3f4097523aa90f0ea5176e84c38daaa34853509e38596339690a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/et/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/et/firefox-62.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "b73a8057c6a8ce7091d0d9717ee67790ec13faf7eb27b2dcc696a465c291e24fa7e9630c7c0382dc3de2f477c7b476e84687a0fa49f84ee1aeb7b4ef47c76e13"; + sha512 = "640a65fb860b8678e547c79a0b5c2063a87473ff2813662eccac2e9a47ba57fd41ca20bcd200cda8fd9e01e86ebfdc2a8510534c1d4a4e22ad6f100a9533f2c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/eu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/eu/firefox-62.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "956df7dc028b820af5679b731578331b98d146e843da68796f878e939e8f9ce60355dce3d28093b4cbcb2052083f29c5e412afd502307895553f8254f3e18b3d"; + sha512 = "0fd6c238fdda13eebaa18784e78158427fb94975943f0b0a8d07ff1d8d16d7ecb2d34b95417237cfbf2ae3c63652c5b1ff39350de2fba38a959b5d8b6b7b469a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fa/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fa/firefox-62.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "5a2f480f6c7e120eabc19f629de687cf4bca8c824b0c693aacbbf7d0b7c577097b03e5eab2570bd127cc36963c85599ea1355f2ced07d283ff8ee964779167f6"; + sha512 = "1f9fd5d3c6987a3ce9a10aa057d9334e3b2dd050b1b240c4a704e3e3599f6e2b98bb776f31f46284c16109b0eb89e533bda4b48dbfb22dc5a804df631a60f22e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ff/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ff/firefox-62.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "afc19bb38a30a1227babd3b011ee1639cafe154f72b67bed65f897b7584ed8509ecb59f176380cb1ae0f6068926686e3473ec63ae8b68a75cbe5c8c32aa97224"; + sha512 = "9a11342c02298fbc3f8fb3bd0daf38796f70db7aacc5f2d127d3b2102d9c732347fe4bfc9ca368b7d6181c294091ad2cf7d8bb7017eeb3abbd2fb9180ac6597c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fi/firefox-62.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "dab0cc26ab4cc2f700867140715e4f5a63d272b053550d69783e20794e167a4b323e054d91ac9f0aa05c4b82c60618fc37a9cb6003ff8d92cc6b39781e25ed78"; + sha512 = "4b8ec3d78c38db9078e128c0c7b37306946053c1073972a8960a3299e0419e42526c762e6fd8da95b14dd521d334b85bd61290e3759df186bf305ed1c7b2cbad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fr/firefox-62.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "6946a4375ec4abaccf6326acbdb775dc2c9c866e8b41eb1978b7e9525f0865b5c6e5b6541a04405abe294600eb97b53f2fc3dc25dfb2c0760861be25075466e1"; + sha512 = "96ef7135fa52202ef8a6aef9ccaa0a2e29a43fe1175d0be889a41ce92c731a31cd7c1809dbedbaec2e16a832da5f3d73a3c77a0703d8985a62e1ecddf8a267e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fy-NL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fy-NL/firefox-62.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "e718d94a1d5c1bfb5f19317f6eff382c2ba5549561bdefaf1c67c1a51e68cf291b7f77dcc8a4141b53abdfda9e7f3806166a9675c55f1f3397e9c1bd41f74598"; + sha512 = "767da4cc0d82efe65c1c740ba8d604b1d50f920daeee5fea2dcad5efea5f46f168ac8d27a15fcfbd0af30d6df2c3f0210301df2c7006a5b39a207c190c0f7e0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ga-IE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ga-IE/firefox-62.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "31f571ae0eaece944002b1c4541b8894d860bc8987d0c914cc78fc2f5e202f4c8733b48e350f443f513e998f654bf6fca1fff80811f380c2c8babedb5d7a1f02"; + sha512 = "1828c79bc6d80649eddb9d8fdfb7b395e66f3ef5fc900fbeb3d727955aed292a782fe8a413038c037fb699b49d93b72b645c699868f55c823a68e7a5abd468ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gd/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gd/firefox-62.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "f288337f68922425589edb57cd49e9d1d468a60d9172c5d514719e5c2e2d1fcd3ccde7f2581cd58a9b94c9241cde3e2a3ff24304e452459808ab74100ab30242"; + sha512 = "ab3f9798ba035a33bfc4cfbd576b883e2d677932e6f8f75cd1c129cbdbd02323004fbabd69a26ffeb34d4eb2197d0e079fe1fde8044eb1b4c626e87cbc800219"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gl/firefox-62.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "bb33fd8d03f49cc1c993d9d95aea3c8b739fc25b266ad394b725d16cbdf06e55a0330ef1a9f749b0b55b6724eb310470dae8cbd0927f90a9f321290beaec971b"; + sha512 = "c9e0d513265faa304d17ed8471da5ef42b84e6eb8b992a22e267b29545eeb72042061f575b5085d5c25d7a1f9dd222da53535670e5a251eb6dc7d2cd3b700e79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gn/firefox-62.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "2b3edfc6fd42a8bffd0035512ac3ef8393acb051852af6368f772a683cdafe28c278f305f77936e03a2b8273233ea583ba12d5709d1a61735c328283a57936f8"; + sha512 = "f0d2117c871fe61a0b3c4f2b08bc1a35b25f892ed08231f48c84fc4d88180b7d37fcac08550eb06b49fcfb76188ff08e89fc23933ce3205e3e7f628f242df826"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gu-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gu-IN/firefox-62.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "8dcc7f8461e7a296a07f74864e853d063409bf73fe7edd8e35be9ee18bddda7f2f8307ffd36e9e2fe5c13e777ceef8718b58894a81a963bf35b3dc40f04e3976"; + sha512 = "35d62c047992a5ad288e905fc4f386f3d3618df2c42f617cc7c2be777604a8a30d17c14e4e7ee21f06b35657d6cc8b2743379836d433652c7509f6c0455956a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/he/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/he/firefox-62.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "44957ce39dc9230388cfde78652d88d0a6b283a1e8bf731ca6916d706ebde291045d4f27e3a0480dcfb97f8fb4bb68e03d5009ef658cc98224002ec1ced82fc1"; + sha512 = "05c9481db1ecb833774f808a33db96f4848fc260751f35d8e9328916a5c298c8c174cdb55845bdf5838edd7ba323d9c6dc6566609e359a5746ea09ce2566f8db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hi-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hi-IN/firefox-62.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "2ef4df45864245c3e8a5b276031d0f3dcaab8271d253b07d79cabb9e0098d59ccfbab949d10a843e946a01596b51eb8d4c2c31a476e877c050324806b4c07326"; + sha512 = "8a92fa9b24e54fda81d15b18dda8432dd94e26164d58e1dd7f65d5f744c905e8790693557ac15bfcbcb491032ef436b3c7c01651767d4b43dc663193ba47ddbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hr/firefox-62.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "da0e053a5cb88481699bdca777e9c930ebc2842da4c114237c49d40de6811e2c7e9c3d3a3b773a9ed2a7fe275447e3e585c0440dfef6450b6b57b58436233c53"; + sha512 = "432f9c7429900cc929afdf8e7e4905606a7f83652519d8f0e5991aedc99b7eb56b73ad7820efca20250df19ed68c0b4c409a4fe2595961a23df6f3982447d3de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hsb/firefox-62.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "40e362ea134e1a03a9394f3c3b15d428b309da30b209553fbedf72e7b923439d4133b5e6bf8a79a2dba7d37fc65bc03f90df5608f360588ea80ac6208f13595a"; + sha512 = "ac9b1b4053cfef117b4ab4218a5e27c390f6eca3ed93bae5067e48863512e93ecf037e60efdaf1cd5e162f89915d35ae5740c77b4ac91b3f4204c3e4de250629"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hu/firefox-62.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d9b152504340f00b1ce00d7be1bc4ba1c80ebe87507f7cb3985fab52c0a04238e026b7488f46817102b578139671c81709ba6fc5edb4eb37b0182c5c52a54282"; + sha512 = "5ed2987282e18a35ee024b6fac92ce28ef0d195c8747b1072fe03bbdb8eed719d070b2ad74549d74f9ec0fd88b41a83d22c5dce9d1a9e09a6bd9397f99bd4db7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hy-AM/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hy-AM/firefox-62.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "c36dc4a3a87230dac351440cd66ce6f6479f34b65f018f36d1f3cf3b6f5eaccf40e9fb15dcf796032a2cb08028ec8b7c3407c03ab0bd1330fd669323d59ed78e"; + sha512 = "419aa9d8513edb65c3ce94cea7ba95bf44f8ac38e24f3b0ca63f0b02c01dd2719d54fd8b8f4128be5cfcdd8cf4c45d709b5b74679a9419fabbb630fb8708e4b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ia/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ia/firefox-62.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "cb0c4ab408fe879c9629bcaaebd4ce34be033aee6cbaa2a7360f68a40be03e0ff79e5ca61991e3378fdce28278194ed54a9c5273be401ce30c359b22aa2062d3"; + sha512 = "fb6f815b6e0ca4b8f4da7a423186b1973222bc1512461944aa6cf1cd1393bbac274cd612b7e17f19a27e2229c6a594d50f7d15cb9acd21932c5a5871cf24d04b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/id/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/id/firefox-62.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "98c413687af4db1e68229348290fe426d607f264179b1b634eac4ec87bcb36dce497ac25a458a97873a3f8fd962a47b865f8f5a5c5afe4b5beef56e46d1aad2a"; + sha512 = "c1f9166df40952b2b933bc900bb8db65c1c744ff7007cf93efb8c8e9d5fc886d4e97db92e7b0fe58ea245b6239b109f297b6b1c5e8751aed1fb7bf7c8549b218"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/is/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/is/firefox-62.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "3647141ef52695f91ef303aee2e74accb78336fddeff84411d2f20eaf4ee89407fd9b80ec9667587d5cbe81bde846b01893330e8576421a9cd2eba937b31fc26"; + sha512 = "d8f60fc52faaec8a02154826db63a8b7e976cb8667bf05bb8485f61ac3b29862d9a0d4953815e876d6019d99c89b76ef45f6d1be14a1286b7bdc57cd06d1cade"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/it/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/it/firefox-62.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "f20d33aa7081862088d25c5bb9c8ba90a1dd4a5951045ef80768f34216241f7dcde2957970caef715d3d935147f1254e3feb1269a302c4adedfcd76218445bed"; + sha512 = "5b2815fd990934dc49d750311592413c7458349e890d3a74d0d342ef86a1cadee8d870bd515b454d566d0d51866dca894e06580228a437f59ed793ca8df9de0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ja/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ja/firefox-62.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "32a3c325fc8a258dbed4ec5af6cb06a1d9829cf87b2863644050775165d0df2df6fbdc4a4d553f45567141d1c09a0a5a8bce3c7d4cab773502f0846f6f0ebb0b"; + sha512 = "5267ac59466a24cd3b07b33ffa3a503b907e84cf58e87d682a8173b826a7d7cf587fbd52d0d8be7732436f6cae5a638e0d0ba02d1f614ebe828514cc67457209"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ka/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ka/firefox-62.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "ec51621ed8adb6141d7055b82d1bfb11dd97f492d1927c709216d5bd57cc5b14f4f07b40bbc379f62a364769adf5c907efda8936c39ac077a56a2a6bd546ad18"; + sha512 = "920a6be8aa3d0b3557e170a310496a59555a49833d27c777e2ff446f001570b299872d807e0512a6c37e42d44d6c92cb213138170a04103a9b2169c84744bf25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/kab/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/kab/firefox-62.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "5e0e3b8a238f34445380fdec1bb4ee0d5fcd60b5e6947843af19f0d770c497508664af78a49c339eeb08049a870ab0098ecd6ef50bc1a3527fbb6c891e54edf7"; + sha512 = "5667c3cc41ef58e816de3212389d61d9cdd02f577915dcfedfed9a55bd050873578f9d45a05357952f7b8c77a218d68164fb71d04bf669d5fe4e948cc81b8752"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/kk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/kk/firefox-62.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "a3d80dd3ca4e969a9779e00ff24087013c5497b113b086d68c3dc33c6d05d98921014dcd81ce7cb871274f9d9b825cd1d09ab867d7329503411ff68431c947c6"; + sha512 = "17bed6ff7dcfeebc40c6f703c1881ddd872e7ce212ae560d3da27f14f140b72f7fe61fe59dca41bd198a7499e64e74b0775ea0a95200dc2270cc5f5ee6fe67a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/km/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/km/firefox-62.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "260d5585d544c1cbf7a7762bd2126041026dd281500475079cf8889a03cd016d5fb7d6b3da7483a51374cdfa1b0871317689cf248d32466885e0d92055e80d31"; + sha512 = "11bdf73fb720d05d6952825c496d77e2ba3bfdaf07250912dcadb79d954f63eafbddedae2eabaa7639c17a6437268c4924e48a07790ef57f1ebe2734723c5d58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/kn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/kn/firefox-62.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "92338e4f1d92ca91fbdb7cef4c999c6f78a1aebe69d6fbe46f7a67a13f4d63d838fa33d602990d3b10c160ee5e1c595fc9d37674bfea8a9e40088e057683847c"; + sha512 = "9375a349ebefe25a02ea74f7ab14616dbff8542970f09b9bda5df521d7ccc48c6aff48270b6123295c77848c8fd47f3d985bec88a37b2188456fd57d89d2510f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ko/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ko/firefox-62.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "6066cdbc6603db7b9cbcbcc85485937a9303466091cc737fa5fc5e219f7758fc1c0198378ff2fbc9a63059d6d93b018daae15c51d264c3e47ce3f8c4450d4418"; + sha512 = "cc5be1a62f69d92c48edec8e471565001a9a62dd9d4e9d1415e0cf5e4a1853e0a63c161725ff3c21d5fa58fee826bc90442f107012e1da71e1b4b353247edb71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/lij/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/lij/firefox-62.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "eb546ae48d9d5d88ec861d51bec7476b64a383be32fc225d41f86cf1f4f3cc4d4df2238d067ef50d7540f666d55e7c8d7dcc0856d24f377117ae310cbf47f474"; + sha512 = "5ce170b3e6c28a0d2d2efac7b0db94237ab9f8051c5f799ad7b07fccefcdc6072826781b96c6470f8d1a78b2821338bed58cfd43014ee8e23b7241119451a74f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/lt/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/lt/firefox-62.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4cd5648ab324ff2d9af506f3888a53273cb4f6848aef9069f153081de16f7159a376710c91c4dc4ff489ba5462ba3d91e5abbf824d9abd633455a6c9900114df"; + sha512 = "1dd418f20c4cf2d268c39bc3bb91018a60fac6c284e1967d26eff30728ae706b528a79b47ad91104e8045e428a47df17ecffc6ab91beb1a83bc76465be7bf7ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/lv/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/lv/firefox-62.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "e54cd1faeb530c680fb38c567398f208d5e9f9fe1ce0b5db78c8ed46432703f59f7ac1accbde86ca78617cdcf177bf2c9850dac127490bfc71264c2c64f7d026"; + sha512 = "227994d4be37899de8ac58019b79dac43191b4e46dcfda40f28691b87e495f42ae83d00586d7c278122e6cda09a18b8b41189ed084927013033070247f24d47f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/mai/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/mai/firefox-62.0b2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "8d7b7d264325de3040c981d8c446d1cd634cd7742eff7dcbb5edc490e43ac4d5821536d5ada900ca7ed35ebd2f7f3e935c76fede38dd16803ecd1cdf0a067f0c"; + sha512 = "2811471b87a09360b70075e4dfab80cf3dc29d298ec50e8a9d516bc7e3dd2af57ad9c23929c2c7eb7253a27f47404a4529aca2af5d837e43807c24f184338e23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/mk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/mk/firefox-62.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "dd740707e019800784cef932c037d779380e1f3db20c888469036b228a4b261050c072d38ce639ddd9caf63b143b5dd970dedc379a03621203479c148c2e2dc9"; + sha512 = "2c48afe3b8decea6832634bb861559e156c1617b64320b57a028c9245b61ec2681e8a9b2ffb24681fc42e34c2b3176d98133e24d6337fc8e450d267646065eb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ml/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ml/firefox-62.0b2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "695815665c4c3381f8fecb62d402aa7a868b8997a412e4230c92c0fe7ad454f249bff8f7f1a92b2bb002fda4f22506ffd988e6332f6c4a8a026b7216dad1b4f5"; + sha512 = "92009904ea47702f0119fb17c7ced25a7b1da937ca9f11e18565e5848469a90eea4260e2cde370fcf8ec1939498cba84d48b4992a70cbc79a5be50212dcc2601"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/mr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/mr/firefox-62.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "b7c3fcb0f41dfbd09591740e1121fd2c37806814ff9c7ddd8dd683b86c6445ff3b02f73338658968cd0dfb9487e779414217f29e81d4b415296a72349a575d57"; + sha512 = "6790c045ed9c73ac0426df2091c14054740eb8386c0f4b6ceebdfb65cf0c4cbb39f31a389da74b3adc922fc6e62ea0eb38482f7800023e7b28a4071d539ab978"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ms/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ms/firefox-62.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "036e8d6536005d77c5aee1532f302e0aacc074e005f0cf3d5f5f397e573481a3c6d3589d62dc84ec0aab9d9b2ec4a2aedcb4722222e13f8f78819177b790c3d6"; + sha512 = "8204ebe6cc36f76c1385c73df1c4d4e966caeac6207ddd85cd6f000908677d219e6cf6821df1ae92150695cdf4f2fb811d2f649f21d3aca35349284dcfbf3edc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/my/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/my/firefox-62.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "185286fe6fb8037240b07a4356008a3ceb70653ea2fdbcb25c7882c395e08e7d64fba7acb394447b68e970dc2cfc4936008ac0167fde2b8b4f2113bd5c5040f3"; + sha512 = "05e4fd1dbc9bcecd1980071cf953c5dad0993e718bea9c01e6e62c8f9b8bc4d8657009da1d99cef75182d15d3d8b90f306bd62e7e641c5a19c873877e713eeeb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/nb-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/nb-NO/firefox-62.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "7a199a5fba5d3c954c4489533f48e4424908c3d141d8a3f6055c7d4a6d071dab9b0d52a85ca899d0d662aa5668d9c5fadd8238ea9ed770097dd15eaa6b17c87e"; + sha512 = "26f3bb008850b84f77b13ab68759e929eb92a33fa68e226937a6d4a2e17b854d741b9863a37375f97a7d89602437a414c8b4c0f76a4f71bf8c86c9054730948e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ne-NP/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ne-NP/firefox-62.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "eadb4fe826c22d067f91bb010e7176ec6b0a890c10ff0716d68e21f70b28fbcc8e65739af7c6c9ed919abe5e067271e55285a0e3d809c7c1ba65376e8e8b8347"; + sha512 = "b1f09b3976e5db99d55836f664469ab0d89849130b5ae1c73d9d772ead471f6c9ad96ccabe440f1479ebe60c0fb4ac52bb365e5d57f0193086bdd03fda2937a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/nl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/nl/firefox-62.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "6bdfa9d6242d17b4396a25b5a4ed30a251c0aa85cbdd9a53bb89e0496673f138e8d3b938a2f7181523085dc3af0ffe31edeab78531f3e8fc35484fd250688cb9"; + sha512 = "b4f90d601cf101ce6b99371100a92322f19448d8fb208d415be12f7f80d30547bc962b30a455cc1c5efa6eb2e69985e194a83a98a7bd7e69bdcdde126169c142"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/nn-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/nn-NO/firefox-62.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "af7eb3ea2c18871c0bb33dc4997f38dbb7c6896bbd0d1defd027e4b64df65799e50c01969c34204f5f212389108d6d62cd2d52de33a55aa385b2d5eef34e4849"; + sha512 = "3fec29703a1b76817616428706c42dd240b05a4c0729c4aafb2bcee1942144234ab3b4e717006b3613b14df831fd7dd9edf318d46283c3260243e42eced1e63e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/oc/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/oc/firefox-62.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "59b939410f19f7afe089c8540498304cddea08a0061dbc1ec2d65be74081971e65ec3503dad820fae0126984313ca7fe36881e347e1c20f69feaaeb1afffff33"; + sha512 = "4e60f8a294d4da610d8ba52bf1e2cd0d4e76ba2574afa0cecf8b3f657015868b53e15a0462efd571975800055f91b8f70c39ad36a17a37857344ca14b23568bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/or/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/or/firefox-62.0b2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "5b3c288c6f5b09d21f600959bdc6fdb1b7d0529be4fdb3ce9c05b0ad3003e90ef538e6c1c058d0d04acf59e72616027c5a2eff25aac3fccaab7ff388c52d7a1e"; + sha512 = "1d309ccb6e0f53f8a8dc85c1c2c691f8728be063875a169560cecfb3feb11c4e5a0a075602e0a2aa97e939df98d5538d96fd0cd0736370c841cbbdb2b930ab30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pa-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pa-IN/firefox-62.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "5b3a227dbdd13ccda515efec7d10c529fd04c9f0a91363eb45c2e8b7386654ec906c83326c22d355f2a662f22688144317d89a302e59a7cf8d368df3910b1add"; + sha512 = "56fb76551693f0c739bf0dd42ed10c5cb4ef8be33e4f229e6ba42b83e2111bfa420666327176219f45177db7cb216007296c3abbd000c4426cdb8e2b4107dfa7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pl/firefox-62.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "9ca212e82615b9d7f95358f70e0f294001fc94eebdf4e96754c1880e136dcd428f6a8ca04b6c319587e2bc5a89b762e94f27c0439c3fc7de6b1e9f1d83ed5bbe"; + sha512 = "ea8a5f453e78e3df32e56991a2bd940b1a104ef857af83552c5a7b7d85223a3dadb7c2b10d08903c515de1f11c207108249d1a4d868ea2174bd8cc4acbbdb76a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pt-BR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pt-BR/firefox-62.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "b0bb415701de65165ea2c90ff837fd6025791b7061930999afdfda2db9d77ee4ab38bd11288db3a668332a25915fb97e44d26fef5bd5aca8052cd4ce2a0f8b4f"; + sha512 = "97d564ca87b0d1978c1aa96616714d208797bdac9b608500df3a3658a3724248f731265c3ecbc1adcf518a47577ff6e9cd150a96f75307a578e9e37b8ca4cc63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pt-PT/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pt-PT/firefox-62.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a6adbcae92503d65cb4076f7d917b7dff21396f70049fcc9836b4ca91c1d5d6016c1f74e0572b10361e9bf3327d87c2abea4d179bf2daa25f2b506c6cb7ce808"; + sha512 = "cff3873a8e66f03b9bde42ed27361761a04455c755f2f4b4780e92d0819aa08c851bcffbce937584164eed68bddf560c21e4d273147e3e2db52fcc376f12f5fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/rm/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/rm/firefox-62.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d86dc38bc86b27ab0b8cfe10b09f8d78219ec282690a5f876b174877371cf7179f26459e927044720390162a697ed37c2684225722c23acb26b5718a40b4e399"; + sha512 = "4e46719324957027c1659e13da8d2c306ce89c85db2698a8af00142ffeaedda648639f562035ee3c91b16cdef44834a059b76b0a7ff8645026fccc832aa5209d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ro/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ro/firefox-62.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "3441346f8842a956921658295808dfbe0c4be04083779409cf19846e75d6287c524441869252d693a23bf5e7794466e4ec9f6cd3aa363475e1f855ca3c86c872"; + sha512 = "99f21fab8546dec02584972d1917a7b72fae6eab929a27e2823ed3f4f53865703acfdca5ca81443b9a7417635a2d7a0e49ae0b24248ba4781330377255a0354c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ru/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ru/firefox-62.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "47c370cc4e1e759fb498f3e7889605ed4b9db6ecc7f1b324d800db89ab69369dba584e76fe2ff6777d47ba60ba3f7a628ca75171b7019c65d4d0275476befd96"; + sha512 = "207b795615e39357b9349d5985519328ebb493d4bc29b43abf1f7003bfe75fe0fcb21d3a8553083cddff049b5d7d46b15428c58d862c7cbb7096b162bd1c5df2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/si/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/si/firefox-62.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "6dc7f968e4e96c99cb12e682ce1db5139465816addff1cc9235187b8341c7f94dc322899b85eae96b85ff0abbafe937916ddd88750bc9b295a06207e1f8dc0fc"; + sha512 = "e96d47336868e7df0ba39e8036bae96b8883b6f4ddf90b3fa6353e46bb61580efd46b97ea3bdde8f3af53dedd072abdacf72fba747b98ebe46c6955be6910165"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sk/firefox-62.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "3537af8e430f9ae41f5ef4b7ec5ed883f4e70124c691db76420d69d16a19b06c0c9a29e4b17bf44a81a85a50bb9ed6bf1f897061d5e6a79b72762b61e66c6aa9"; + sha512 = "f1f3785f5ea509bdfa05a5dfbf41689d029d06af3bae1e143311397158bb37d6f232f06c82900a853470d2411f47d974fdef318f9082c46aa62299afbfbbb5c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sl/firefox-62.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6e521922bf2e5839b269601116bdcef0cb6a4c3bd8ae75c68afbf12fa9834b24da2e9e773121b50d7f38cf2dab28826ce246cd87212a9b742d0a09a2fb118103"; + sha512 = "ea0d91574603c06ce9f2fadda962ddbf1ab45f11618652d6c1f540119dcf41b904e2ca809bba8537e380525c2698eabe7be559539bf650b792baeebb118f72e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/son/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/son/firefox-62.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "98a1ef288662186ecdad6d15ce34a78a7385d0576c923a330a1fccaa36a79ee7e2ff8b8d874e253cb44df24a596fa11ff79fd756a814589ca5f43d277665f153"; + sha512 = "338391b220307b5e13822c6bc6ebc46da07530a6bab71305b3aff7e3d938494db0877d19b9a2dbee6706798402d93ba83db0c9c63061b063d15b25ebe2013df6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sq/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sq/firefox-62.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "1a51452b80bf795c72b9e4696768474bd21bc1311be6d943be0c4bfc8aba9cdc3e8829859ffb5c73fafbc7e5be0d5bcb27181842b0d55699e1a943c8b4dd315d"; + sha512 = "74801d764972326f1c96197ab2f4e8a20b481a33638c9b54f56f6d627b8610f7d22fb9ad309d04e84b9f9a931a2a40a0afe473136ca1d0de6c0f809169cdbe96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sr/firefox-62.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "2090f30b3c24125ef4c3ebfbc8d11867d2730bb4217855384d7a61a1b76aefa6223dae5fe227acaed2316697fb877214b2f1c9a62e497ca026f2b1f8d91d48fe"; + sha512 = "17fcab8886c7d3cae3ce36af19ad7e3066ac45dc4f91b57cca7936cbd34fed1e9c0250d220cf02804298ad07151e3e247eafb398ca6d4a18076f36e4de431db4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sv-SE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sv-SE/firefox-62.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "55ebddd90a2504be1cff612965df4b7521c32c9adc168e2323a898219d2780c503639b9e073b26928838da533cfb06dc90c98192a522d9cc2192bb1a82c406a5"; + sha512 = "8caf5d927039be97bbd67183f9e92828732e6d9cd5abac4ba0b29de8097402f0080c827b73ae244bbd1e3a99532c4e9f3e961d6a172426d342f9c9a05133b459"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ta/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ta/firefox-62.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "cca9e0c313f019e2cb00ffd1f8343d78e033cbb88261d2b58f543ae7a743aec6f5375e88f3a56aa87bab162f511a1f7af147aecc8bf3d8c1533ee4fc342d5993"; + sha512 = "53311054be09b410e9a5c4e319e35239b70ef5f08a7f5f127f437f627dbafd5938d7f41410dc0179768c167e4f4a84ad78b6d9d3b2b2e5cd40692e1c162195a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/te/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/te/firefox-62.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "7cc45e847c58b11716dbc0b26e7a5de7950be959e4bcf7ec2a245974494b2e2d0ee06c62696e1b1b1b2959fcc1f728e4b354445ba02b5e762fae16460c3fc2af"; + sha512 = "3cf97c0a96806671d4c78af3a928a373ae4883c1c49bdb59730b74bd5f19cfcbaceec81ec48a918254dd35263b8a58c3e1b3ed2d443a9f58e3a6aa7c83934637"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/th/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/th/firefox-62.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "aa1420d420388eb49d73b09e3dd6313b376b233e3e4e681f9b284c59a87726cb85569490e6978524040825f0c005aff936e25881dffd0d42f76f07060ab2dc68"; + sha512 = "0baa020a46e27660644b2baeb299c466ff77d65fdab54001060ebe4682e6959128d7aa8c1b008821b777fdbbd20b36f40bfe8c099072df3bd0a0b4884c484ec1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/tr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/tr/firefox-62.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "4783e93f6405cb1a4bb66010a24cd41a957efe638bffa8ea11bbcbb59f0a994681775ebc1db242fcd3abf46cca1050da0e25f60fb1bb866159a259bddbaef9bb"; + sha512 = "36a7668168dea9a0995a416d1c0612930c4f3d2b66622f04b89e22c438d0e95adea57de6ae766d1c22dd81fe7d4cccda9c7e6abd77160a36edc2d505451aa139"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/uk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/uk/firefox-62.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "0b8ab5e88943be553a2a6482c266f81c790732099f3dba6614a1fe2c520ec4e82c18fe5aa525e40c425975c71ea992da6b04f336bdb52d1ce069c3cb715ee235"; + sha512 = "48086676df822883aa7e193af088d15988ffd5034eb526a4656ab02477dd1832d3de3d12680d2bd7b25f1bd771a0c87c10aae421f9020f09c4fcf527267f538c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ur/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ur/firefox-62.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "03afad45c029f408369b44a5c6e06c7ea6d348734b5d8af90b94b0216646cf025c11239015698f7d2d94921d583a13caf57cbc176d55d283b990496dba6fa34b"; + sha512 = "a7e2024b5721e70c0118f13e4cbb45108054fa3b2f7702b7e219287d0a380f6e769d4e6d1a65c766653e7014c223edc607d5962cc62e6a0a18559cddfc7247fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/uz/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/uz/firefox-62.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "dcb586205dd3965c511ac6d675d4974a7d3d3d9574e9db1e6abda9da93cbc197f76f0c7d656778211f3b4ade70733953b0753d58fdad45eb94faa214e325b8fd"; + sha512 = "f88b75d07f5ceed0fd0dcdca03f30ef866c367a5656f1cba5a6bdcb8543bd65791c51e1763a333ced20b4b0b10b292b2d4e04f81b8dfab68607f5e9e97d5e53e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/vi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/vi/firefox-62.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "3bbd74b322121d2c82d17ea137985830542c26a51fb154d02be9f09aafc5456160fc78567a21ba0a8cebe0b9f86aa7e7d83b69865517bd6a95ab8b34573a26ce"; + sha512 = "15dbd0458d883e0ebfbecae7d6d506a1ec4695737373deb881f3a10895f4777927ee1f6454507bf995db9bbbfb5eafe71aa7883939e1ad1dde28cfb8cecf9103"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/xh/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/xh/firefox-62.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "ae0718ff478b973fa2c76470f5e2c01014f270402251d8474451764a431b7cf43eaaa59373904446c8e2045c844a35d4e2027ba2e694d6cfd89c7a38178d9187"; + sha512 = "c6f9a216713fe8cea1231cd2caaf32bed366c961f8c03eed4d80689a00b28e6a61c945e7bc4458a30a438c797f6a576eafae5536819fa98b70e0422a081db4dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/zh-CN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/zh-CN/firefox-62.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "fcf70e05a796cffb027d0c0396861fba4a58c98ee773c5cbed38ffe09786f98faca147117915c64fc9b4d01081de55d4689547c8767d84609b66927d50982176"; + sha512 = "59fefb1f8a2218f9ff1022a37b15f9adaae32031a2869e9aef0bb48a1dd44133b812573dd0cf63edc68abac4c5bcd30be9ff44d8ee7c49348d969cf456cffdea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/zh-TW/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/zh-TW/firefox-62.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "9f3978cbb2a51182ba62fa68c09d49e33cd0fb68be7d8de8de2e335997184648981cffc8e90764452bee0fc81a26ba9b8896ff630e81918b4634e8cf6923c5d4"; + sha512 = "8efd164392d3309be8fbb7fa2718f11fe877d78070818c0a443b89a0f9bc3ef3689fdca2c7b02bf69783542923fff9c482b6d2916a90b40cb68b3951204c8a65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ach/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ach/firefox-62.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "ab140f06e11e226bedf7bf01b2f5c366b654583bcdba17546c6b8cd144ca6a71424f774316985d0885733a7702d201995a25964e2015c278028888a946c26099"; + sha512 = "629a3a267deb22985d2ac17645b004b6a8732c694e8d5d42d533ced212df0b36e74ed31a2870e11a841193ffee3d9c7d56f092c623ab3328f9e683a0a2c39e39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/af/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/af/firefox-62.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "8d934c0823d899c8a523a131eb31a7643b137f795b94c4d73cd675e0c10758cfa051958297dfbff57238383284eb7e8986ded98ea3b952d4b60135e426948bc9"; + sha512 = "fa0cb4898b4b09e592f3326517459a356e41edd53cc28e5615a7883311b43ae728f9c80f7c0c3e114186aa8ab9465e21af38e3a75215e184e30e2a31014de1fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/an/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/an/firefox-62.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "1a0523a8900909bfdb396c6bb16072918a78a65011f2f88d714ca74f8bc5e9f667b22e7a30529f985f34b55c05b547209c5d307d4c576cada9bd5af144718f6e"; + sha512 = "ea862964df4a53e2a57b858f8b6a6d26743de5a49a68a6807cc86ac3eb68330eba2e71c193b8bf3fa70a267258825db588c4da43b2c0f4b0fb002d4d9f5b21e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ar/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ar/firefox-62.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "283ee30ecd49786cf23207cd495aa58fca84be51bd65c329418ccd6a09e058222ab1d2cadacc94074b7dc35707139659639cf42ebb6edf1819b9ab5520cde691"; + sha512 = "79956425e3086e74fa4e693aef7f7a8980b5ff8d2660f98d9f1738c538651fac13f1decf76b124c5a8e6b61f8b1e7b9a11bcc5a451b832f38449a00485e82577"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/as/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/as/firefox-62.0b2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "637fdae253df177d12feff2cd70bbf308dbe8f2bd51c09491de35dda9e666428f1f42c80a110fbbf38489c2ed6196e34fa8e6f9c1eacf15b15d721de0b8f37ec"; + sha512 = "efd784691330dfc8601e145cc8b537d26505f533e453f771629414adcd4da1f4c047811acd5e628dc40c1d4f32d6db38ce92b0fe73730e131a87ffabe15b49f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ast/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ast/firefox-62.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "087bc7c5e22defd3141cbccc271e0be8af29fdfd4d1842cf6c1ca1f757921cdd5966c3c6351d489a3026ccdd75becdc5c1b318ceb64014593df348309d915e8c"; + sha512 = "b588d2b98f573b578986f1b5639e4b8e5cd6f38427c8bdb5a31377148772d2e0c843c2e89765b9f3d75e3efcd1f228cc84f47da5df67cb71061058472d3d3b5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/az/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/az/firefox-62.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "68fa700cf5e085361bd49f53ec79fb096820e9f4528892d37c8c846aa2d3bcc7b39de0bfbcbbcdd8a23a52ba7a1449196e8c81909e0f8ad2924fb2a68abc8fac"; + sha512 = "3aa4592c594d548d779a2282de16672ce6a836b49e7dcddee75e1d528ed7c9b687f9ff380e7a3f0f1dd94c9c23ed8889eafdad1bf79404f54b5b6e73d219e922"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/be/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/be/firefox-62.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b27df80f1d7052b5ac80f8a05c20b71f20d13b9f76b92ab10fc3bb591ce8a6d2d5660aff11d2d5c996843f60b5c0f661bca5f750a097f542e8ce3c719bac14ed"; + sha512 = "b692bae3de9a79bebd51a700174030dd7c7b8e4d6de34b9d7ad6224dfc476226d7eab1149202a4337bc5661fcf8f23ae3e76cf07a5a182c9e066dfe8cbf13889"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bg/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bg/firefox-62.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c1dda1a57ee7b565e779b33b41ba7a92eb49b8ec4461bb388761fadb69b33011bc26f0e253d7b9902cc526a105fe783209e8028dde3ef8c1ded2543d17e0735a"; + sha512 = "541e62c2dafdb1176a15034dda155be75a5f96278e6052266529078332d9e89c95245c9af8880ee033d4a5d40a6a1ccfbc3ed0f8c1c1e574927841d3e2fdc8e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bn-BD/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bn-BD/firefox-62.0b2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "fbefb442d38a01c3d2b45b2f9f251a1dde050993d6c54a58695197a57e493a1b0c699ca6995b4111af230893912648b1e0009ae4b852803d71423427759491b4"; + sha512 = "ee598835112d2369f496559afab22ee91599bfac35e26bf177bf7d645c33acdfa5f0f2c4defde697e36709b8b65d512226d18046b10536b73852a7e6279aa8a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bn-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bn-IN/firefox-62.0b2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "dac0f5d616daaa19b2507ab9d43a0127d39bb41ddab92519f33f0e9950b34803e1fabae035d1fb803982d6f0b5bba7192695722a728ca85ea9602fb08b775cd5"; + sha512 = "5c4141ad1f91755d02e06cb0c1c9f39b49aefc6b43f35c2bd4eca92ac855dd316b290f799065de995a73e2415e2a2c3c78e82e5aee44f50e02b3f44b49017136"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/br/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/br/firefox-62.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "bc4573646eaab95724a6b3429c3b0263fddbc65ad0250fe7fdf8ecbcb4a0422b39513d03d018311141e3cc67f95b994565949bf2fb31b41be10991fdd610d7e7"; + sha512 = "7a58c8fbf96984fb0d77700918990f083993498c284a4e38a2b24832d6cecbd960b71131a3e0da3410a9be9199ac63f939a278249fb38143e2a5eb1cec41378e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bs/firefox-62.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "a8dd8a5ee5637f8a0bdcd00ff142fdbd825308097bec954bcdb8845076dc8367c09ef4fb0783ab47f5b8581a6ce4befa9c883d445ff6d96e444751fe8d4ae23e"; + sha512 = "649a526b35c4b0b4dff5fe8fd4928fedfe63e2efde8d97dc1672ef469caa068bcde72f9a176f8768d240739bce37b1d26264f2115bda6d7f95c9b37e0aa184a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ca/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ca/firefox-62.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "faef1b8531dacdded64cc0bf572e075b81690de76835c9a5a108b5d3fa0486a930bd8bec943d91f177166c51b506fed683bb00071873d57bf87c23267993f79e"; + sha512 = "36ae7093d941e0523107593d466de2c42c2b8cb293ec491ec75e824cc2ea34d579b57f06e4c0bd563ad5ac44484fb0ddb2679aaa195aa1e0d6f823042b502fa7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/cak/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/cak/firefox-62.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "21b226e39e0d02dfa3b7bde90a47d407088d327a82abf21b5002e56eb28ed7605ea35b28e15b088d6486dc9735b7cb8827a51f1e17ef07da22c019214f3b0fda"; + sha512 = "d81dc145819bb8211559f42958434b2fefd9891144e4d4024e7196be70c549483f8f25e34863643095dbc65a182ccbd1cfa7b1fdd46cb0a7ae5dcee1a3d4c6a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/cs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/cs/firefox-62.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "fe52d89c9176a4160636c04fcd2cbec1add30db3ebc64d9f2e01d2439b4f1f7412a5195cd29f1f7b7b9b6d062f880062f6fa33674a413a4257250ab764822b35"; + sha512 = "75c7ccaffaa13d563a79c71dd21bb262ea128e8ac12d81db18255d2073910c78e264a77f3e7e9d022d316293bec91d4209738b805a49b421f88ecc992049fbf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/cy/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/cy/firefox-62.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "75f1f87cb31db73dadf4897e8336a7af2433ec89cd9cf886c5bd951aba3920df3e5f723a730607c868ce086fd8f4e5fbe3f6e31e5c364cc9b498586bb3804ea1"; + sha512 = "818f430ba479e5287df5833c4222b65b7fe733805a1e55d664829032e8933419012ea4dd01e3c6ba3f02fec7c954dd4d999cf55b49464c040d0649d7a81ff455"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/da/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/da/firefox-62.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "c0d646633133e05c792ce2d4459b0ed754598192508b0340a24886aa2b8f65a3b7487b20f6a5ba19f83cb64ce4f480859ed5f3d14e8c978c4bbdadf323988cc0"; + sha512 = "a9bb147b35ba5da74dfa2dce3c8422d8d6b224aed390b1f2438a3a523b3ab6c182db6a2a15ca39db8a3e730e4104b7c5a8043557bc9d91d3c6d116bd8411690a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/de/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/de/firefox-62.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "583ba8d028fa48327747776c7027c1598e600860ee0b9409ebbe4755fd552c189288903e61904a16d3dd065dca030ee5d674618a8b14645c2e2705fa41c80d3a"; + sha512 = "1976bb7b371fe9e9da812e76fdadcc6d1cf95f303cfe7f6f72fc1b98f2ddac3af1bf0665d74c22f5a2cc41046b686cd59819b2bba923d5c02ed956577cc80682"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/dsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/dsb/firefox-62.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "7b7a508fc15dd777b00a786abb9ad013f985c6c3389d78a1882323e50b3c09e49bf63391df5b3a4e91c60902ea4522b9b6eb5b93915bdedafdd303c6624aa9e0"; + sha512 = "6be5e34ef9e5a28d0a92c5e7c638c0e902b59a596b03ce03af2f86d88e4567f01a25005284af49cf1143bf1b3e3cec2480dd04b0ac0cbbec7b85e8876308a02e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/el/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/el/firefox-62.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "4bb687487ebcc9283ccfd737750f6724fcd787f441ed7d48eeb91133768191f04cb38770eadb854615907a04ccf1279746e6e12f8e7ec78086e97de6bae0a9e1"; + sha512 = "a119500ce6aa1f2c26041aec8609b88cdb1e87eb3cd8f56148a0894fc273f3899a3923b765c8b46e25010893a55acddc24b96c15bcef2553702fdc0d4bbe05ad"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-CA/firefox-62.0b2.tar.bz2"; + locale = "en-CA"; + arch = "linux-i686"; + sha512 = "83bd5fd70859ac58f142f837ee96e9241ef7ef58f603bc88b82b5272d296ebb4eed8d8a84a64f105e99bc97ae739e00591f45b46bdc9d369e8c613d196e864eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/en-GB/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-GB/firefox-62.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "cf50aa3949578ee5a178b665e58ec148a8534226f31838b4df01a06d4e860b61ccb457d6c3f59dae735e8d9ca8e80434b27f2d912d437dfb0695d5c5d6c9ada6"; + sha512 = "533a54c96f7ffec3978cf02c3bef945b4eed1bb81f4c5831b8b85901f84d262869e184620e470ff41afdef75dd3f3340ee904632304dba285ba0d4c13a6e3ecc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/en-US/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-US/firefox-62.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "9e1f551c0f63e2aa1db652b884315a366debb515197636d1e2b81e6d94d5c764705716f610931d44b020ae97175ad88780421071bf000751e66ccb6935360303"; + sha512 = "294fb79215d8f2d0fd2a5bc721acdb3c3062554e3172161ca71e5a64534ff01ca61c637d2dff4a5396c64cc88f40b493e96f07441aa6aa297d14ea9c5be88f29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/en-ZA/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-ZA/firefox-62.0b2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "9720c4dfe5a2a9916325f5f08577ba0517c51e517a3b10b7e131fde709fc1ad26bdfc8e21b4ec09c0a7c0afe1ed6a213ebedb603f6ff49d8be3dfa8f6bded202"; + sha512 = "1b8ff2d6c331e1e5888c50aff0529487c918114de850d8d8d60e3dbbc45b3669b56272b3163d7ac15a9c56a939935358ebb7761f21184513bd3dac4dd3a7113c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/eo/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/eo/firefox-62.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "58c514b410d3b91ba370ca3fa01cd6cbf2a4925875d77b7bdbefabac37b6c84327064a3086c862eb4c7a954bf86249502defa89acb245e725f521460e2fbbd82"; + sha512 = "0ebcf307f388ee3a6f58a9383207f3235d29fa240a797af4d7fe6d94e552203c1d46a1a94b4dd5d30d98d12ffe4a33b322947c684619459e86e0d4af5952ff8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-AR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-AR/firefox-62.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "da2ce694e2e161c20edd137472e1217a7ec5b90611f58992116fbf200b53006599723f7510ba2e242e2a77c6279ce6ff0b7fa61cd5d45f984ad3bde2c473b237"; + sha512 = "24f2b7beb26ee6bde3c47a71ef5ca547c276217044e05c8f13a2be35ad96f8d387cdcaf0a8401fe348034f322ef4392a8f77711b0d43dc02eb74cce9be262e20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-CL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-CL/firefox-62.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "eeb0d1e813e1e90da99ed7539936d3e8189598631c89cf41abad0069f5e992c972aad661d59a4fde25539c3a1d33492fabe9b809c95e9777d8ac5366d3b5d3e8"; + sha512 = "3d33ee9df1712971a1dd4bde372e36b15e81b2ca841fc3c2096c3ba45119923ae3f1bfc37b9911ca751a161b90393722b8af0ab196ab92607678316d349e3acb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-ES/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-ES/firefox-62.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "ec875171c103e574a91f7930a346b9fa95df13288a58461ba8f7affe74cf97f741394c98ba4891582cbd19c26b870e46cbe021678625c5435e3ad42355700f05"; + sha512 = "206eefa522da06712c655955420bf7aec89ad0174ecefe132741e0d84cffccd4bdb72f448cfcc5c47e1100ca9c532cead8b50627cf18575e53e2c383bfa23226"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-MX/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-MX/firefox-62.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "974532385a78eaef5e29f7a345c0b74af166251ab7188efdca7c1bc0a579c4677739adbb3c07ca1b27dff7012ab1f31be1c6aa383bdc4a46e84ac34bee25ef71"; + sha512 = "1e4c3a10e7d2f34aaa1164c7e92d79d3f21928d5d1d800f9cf329b0016d7a2468e76c37eb2038363863d8ffa1d2da0248264d1dc7dbf21ac3c41d03b793ef4e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/et/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/et/firefox-62.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "0dbe8007bdaa26c8d4947f0f9c58233255f5e8d16beca1ab499e1d67f386f97733071adbb5102abc24504193410aa0d0f43cc0ebd235d06d35e61b6f41b70375"; + sha512 = "770fc7f02278d0e7fa9d3d18bd943c6d1bae90eb8b4ffd1c2d9087c49e6e9a990a361d168709811aa7de5c34f5923efa7d1e44d70a66c2e0b126e4776f10a0b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/eu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/eu/firefox-62.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "7ea445637a36d5868a8c8c5b8645e9266082ac812e5bcf36ed4a5f9369324112d700fe0809cff3bd4b543b15e2e09569fe4ecd48ba72319321287b76c6d0a896"; + sha512 = "760c630e156d3ee0dd5a9f836326f47a9adf88dcbab14eea48520bdc656cfe4d5722655cf2a64e4235a2407453e2f3a40e57a05d53773e1827083ef9ee5224cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fa/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fa/firefox-62.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "612eef22e6dc033cc601fc094f22fada961c4309923245164459bdac44e584d3dba0411c5a1c708585b3241a8893cf7c760355a3d1f396320354ef1d104599d6"; + sha512 = "55bc4f4cd68a9cadc0dc225e017f29d1b631a31d9b62e2731a199455e3fcbaa7a67ad41a40d8eff7848a69c659dc8226656ee848328924ab214ce360456f42c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ff/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ff/firefox-62.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "a927567ab31a8e37dbc6503e9cdc1048deda751aa88294918938bfda055e7bc5175383a0eb0168c65e69c35ad758b9d6e22da1765fd41901e2818091d7031a50"; + sha512 = "fda4adbd6b98533d348368095fcfd9e2a268e0824387755448a737c17a8b7b1d82a9de4c1081756eddbb9ac6bb33ed2a637f826217c0fda3ae6c61d88800e963"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fi/firefox-62.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "0e2db17c273b356c9fa62eebdce05ba2f2aac8dc8d593f96c2e3c9aa65a0e6aa183d1216342970bc78173bbc08ecddf0016c87989f36ede989d65410350c5588"; + sha512 = "c4a93e9769ca4a88687ff5d050d425345aea97d9d15cab4ab89b4ee9263df6ed7c30ffaac17434e35c6b3574f71a24ebe1c3c7aec53d81870caf4884696aa878"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fr/firefox-62.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "09979e982d82581dfdba0c1737cc7b4e9849d176396ba084088377bf86a9ca3dfd5f9174056154f85bc95632bde09766e5e206b2e6be7f65f0ce63f6b6cf4f2f"; + sha512 = "88df0803f1a18ef0da2f5b2480c6ae039b3f079eb2894db760170a3a535513e847aa92a70f8f42925ea5732a91235b0a3ccfeb7cf055406bafc13c308e45887b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fy-NL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fy-NL/firefox-62.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "515b5b9acef3bb11e412e7ec26b05176aacf8e9c4227be62890b613de0d94d3f9dc82fea287990d97ae7ee2774814c7aafe6c02bdd74d2fcb88074c17d2fb1b3"; + sha512 = "445b24fa7a74e60e97bc870cdd94ea2f9ae120d6a788bd4b44c2e496f62395f89e7112c0b309ef27d66d76da1b3e22b72c780c189275ec84a511c7d758c81bd4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ga-IE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ga-IE/firefox-62.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "90a3932a735da2c82607d2cc7403d6ae274c6d6a292dbe7b409752d70ab8db47d3411bd39c48f9643f54fe21896bf48c1f7e6428c7b903b349b9dd871404e9f8"; + sha512 = "6ea507929c6d886aa7f9c55b097f732bbc38dae75cea14943d1db43f11aa5501e0b99821ee33816cd72e8ee9bf138071fd75f7eab400e5ac04f424a591f3cd52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gd/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gd/firefox-62.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "04e0c9c45548666b4aa8b22fad375759b4fe8bf236e24f0039a88792242a42dcb928401b2f84b1f978ade360182538d246846e3d066fcf18de3944cc02544e9d"; + sha512 = "82b4a68795af8fb47c024a9675c75d4ac5d4e6f09217493ac2dae1fc0f4fd2bd9f5ffdf89f5338c943d26e250ad546203a0604427d0d614c04f1cf191b1c4c10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gl/firefox-62.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "8e33ae93083535d3e16c92121f6af480193640f17018c51c648ed1cc8d56fbcb43a5a1a82ea964a494e19bfd23f2abb22b245ff0ffb22511ea5273ababb603b1"; + sha512 = "231777e852a8f09a99aadabae38a16de21939bd492ce239c6e112e148b84c9742eb0dfaa12354aed277322d763c1d01d5f946477d9608eb8dc8fc6942f6bda4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gn/firefox-62.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d8d3a3870db1a62a513aa85775c6eee8a2de6c5aebddd3ff76e9a98d1197e38509fd79caf80135c8b1a3a01350633f697a88a3c5b4e99bcd1596e0e8ac52fcb4"; + sha512 = "9a01dc496021e351bfc1169438ea23ab5e01c5e29df95b12c2b0085403baf076e29ede5afc906311a866069695cafb5ad911098a1826bd1078cbd1ccba048fd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gu-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gu-IN/firefox-62.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "648d1ac593d0dfd81cdf8ecb5881e15d3378993b3dba58d0702ce6c4ce8189d589d8a5d3ff600841787576a60c6e6af9aa5aee7ae6f6ea182d8ce9c5bf1e368d"; + sha512 = "e453eba04e32a850db6884c65616d0c33f5926b6c5f8e791dccfed565ba15a6d07878ca5bf91e4d7e329233e74ec7f9bec37052e5d57c37b257f47092634419c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/he/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/he/firefox-62.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "37bd53fa8de977d6fff8b86134a2a280cccf7b1027b4af3a28fe7a1de6d5571c63797be1b029231e0133c60737a68d5d6c3ec5f8ce1901e31d94ae9533148166"; + sha512 = "12c9ca53789b1a72dcfc311017fc3e4ca286da7595f0198da02a6217b0a4ae1c1e517822cacd7e63df7481771141cb505421e65fc872a0665578bc5b8bec5bc3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hi-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hi-IN/firefox-62.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "375725d897b046a40793ebcd8689b6553095f931a348a38bc61b8123ef94f34e9f0b25e699c048968126ff26d09c2ca5b976a671251a8ea10a8edcaa837dfa25"; + sha512 = "da90ba70059980d76b342be7561b81fc1f1d95c04995f8a72827ba7009b4652b057b2dce1f359cb6ef5eab2ca67dbe2bbb8cc9da3df436cf68f9073412aedb44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hr/firefox-62.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "58c400af34e1e771b04e9567144911866dc752ee4d95773eb77886d63fe6e136b15594cff3910088938186e84a5d875b6d434a07a3a5ae4fa3912f06f75421b5"; + sha512 = "cb7295b08bc58e989067f65143644b5716689a4d5878e24880fa54f77b455ae9af5de310ca087ce78d7028eb8da856a25f87d162e7f0f061b6f2d061cee2e91e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hsb/firefox-62.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "29f47f4b9d0878e1f8977254f7f0a7d919f023e3d5a64a0c53f64271fcefe6416a278bf83025f8e235a9be4fd7b0afca34f5c796aac4c0c1b204118c3ac5f9e4"; + sha512 = "36cb530230d00c7b0b78072a2c9017431d93296a291ad6436088564e099298848639e86bcac3062d056dac9d7b985b4717a167b037b17e925fc269430b1bfe95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hu/firefox-62.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b2776f2003f140648fff22dbde719a325b7eb407858086fae671149cfb975c89f433cdc5057daf2cd07e84e4221026c33cd45f6af7a9f54e9e7174bf2fd26636"; + sha512 = "b91a1efb194ec8cfb8ba9be21cad49eeb75c273b3af5c78b887ca44211ce5a678aa1b307b4c15fd4c5e1e24ccc4b5c1d1e758bebbc20d4302d3ba06c2da39146"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hy-AM/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hy-AM/firefox-62.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "889b4f043aaa78d0a5418fab3c406296396081c5a21338ec07340f89288ff0f99e7a566aeed04e65765e211c2bd8ea5a8df54ff2a9cb880639114847008b7524"; + sha512 = "5c52fec228d283146654741b634906d5ea5a172f99e5bbcf9233a330473df4123192ffb44318c3399d35000b8533b9542d5567df24558b2d312b0e9565a961d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ia/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ia/firefox-62.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "3567a4595f322a38cfb3cac147c635f658742d516e102e07dd8438b7939b0613ff913ce86b0ced95f5c0d7dd5e0e71d673534aa5f96938210fd5bdb16397b9d3"; + sha512 = "05ec2b4348a2bcd25d1c0110a6e86cfebd0bb1c62c8d2b931ae8c3fd9ffcf39a41cbd3be52b3522d62c5f9bffd41f3a47ac6fe6c2602a784aa184146aa698232"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/id/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/id/firefox-62.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "0cbfae9884e3d296730244f15342952141771b0e6f1d48d30b29ded30141c51cccd9cc0cfa60f50987d435da6e306deaf93c7b9dba86be591d958e441db00b2d"; + sha512 = "ba2931615fc7468acf361a722df435f6eb6e9002c57c1cb30439343b16b166fd78e17571e250c4aa8f2cc803e34131fa61afd582b7d78f59ef858ef3ac8c10fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/is/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/is/firefox-62.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "ca491e6ae92d933b4fc75c07aad7580f8d5aed90984363268bba1a2db4c237b09a6a8fa09a3b475d9f6e06b9def57a948207c44c9572d1bfa48f3914d9446eba"; + sha512 = "a2f05aaf639f22427872d84ff3b03893b2681984f52142d8451ce211f1f0c3ebaf8cdc0fe11c7ae6189b5e2aa21c82fa4dc4060196eaeea944b0a3aac7929bea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/it/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/it/firefox-62.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "1b35e8cd0c2eeac92ef7d43ca73ebab85b731cef5e505236f5c9df4e9fb05ba8f03455ec2ac6262a0bd86e3a05c6d8ca236f9437277c36154011e6721e795e75"; + sha512 = "749f03441d05b11ce5f1db1594d56c3dac530876a179c6b98a3932d082637e70102281dbcc7f988545f7b455fde4e20fd99657b1a318fd5e953fc225b08cd699"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ja/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ja/firefox-62.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d9252c1e002802ef09e85e04586dd983adb5fcdfc6248e5b7cf71030697477785c74409b27f6640c02a026a621e6edb6b20842cd0d6e2271ef81730a3b2b5cb2"; + sha512 = "6bd637bccae955eb543e648329061546e1a847a0dd3a7d730f73cbe9ffb2eeee0e1ee1cfa900ad6a2e2988a5cb70e3a7284c3e13e8be8e9620bca6d35805eee9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ka/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ka/firefox-62.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "a9b5fecf88d96bbfe34901bf8a386c8b31ad97f87c322294a0362d992b88ab42fc78836c70cfe27301729aba46c21648da0377a0f113b99ddf14b524017a0b66"; + sha512 = "f4a0bad9c3ec2f45039f87265eda6d1c6b318316147c0cbbbe0c4acf066ffb2051070420edc21c9d005d06e9d7d5b2b97347816cfc4386aabdf5ac7da7bd1010"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/kab/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/kab/firefox-62.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "5eab8f88267155c8d8d8164047e624900ef8d915ec5c1c4fa275df7ee2745427e2ef50254c92127d5a6768c70c2fad9d7c7c7c8af1383793b238ac00a487fc42"; + sha512 = "ee9023d4c7485810bbf8d506672083813643ae477234b4aaa2beab0049f12aab83c069bd0a74fb4d7248f398c3f23e9514191d093dd8e40c7afe12ce5896a57d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/kk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/kk/firefox-62.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "c22908d53da55aa3aaf5929b29af37d6b273df6164784bd03ce89e7a9aaded8cdc939ea0c1e7b87a9c4ef3ff0a76273ae1149259f9ba8c3d98db75d6b8755e20"; + sha512 = "8dbd5851b1c3e26b69cdf5176f752ffa39eb3c10449d6e28cb4be7472969550599e939c84d16fa600fe33bc329141d0f4d64c77e74072b154da9ec83f186cafd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/km/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/km/firefox-62.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "ab73eed0d4649afa678e762e361eeddee7d188beb41d4415e272e8bbc855c25666642b5b4299a3a4b5aeb80d1fadbd59c3dbcabb1d30c2bd68d2def706259d3c"; + sha512 = "629c95765741b39acdd44cc3bcc509e7adb3c2538a1a3786fdef3f856276a6a876b1a42df1a462f27b4d949e5b2c11adecf49ac196cd834f24c3bfeea9737825"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/kn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/kn/firefox-62.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "d5219ce9149b510283c2178d51c209f88c97e5c73696316f9c0eb94492950c6d9d22509655739cd32905d6e0c534245e7dddde9a5630f61d2dccd14dbc968663"; + sha512 = "f4bd52a1253e5f8d258e16051de1da8aeeb13e79a79b8b6e674253b1b69d3f153e75c75b9def32053e7b65f4d2de154ab83f5bda3dd7d7dc6763e2eb858ee3b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ko/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ko/firefox-62.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "633f2b5bd4d935b48c9da2e00b1dad339f9ba3fc6a0c2102e0b2e66fc4c3177013e47d99afd6de9d54d7897b54270b85849c60ffcdf3f75d78d85f1f85785df7"; + sha512 = "bb68ef96316f2e7960e80c2351d08f98301da66f257db5c3326c7daba7d352b07ae6a408f7569f1b88f1ea35e060a6e75b2c253f8905078d7e48aaa6e9a7f9d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/lij/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/lij/firefox-62.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "b29fc63919da339eacdad4e9851f1f0b63f3f3b46590b86256b9e1bc7d0ecf7cc91d708b54e1145add40efbb146d8e4470f77a4c33118ff65445e2802e6fefe7"; + sha512 = "b8eb9855fbd1cd4f8bd1ef9a033925ec7f355a9c053369798203742b31c0b077618a7f31a2534c6e802f2d48744b6b08edc3024d30dd1a8ffa2dec10700568c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/lt/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/lt/firefox-62.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "6a38be681c24da3c3aec3fa78a0561f96d53d1b1754dab1796f137cf1c1dbfd559b3a4e77bbcf47d5571b56f0ee176af0353827a5899db8424e471af67a29022"; + sha512 = "e2174d2aac6f82cdea13a8a9b60710e149eda357a10e084bd566b336fecf63a04b34372d343f54cfcac4ec03781f1cf67b1baf5945e9c51b65015e3487dcad85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/lv/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/lv/firefox-62.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "9e5d8b2ed27810964862ed7b1308db33de6d518b1cd293266ca950797066e8108d8e5869d3062870f74d38dfbac9776cd926165142340ac5ab920ca0cb0c6fd0"; + sha512 = "467cebfc8deac42eed8d8d8882ca75ac8c4686bc98afb04edfbf6657eae2ed249cca4d718c328c14994961582b79f32ad5badcf43b7ab542226f80f288fbf87a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/mai/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/mai/firefox-62.0b2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "ffc81f670b3bcf5c43ed29e8016cb240a8c9936eec601e53092357854f2587dcf28943ac72a098791398bbb98d37b68cccb9a813db9dc22d0a44328b788680e8"; + sha512 = "930d9ee5f07e4b23a69af055524fbd20380fe17692424db8e34f356607592a100e58045e0e90f76256b4c00cc5c09f1baf2807a98669ef3ac3827a024a6a5f14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/mk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/mk/firefox-62.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "711d7b92936415d46574d144e0a718278807d00dcc252e46e5bcbe528e578ff9e7d2baaa76be20e18d8b41f492a6d7b4bb95a6d47e899adde988ab5fe47900f5"; + sha512 = "95500e1e99f10145e380de987616b8635219458cffa0b776da9c912eff3844b0912f6d58aa9964ce7d455e07de599628aef8875eb3175fee9ca057267eb679b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ml/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ml/firefox-62.0b2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "5d0d5ab64f8663fdf700c317c346c79e47ee4c035589b4eed1d8f928f5e78ac8dc8f60c4183fc6d46308b14306298be4d8e87c69ada4a7d3a23f9db8473c62d4"; + sha512 = "2a38a511e7dfbee4ad96ab5d1d01e56a3243136826b46419ec3b19495ebc942adee52e9b3f369d7168fdcd5ce239f957662ac16b289c71fc14690f87f08403f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/mr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/mr/firefox-62.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "d97774eba736fc032b06972e1684464022db0aa9e0c67c815f71f07bb5e9a1df01bbe5c93d1a9011d4519430264d64aaaa6cc13bc2fd778acfec69138118ee92"; + sha512 = "4d62cd91c4503f3aa4fb807ce4947784e37e5e55818e65ad7de77b49ea8c9949a514b489f0d47545c3e6705d4b1d38fa417df113b2b1cae93bb143cb6bd09a26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ms/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ms/firefox-62.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "c3204e7880cbb6604f5dc63973db3b4c51c01e1e54e9a03e8b18441ef86ae70644a038fbd4e638257195c5cd6ce2706dc385ac155936a8221727e916ded6f6b3"; + sha512 = "48a6762fc270b6666f972d5f5000450741aba4845e7857a8fa609819765f9745fe295b1d491762d39b73e717fde7bd0d9fea24f3b3bd5aece28d82dbad7e10f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/my/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/my/firefox-62.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "6a99b4de109040f7d28fcce85efcfecf07c6d603d77d21d28e9953f3d240818d8d2e1c0ac51e732cfb2ec1a5d431d5610f8d92fc125ddf3d5b7ba38d617ae633"; + sha512 = "c48c372b20515cee56138313556a4a2156b1316b1586b563e50b5e153f22da7387436563f2869129d7176e2df2f030169789342b1604e48e2185fdddce7bf31a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/nb-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/nb-NO/firefox-62.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "796ab97579eac69fbfbdd12e62e3457c9329587a4a69d999ea85177ad9871c42b89a84641a450c17cda7536fe97552d4d5b2150d21261514c649f446d76c5935"; + sha512 = "0152559b76592e30e672af3cc333dcca6fc928e6224a96daff3a01dcc404ab9b18600678ea87a59a28ad0366842c025942e672ae7011f777a2ac170cebaa17b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ne-NP/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ne-NP/firefox-62.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "3efdc62d62f3f3da82d3e669f3becca6e26163a05d72cb94a42bc5a8c0cb85767d1da14ea18348d13c9b43856e4fdd6ff2a21765fed622b1f087eea968440574"; + sha512 = "aa6226d0f0e1f3550ab4103e583d1a3a38b509ddabceab46ae3a7c02e7403884d08c7084e49b626e2d06581eb6b5192de913f245998f516577521ad0beb43b40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/nl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/nl/firefox-62.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b70dd7e08bd397b175030c28b93fc8154f4a5ffa7abe1fd6f95dc46f8b37ceee19359ef1d451cc198d93222e50a5a6a0e84616f2b1d361f18e53958332aa0d71"; + sha512 = "1cb3f8b0e7634dd978640d0f080086d8fd071180c0266f94db6cfdc1c6d33ee79776b8d2c8bfdbadd2e102a78fc01176a16ad29a101d58c716de800cfc6db42a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/nn-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/nn-NO/firefox-62.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "a7971d6900fc9f35c014e0e98c1c7efe672a81c29d00de39c76218b347c1e3fe0b1c241cee92593fb38bb236cdc756016d597830b4db10d346041560e8f95ce1"; + sha512 = "f30751ad1c02ee9fb7f4dd442cbbec9ae217700b6d35b619cbc12e00f58eb25f37fb5c98908dcbe0b82c81f6790c3334265d28c1bc882d0a772cf45c8ac48a33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/oc/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/oc/firefox-62.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "281ec70ff1d62c5343352efe648d7db8f4f6b49e0a608427b85615e21ff0c435531fdfb57afceaabd446823659665ad6f411521c605cf846ff1a0d9c62c76b8f"; + sha512 = "1b1c5f822f119f114d8a68d2aa098b398b70c420d4823203694d4491dede84d4d096a652faabbf4905108663da87235bddf1075c4fb54a8017374f01d99da34c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/or/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/or/firefox-62.0b2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "e31b8f043d2f468b33a7561c42eb09c904571d2949d53486c2fa44a07375b6321efb07045935c8a6cde7a3bf1caac606218c8d658cd067b2a08d3321d4684cc4"; + sha512 = "285b27aad7065e9bfb75d70662512916f000f5fb11637a34413e4f67043bf35beb3e13960b88b67ce932b2aef879c802a88a0cf19dd7c8d7b89f0303a47c4142"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pa-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pa-IN/firefox-62.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "ce200baf1b4f99ce75fe1a8bc9e07d2ca05c2b231d05afdd93de385b56609c25586a92d67554ec292c916f9ba775c0b65750e3d3dde07229f70ef6da34eddebe"; + sha512 = "bca37e2c65a0341a9a695edfc99444b761eddfeae95ee168ea65583c2511864e1cc1070a53fe73392e2a2e091a270123be9a18b09de54f142803674bc2ed4f8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pl/firefox-62.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ceff46c9b211e1df3f52fd522531f329b4f12ab7229fb569d3eba96e2b5d8aca49f8482d773189e129db1a893de85aec5bd1bb3dcf5ac87715b9f042b7b8eb36"; + sha512 = "8ce19ac1311fc7305ecdc5304918bec16dfc3d65a7edacdd06494ef7486537f1e1bf139c7dff2b9d16e6b72ab41110de0efe2b39f5b956774d9dca9169006aee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pt-BR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pt-BR/firefox-62.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "cba9d2c59717d10308e9ba36fb20e6b88f13b3d2ed9620a64ee5125bd19b173a03fc3e0d0344c9f022b89609172ae1eb71603a705b6374b057864d391d951652"; + sha512 = "910a36d7175d576fde413e9749c406c734c33ae15c8fde5129468a76c48cd604491c3be9480bdf768d90d910d4c0c82bcf32a5d92f7c442e42edf07c445f6879"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pt-PT/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pt-PT/firefox-62.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "6ca78cdca5cdf329d5ae153f016290c7e2c25c4db19c306460b902b217ac8c38fe01061c43f3e9e12e93c2805aeb7a44c5e1828e4235dc0f457a178caaf4e08c"; + sha512 = "7e4acdabdf73291ca35d20575b7a6d367a9b874310937ac8a5adaaf89328decb85d23aa41c0ed088607387e36a86ea9c79cb51b99e12622422917565d9d6bee2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/rm/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/rm/firefox-62.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "fe9fe0f3a3e1b7409ab2452496b63376e124e1fb5bf3c3521eda8afc008756bbc3011189dc9efa520d6332a5eb734dd2d1c5d1d0a1396db1aa116530ad8653e2"; + sha512 = "639b0c0d80fbb3a619565bd86d1ddb7078412c667f37f4758048b444ade16328f79f6c40da3fd644cc8f3290f93ad2c1799a16e952066dd172b46fbae2e6bbb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ro/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ro/firefox-62.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "9fd3fae5bdfe6b41b33b91672bb46fe29b56d750e4df5a7dc069457623a1effce440c875847a36a0c18c02f3182ffc60b103a74352a3316d57b099ecf9a71eaa"; + sha512 = "6ff276594b9aa3c5d0459db8cdbd2fb4a78c19fa7bd6a7f6dc1aee0e8e01c2238750f9d923925271f6ad6eb67c3e1fe93c1874fa2a39baece42e5d00c0e1957e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ru/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ru/firefox-62.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "2df4bf48b71daa282a360f6877530e67e8e5e050c70066b2bee890409611053d72a0cf698e80f5bfabf3a9c5482997b66cd1acdd98dbf5027d5abb9224641bd1"; + sha512 = "5579599f5013abcc7302a32aca58a2011a319de08f7e24d077496a4b19f9f9a631c839929d33a1a6804caed23c62787e354e71db974f0a3eacd73300b9b803c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/si/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/si/firefox-62.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "d05ef105312b143ebf85131f8e5645281f8ff0969ea891ff455bb5d300eace172abfcfa1a588afbf85b8046e6c51141774c7482947d80110c0df20ccfb54be93"; + sha512 = "b07a113f81af2f53500de22b9cb99989ce2c26b01a26f0d1448efbcce8e7052f53ddc07ceeb638305caacc7fc3a334b06e7eadf34a73a9a7d8bfd95fc22505ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sk/firefox-62.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "64785b3e374e143037e8d278c1702d82b6b872fd7c839713ff2272beac3c63e3d39b7eda51fccacab1c2bc313d373d5850f9e6425ed611759d1073a59d785d76"; + sha512 = "41cd851dd8d54e0a8cd128b37b4170bd657a1cc9ab1e59080f477e4b0a12f22b37385106892e5f67bc52b6ceec938b05268a723d4cdb801289bd64d18ec8fd75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sl/firefox-62.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "82fe1143c73daa2d1b2c4322c783503301470c8df32fafd910234a156dd8ec40e327b94134c52915fe39e5feeb9e12ab347172277ebfac6d6584a352b7d05f56"; + sha512 = "e3db0de96e71579624f3b7b243853fa83adf5abe7cb78306598a5cf03b22d480ab4ad780e71c1d91e1c7a7a1bacd753ebcc4c3e7a33c04c40e0315c943a48bce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/son/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/son/firefox-62.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "69e0839613b34afb114628998f073cf48ebbd58fe7ca64b55dd14efdc3770bb31ddfbd8d4e4d57fc73d6664bade0acfa57d0ac0eae849431d6064bedbec66a66"; + sha512 = "eacf707cb6c3da50d0739fe5f26c35c10679d54265b9528ba3cd805621cd304e0d1a58cc7568a6822543283210f86b7fa85074d21702cba173f83e92ac0fcc5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sq/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sq/firefox-62.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "d198b61bc16b71f4ba0bc5cd6e62497e31103e3df5b2aab759166721c44410370e606598ed9b2f2bf1eadeacfef5f723434bbdf8ad781057e10f59bc82b2bb4d"; + sha512 = "c164f2ec8af034ba49aee7e4d85bbe5c19721ac3d090cc0f82b2d8a0683f2d5dadc9507bdd23fd0f7b7882151b28ec8f0dfd0cfc293f07bc1ec4bcb5e63dad6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sr/firefox-62.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b621a05fe50181b1c94f408f680d48fe8e596da8b7df353633d4d8ccdc08f25443ab79ab4e6f858ba6fb8a656c140813e352ff3e1689176de0147701a2396b0b"; + sha512 = "4893138ff776f85a67d6983de06dbb5dc7b799968ce277b0bee7b3e534836552e9ff82e551b9a013473189e457370036aadb9366e18eb14f124d2b18536f4db4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sv-SE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sv-SE/firefox-62.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "85e20d2e721a22abab9a1c369cce31514edaac7c9ccce28416cf3eb6e46974613ec175b33783f07ff55636745d6ef28c35cabefcf7b8aa70f925fe6fdafc66c8"; + sha512 = "b612b2c01f072ff4c242fbd91612b0a7d3aeaa6635c0c1a66f4934726a8b8332119f6d96971aa056fa57d091d66fb71192b72bdc943bc788f59bb3a142b58852"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ta/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ta/firefox-62.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "5162bec39eba7dd8c320ed75de56c2fdbfd66fcf47036f3c07fa8dc849f5fc532f0871f7a8de287ab69d6fe7e1c85317f9dabc64f7e276a40bce531083f19d85"; + sha512 = "4f431d7702f7dba2223084c567284acec2cd741d29db8888ebe8632ab849f3cbe12165ea3cd4d0f725ee24d9383e7e908826da6fa336a3cb68c616a599083e25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/te/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/te/firefox-62.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "063b9ca6d71bd22d79ff21637fd3f32e711582ce08331b7fd13b7271f759072d648b4de0f6503fce35990751d4da9c01429f38de5ff12345ddf5bc16dcdd000b"; + sha512 = "67c89777963c76fe126431521d8b9a80bdf2bec8ea6e6f231840f99099cef0188fd06017bd4f3391aef64c99a8b2f0eace0a3dc466e1d25c82ce4b0783723884"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/th/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/th/firefox-62.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "e42dd04acffc8d4468833444d23bdda05d7696f37376c6afbc0a2af5d7ee78f8ff0fefdc475b5f69bbf4e42b93f944e6bf2550cc4975a114699992224a3a522d"; + sha512 = "736a96e4b772bd34108e173c15f41aab1676352435aa17a333f259733e9924af16226ed1b7d639221e538e8b48c224ff27f0b09a5bde1bd0700d005cfbe20055"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/tr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/tr/firefox-62.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "27b34656efd50449a3cc86a9d46dc64fb6fcd8248b4e8e43fe871a7f95138187a0102b87d1393cc78c600255e745dd21c2b01870690e4e0820c6859d8dde9dce"; + sha512 = "34d33d7503948ad26f40ec3c1defb96b962f07b8d9afff569421168d35a8666345abb9c23a0125bd103448ed86bd22e361b716608a42bbac1482035d2fa48ff6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/uk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/uk/firefox-62.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "537871ebf2c3457cfe9b61ddc2ba4916e502bfcfa8e2d1d4d10b84278a025ab3b859e4fdf68b1ba7ace37c0af14fda702f2be6a7b0e1ba5512c63294ebbed7da"; + sha512 = "f2df840ef644f5ae344c6e88faca3af65c6c24147f5867e87b9c09e8f94f18747ecec7f0d76dbc9e640224988f1924845b820847dee9983769e09fc5b4f47081"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ur/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ur/firefox-62.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "89f5c1db253fc25ebf57523471c1f9a72797b3e2ee67eb4b74ca06ed297976bf1c15b7a25d1f1eb309d759e2f146e7210a8a33667b8bb22e254f071c76f7d49b"; + sha512 = "4d8f591cc72adcb6cd31b14b11bb47911f1c566e6c66c93f08ef07a5608936aa2bee54a5929e5238a218e8080daea8a4c83c3135b789bad85123abd03cf7a6c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/uz/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/uz/firefox-62.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "3050b5ac3530cbad7b31920921a9aa29533614264a55eae9d333e95a5d57568f8a7002a3c9739a8f55594983d70fdf0ad29d38d8f9e7b212df23f488ebc26515"; + sha512 = "86ebc113a76905813795d451d7993be8f1c6f0e9b928d25b5f1e4e651f8e2c2492baa01e00af594d1edbd0948f6173e91a37cc5595f62dd7c82c8b6ffffe25ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/vi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/vi/firefox-62.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "03c6ab48cd6fa0a797eee0acbd39a14673da14da3f2505b445f08a3b6021c3d6e01baf48a725c8fa08bc68d5189eb8e0a8a2c150e9563a149c8a221b6c50091e"; + sha512 = "3278d20cac4b0311e0bb5d0034bd697eebc3ce14ed1099ca04f646e6fe04ed1ee2aae03d118a4cb447ca4c0253b127a275410cbab70bdd671f1e5fda28618cd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/xh/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/xh/firefox-62.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "bb9b5bc312024abda5e44e8f299217cac7bdf3cfcf26f55ee1605ac3c4b59fdc5a59fe0fb8897243b9e542f83faccc3025c77710d236e8f937844f7be101d272"; + sha512 = "cd65c0c9abe5d90bebc3eaba01a45fd15cc31d115648fda0c54e662183cea9e41557d629a282620dc0867850e99dbaabfd1c213df6fb839883111602d105d40e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/zh-CN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/zh-CN/firefox-62.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "bd80296763f7c82be3bc02e75a47ffbdabf37873e41b82b213d71aa6eb165e742b89c1fabe00ccddd2c9b81824e96eb51186bcb399560e285063e050bd435ae6"; + sha512 = "3cc975c9880c2eba033954c8caf828144ee0002fe4be9df68a9de1bb183001b572515dd063961f998a4a7b4fffcf285568f979ef0d44cd34788dca8b41c5668d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/zh-TW/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/zh-TW/firefox-62.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "995e0a228a83f464b3d47f4b9e0fb9b692bf6ff2af4c526e6046cab17fb4c15f1e36d7822efd55731bfe812fdfa8885fd60e4431cbab0562ac6dfac21fd3aa6e"; + sha512 = "2a5a1ae121819be9df3b2d0c95e2676c72f3094a09dce797d23cdd4e9d2326560bde37574d48ec8eeb973c41e07a4ab12d49cf53324c70cac1d2b881ea22a4dd"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 6067911b7165..c2b83a0187f8 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -66,10 +66,11 @@ let ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration ++ extraNativeMessagingHosts ); - libs = lib.optional ffmpegSupport ffmpeg + libs = [ libudev ] + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) - (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) + (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio; gtk_modules = [ libcanberra-gtk2 ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 90beb85bbf45..c2f27a0f7fc3 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -29,13 +29,13 @@ let in python3Packages.buildPythonApplication rec { name = "qutebrowser-${version}${versionPostfix}"; namePrefix = ""; - version = "1.3.2"; + version = "1.3.3"; versionPostfix = ""; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0zy2cm85qq095hk94d8jk6yqpyy0f31vb2pfbdpgg93b9vvzajzz"; + sha256 = "01lrbkddm4wagx4hq6cz5qwvb8q8nlz0xa35k317gvr3pmnvgjk8"; }; # Needs tox diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 59b3ab7e8b4c..6bd7ba3eac2c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -16,13 +16,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.10.4"; + version = "1.10.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0q1llnqy83fkx3vhcfjyl3frd41h7g1cvl38lfhsz1z1v9av3bpd"; + sha256 = "1k6ayb43l68l0qw31cc4k1pwvm8aks3l2xm0gdxdxbbww1mnzix2"; }; # Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 97bcb1bd1b4d..217998bbf82a 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,7 +1,15 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu, docker-machine-kvm, - gpgme, makeWrapper, hostPlatform, vmnet, python }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu +, gpgme, makeWrapper, hostPlatform, vmnet, python, pkgconfig +, docker-machine-kvm, docker-machine-kvm2 +, extraDrivers ? [] +}: -let binPath = stdenv.lib.optionals stdenv.isLinux [ libvirt qemu docker-machine-kvm ]; +let + drivers = stdenv.lib.filter (d: d != null) (extraDrivers + ++ stdenv.lib.optionals stdenv.isLinux [ docker-machine-kvm docker-machine-kvm2 ]); + + binPath = drivers + ++ stdenv.lib.optionals stdenv.isLinux ([ libvirt qemu ]); in buildGoPackage rec { pname = "minikube"; diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 80984208460b..a7d10adc0a75 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation rec { - name = "esniper-2.33.0.2017-11-06"; + name = "esniper-2.35.0"; src = fetchFromGitHub { owner = "yhfudev"; diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 90ff868d6bec..2f97b39da60f 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, netperf, procps, pyqt5 }: +{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, procps, pyqt5 +, sphinx +}: buildPythonApplication rec { pname = "flent"; @@ -10,7 +12,8 @@ buildPythonApplication rec { sha256 = "1llcdakk0nk9xlpjjz7mv4a80yq4sjnbqhaqvyj9m6lbcxgssh2r"; }; - buildInputs = [ netperf ]; + buildInputs = [ sphinx ]; + propagatedBuildInputs = [ matplotlib procps diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix new file mode 100644 index 000000000000..20557c18c52c --- /dev/null +++ b/pkgs/applications/networking/flent/http-getter.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake +, curl, pkgconfig }: + +stdenv.mkDerivation rec { + name = "http-getter"; + version = "20180606"; + + src = fetchFromGitHub { + owner = "tohojo"; + repo = "http-getter"; + rev = "79bcccce721825a745f089d0c347bbaf2e6e12f4"; + sha256 = "1zxk52s1h5qx62idil237zdpj8agrry0w1xwkfx05wvv9sw4ld35"; + }; + + buildInputs = [ cmake pkgconfig curl ]; + + meta = with stdenv.lib; { + homepage = https://github.com/tohojo/http-getter; + description = "Simple getter for HTTP URLs using cURL"; + platforms = platforms.unix; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix index 9b738fe3863f..6d134708a5eb 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "gmailieer-${version}"; - version = "0.6"; + version = "0.9"; src = fetchFromGitHub { owner = "gauteh"; repo = "gmailieer"; rev = "v${version}"; - sha256 = "1z7r78ck81l8xdpjynjv8dfm4j0p6a1cbzgdckp41id27sq1vc76"; + sha256 = "1ixs5hip37hzcxwi2gsxp34r914f1wrl4r3swxqmzln3a15kngsk"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 8f4b54cec86a..3dc154351d2f 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; - homepage = http://www.snort.org; + homepage = https://www.snort.org; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 92a59fb31f10..89a3005b1279 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.12.1"; + version = "1.13.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1p85hpk8kzzgncfm033bzpwm7hk6rrq8zdpwqlk5z2biarwjdqfx"; + sha256 = "1iapkkfqssbjcksgic7i8x0cwp6gwcbbrfxlw7vp6k1cfvjwv9pf"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 1cf7243476cf..9ac3d870312d 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3 -, gtk2, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }: +, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }: let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.18.0.6"; + version = "8.24.0.2"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -24,8 +24,7 @@ let gnome3.gconf gdk_pixbuf - gtk2 - + gtk3 gnome3.gnome-keyring @@ -57,7 +56,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "193icz1s385d25qzm5vx58h66m4hfwwmkavn0p3w6631gj617hig"; + sha256 = "079bv0wilwwd9gqykcyfs4bj8za140788dxi058k4275h1jlvrww"; } else throw "Skype for linux is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 23d2e640b4f0..7a50536cc0ff 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { name = "teamspeak-client-${version}"; - version = "3.1.8"; + version = "3.1.10"; src = fetchurl { urls = [ @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run" ]; sha256 = if stdenv.is64bit - then "0yav71sfklqg2k3ayd0bllsixd486l0587s5ygjlc9gnchw3zg6z" - else "1agf6jf5hkyxazxqcnvcjfb263p5532ahi7h4rkifnnvqay36v5i"; + then "17gylj5pxba14c1c98b5rdyyb87c58z8l8yrd1iw5k293wf7iwv3" + else "1bkn3ykrc73wr02qaqwpr4garlqm3424y3dm2fjx6lqcfzm3ms2k"; }; # grab the plugin sdk for the desktop icon diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 739842bbec3a..9de394422279 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -71,6 +71,8 @@ in with stdenv; mkDerivation rec { --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; + patches = [ ./qt5_11.patch ]; + meta = with stdenv.lib; { homepage = https://quassel-irc.org/; description = "Qt/KDE distributed IRC client suppporting a remote daemon"; diff --git a/pkgs/applications/networking/irc/quassel/qt5_11.patch b/pkgs/applications/networking/irc/quassel/qt5_11.patch new file mode 100644 index 000000000000..45e43d7f96be --- /dev/null +++ b/pkgs/applications/networking/irc/quassel/qt5_11.patch @@ -0,0 +1,72 @@ +From 92f4dca367c3a6f0536a1e0f3fbb44bb6ed4da62 Mon Sep 17 00:00:00 2001 +From: Manuel Nickschas <sputnick@quassel-irc.org> +Date: Thu, 3 May 2018 23:19:34 +0200 +Subject: [PATCH] cmake: Fix build with Qt 5.11 + +Qt 5.11 removes the qt5_use_modules function, so add a copy. If +present, the Qt-provided function will be used instead. + +Closes GH-355. +--- + cmake/QuasselMacros.cmake | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake +index 652c0042..d77ba1cf 100644 +--- a/cmake/QuasselMacros.cmake ++++ b/cmake/QuasselMacros.cmake +@@ -5,6 +5,9 @@ + # The qt4_use_modules function was taken from CMake's Qt4Macros.cmake: + # (C) 2005-2009 Kitware, Inc. + # ++# The qt5_use_modules function was taken from Qt 5.10.1 (and modified): ++# (C) 2005-2011 Kitware, Inc. ++# + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +@@ -43,6 +46,41 @@ function(qt4_use_modules _target _link_type) + endforeach() + endfunction() + ++# Qt 5.11 removed the qt5_use_modules function, so we need to provide it until we can switch to a modern CMake version. ++# If present, the Qt-provided version will be used automatically instead. ++function(qt5_use_modules _target _link_type) ++ if (NOT TARGET ${_target}) ++ message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.") ++ endif() ++ if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" ) ++ set(_qt5_modules ${ARGN}) ++ set(_qt5_link_type ${_link_type}) ++ else() ++ set(_qt5_modules ${_link_type} ${ARGN}) ++ endif() ++ ++ if ("${_qt5_modules}" STREQUAL "") ++ message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.") ++ endif() ++ foreach(_module ${_qt5_modules}) ++ if (NOT Qt5${_module}_FOUND) ++ find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH) ++ if (NOT Qt5${_module}_FOUND) ++ message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.") ++ endif() ++ endif() ++ target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES}) ++ set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS}) ++ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS}) ++ if (Qt5_POSITION_INDEPENDENT_CODE ++ AND (CMAKE_VERSION VERSION_LESS 2.8.12 ++ AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" ++ OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))) ++ set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE}) ++ endif() ++ endforeach() ++endfunction() ++ + # Some wrappers for simplifying dual-Qt support + + function(qt_use_modules) +-- +2.16.2 + diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 4d3c8a797412..057c051c6259 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { meta = { description = "The user-friendly, lightweight, and fast email client"; - homepage = http://www.claws-mail.org/; + homepage = https://www.claws-mail.org/; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin ]; diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index c03202517747..962f10a99c01 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A packet traffic generator and analyzer"; - homepage = http://ostinato.org; + homepage = https://ostinato.org; license = licenses.gpl3; maintainers = with maintainers; [ rick68 ]; platforms = with platforms; linux ++ darwin ++ cygwin; diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix new file mode 100644 index 000000000000..293c67164835 --- /dev/null +++ b/pkgs/applications/networking/owamp/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, fetchFromGitHub +, autoconf, automake, mandoc }: + +stdenv.mkDerivation rec { + name = "owamp-${version}"; + version = "3.5.6"; + buildInputs = [ autoconf automake mandoc ]; + src = fetchFromGitHub { + owner = "perfsonar"; + repo = "owamp"; + rev = version; + sha256="019rcshmrqk8pfp510j5jvazdcnz0igfkwv44mfxb5wirzj9p6s7"; + fetchSubmodules = true; + }; + + preConfigure = '' + I2util/bootstrap.sh + ./bootstrap + ''; + + meta = with stdenv.lib; { + homepage = http://software.internet2.edu/owamp/; + description = ''A tool for performing one-way active measurements''; + platforms = platforms.linux; + maintainers = [maintainers.teto]; + license = licenses.asl20; + }; +} diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index a4d2e85a9119..a1a1f12a8c1c 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -3,18 +3,20 @@ makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }: stdenv.mkDerivation rec { name = "x2goclient-${version}"; - version = "4.1.1.1"; + version = "4.1.2.0"; src = fetchurl { url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; - sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3"; + sha256 = "1x1iiyszz6mbrnsqacxzclyx172djq865bw3y83ya7lc9j8a71zn"; }; buildInputs = [ cups libssh libXpm nxproxy openldap openssh qtbase qtsvg qtx11extras qttools phonon ]; nativeBuildInputs = [ makeWrapper ]; - patchPhase = '' + patches = [ ./qt511.patch ]; + + postPatch = '' substituteInPlace Makefile \ --replace "SHELL=/bin/bash" "SHELL=$SHELL" \ --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \ diff --git a/pkgs/applications/networking/remote/x2goclient/qt511.patch b/pkgs/applications/networking/remote/x2goclient/qt511.patch new file mode 100644 index 000000000000..8f02cd62277d --- /dev/null +++ b/pkgs/applications/networking/remote/x2goclient/qt511.patch @@ -0,0 +1,15 @@ +diff --git a/src/printwidget.cpp b/src/printwidget.cpp +index 58a8af7..131d340 100644 +--- a/src/printwidget.cpp ++++ b/src/printwidget.cpp +@@ -23,6 +23,7 @@ + #include "x2gosettings.h" + #include "x2gologdebug.h" + #include <QDir> ++#include <QButtonGroup> + #ifdef Q_OS_WIN + #include "wapi.h" + #endif +-- +2.17.1 + diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index f3afeced8f65..42038426515e 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.7"; + version = "2.6.1"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0i2ggkkx7fphsk7kv9kygsf5pcaf4vgnqgi8mj1rrf2gfdl3rjsy"; + sha256 = "126dvd6myjbxjr69dy9vzzdda2lmjy1wwwc6gcs5djb46jy5nvmb"; }; cmakeFlags = [ @@ -52,6 +52,10 @@ in stdenv.mkDerivation { }) ++ stdenv.lib.optional stdenv.isDarwin ./cmake.patch; + preBuild = '' + export LD_LIBRARY_PATH="$PWD/run" + ''; + postInstall = if stdenv.isDarwin then '' ${optionalString withQt '' mkdir -p $out/Applications @@ -72,6 +76,8 @@ in stdenv.mkDerivation { ''} ${optionalString withQt '' install -Dm644 -t $out/share/applications ../wireshark.desktop + wrapProgram $out/bin/wireshark \ + --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix} ''} substituteInPlace $out/share/applications/*.desktop \ diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix new file mode 100644 index 000000000000..82dd3a506dee --- /dev/null +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, fetchpatch +, meson, ninja, pkgconfig, sphinx +, acl, curl, fuse, libselinux, udev, xz, zstd +, fuseSupport ? true +, selinuxSupport ? true +, udevSupport ? true +, glibcLocales, rsync +}: + +stdenv.mkDerivation rec { + name = "casync-${version}"; + version = "2-152-ge4a3c5e"; + + src = fetchFromGitHub { + owner = "systemd"; + repo = "casync"; + rev = "e4a3c5efc8f11e0e99f8cc97bd417665d92b40a9"; + sha256 = "0zx6zvj5a6rr3w9s207rvpfw7gwssiqmp1p3c75bsirmz4nmsdf0"; + }; + + buildInputs = [ acl curl xz zstd ] + ++ stdenv.lib.optionals (fuseSupport) [ fuse ] + ++ stdenv.lib.optionals (selinuxSupport) [ libselinux ] + ++ stdenv.lib.optionals (udevSupport) [ udev ]; + nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; + checkInputs = [ glibcLocales rsync ]; + + postPatch = '' + for f in test/test-*.sh.in; do + patchShebangs $f + done + patchShebangs test/http-server.py + ''; + + PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; + mesonFlags = stdenv.lib.optionals (!fuseSupport) [ "-Dfuse=false" ] + ++ stdenv.lib.optionals (!udevSupport) [ "-Dudev=false" ] + ++ stdenv.lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; + + doCheck = true; + preCheck = '' + export LC_ALL="en_US.utf-8" + ''; + + meta = with stdenv.lib; { + description = "Content-Addressable Data Synchronizer"; + homepage = https://github.com/systemd/casync; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix new file mode 100644 index 000000000000..fdff39e27f90 --- /dev/null +++ b/pkgs/applications/office/autokey/default.nix @@ -0,0 +1,38 @@ +{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobjectIntrospection +, gtksourceview, gnome3, libappindicator-gtk3, libnotify }: + +python3Packages.buildPythonApplication rec { + name = "autokey-${version}"; + version = "0.94.1"; + + src = fetchFromGitHub { + owner = "autokey"; + repo = "autokey"; + rev = "v${version}"; + sha256 = "1syxyciyxzs0khbfs9wjgj03q967p948kipw27j1031q0b5z3jxr"; + }; + + # Arch requires a similar work around—see + # https://aur.archlinux.org/packages/autokey-py3/?comments=all + patches = [ ./remove-requires-dbus-python.patch ]; + + # Tests appear to be broken with import errors within the project structure + doCheck = false; + + # Note: no dependencies included for Qt GUI because Qt ui is poorly + # maintained—see https://github.com/autokey/autokey/issues/51 + + buildInputs = [ wrapGAppsHook gobjectIntrospection gnome3.gtksourceview + libappindicator-gtk3 libnotify ]; + + propagatedBuildInputs = with python3Packages; [ + dbus-python pyinotify xlib pygobject3 ]; + + meta = { + homepage = https://github.com/autokey/autokey; + description = "Desktop automation utility for Linux and X11"; + license = with lib.licenses; [ gpl3 ]; + maintainers = with lib.maintainers; [ pneumaticat ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/office/autokey/remove-requires-dbus-python.patch b/pkgs/applications/office/autokey/remove-requires-dbus-python.patch new file mode 100644 index 000000000000..73372e435291 --- /dev/null +++ b/pkgs/applications/office/autokey/remove-requires-dbus-python.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -71,7 +71,7 @@ + 'console_scripts': ['autokey-gtk=autokey.gtkui.__main__:main'] + }, + scripts=['autokey-qt', 'autokey-run', 'autokey-shell'], +- install_requires=['dbus-python', 'pyinotify', 'python3-xlib'], ++ install_requires=['pyinotify', 'python-xlib'], + classifiers=[ + 'Development Status :: 4 - Beta', + 'Intended Audience :: Developers', diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 01014e6687cb..80046ecb2cd5 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -23,6 +23,8 @@ mkDerivation rec { sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638"; }; + patches = [ ./qt5_11.patch ]; + enableParallelBuilding = true; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; diff --git a/pkgs/applications/office/calligra/qt5_11.patch b/pkgs/applications/office/calligra/qt5_11.patch new file mode 100644 index 000000000000..66ff8c6eedcd --- /dev/null +++ b/pkgs/applications/office/calligra/qt5_11.patch @@ -0,0 +1,98 @@ +diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp +index 0ffdcf6..cdca006 100644 +--- a/libs/widgets/KoCsvImportDialog.cpp ++++ b/libs/widgets/KoCsvImportDialog.cpp +@@ -21,6 +21,7 @@ + #include "KoCsvImportDialog.h" + + // Qt ++#include <QButtonGroup> + #include <QTextCodec> + #include <QTextStream> + +diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp +index f91555c..a3816f9 100644 +--- a/libs/widgets/KoPageLayoutWidget.cpp ++++ b/libs/widgets/KoPageLayoutWidget.cpp +@@ -23,6 +23,8 @@ + + #include <KoUnit.h> + ++#include <QButtonGroup> ++ + class Q_DECL_HIDDEN KoPageLayoutWidget::Private + { + public: +diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp +index c0d5136..d2a772e 100644 +--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp ++++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp +@@ -24,6 +24,7 @@ + + // Qt + #include <QAbstractItemModel> ++#include <QAction> + + // Calligra + #include <KoIcon.h> +diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp +index ed10919..8f52177 100644 +--- a/plugins/formulashape/FormulaToolWidget.cpp ++++ b/plugins/formulashape/FormulaToolWidget.cpp +@@ -30,6 +30,7 @@ + #include <QWidgetAction> + #include <QTableWidget> + #include <QAction> ++#include <QHeaderView> + #include <QMenu> + + FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) +diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp +index a0a9832..7d7db53 100644 +--- a/sheets/dialogs/LayoutDialog.cpp ++++ b/sheets/dialogs/LayoutDialog.cpp +@@ -36,6 +36,7 @@ + #include <math.h> + + #include <QIntValidator> ++#include <QButtonGroup> + #include <QCheckBox> + #include <QFrame> + #include <QLabel> +diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp +index d64208c..bfddb3a 100644 +--- a/words/part/dialogs/KWAnchoringProperties.cpp ++++ b/words/part/dialogs/KWAnchoringProperties.cpp +@@ -35,6 +35,7 @@ + + #include <kundo2command.h> + ++#include <QButtonGroup> + #include <QComboBox> + + const int KWAnchoringProperties::vertRels[4][20] = { +diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp +index e38599a..7e8b2d5 100644 +--- a/words/part/dialogs/KWRunAroundProperties.cpp ++++ b/words/part/dialogs/KWRunAroundProperties.cpp +@@ -28,6 +28,8 @@ + + #include <kundo2command.h> + ++#include <QButtonGroup> ++ + KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) + : m_state(state) + { +diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp +index ae743da..3007f91 100644 +--- a/stage/part/KPrPresentationTool.cpp ++++ b/stage/part/KPrPresentationTool.cpp +@@ -32,6 +32,7 @@ + #include <QDesktopServices> + #include <QUrl> + #include <QDBusConnection> ++#include <QFrame> + + #include <KoShape.h> + #include <KoShapeManager.h> diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index ded099632460..87fe343613e5 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "6"; minor = "0"; - patch = "4"; + patch = "5"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1xqh4l1nrvgara4ni9zk8pqywz3gbq4a8sw9v0ggxsch409zp0ch"; + sha256 = "16h60j7h9z48vfhhj22m64myksnrrgrnh0qc6i4bxgshmm8kkzdn"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 1d309fae9af7..e3ff0b594b4e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0bjl3hdckd5bcgskh46xqna1hpxjjx0ycgpnilyk7j8l6407hpw6"; + sha256 = "1p8gb9jxv4n8ggksbfsqzdw5amxg575grxifsabhgjllpisjzrlr"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1z21bk5lwd5gxsyjdwh0fmgkys4lhnx7flbjd6dbn9d99paz1w6f"; + sha256 = "1dkzm766zi4msk6w35bvfk5b5bx1xyqg2wx58wklr5375kjv6ba9"; }; }; @@ -264,10 +264,9 @@ in stdenv.mkDerivation rec { libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy libodfgen CoinMP librdf_rasqal defaultIconTheme gettext - gdb ] ++ lib.optional kdeIntegration kdelibs4; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gdb ]; passthru = { inherit srcs jdk; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index e82fa241c00c..36500166dccf 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -581,11 +581,11 @@ md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - sha256 = "a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34"; - md5 = "a084cd548b586552cb7d3ee51f1af969"; - md5name = "a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; + name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769"; + md5 = ""; + md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; } { name = "officeotron-0.7.4-master.jar"; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 251aa44a2c58..66d1baed2dae 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -105,11 +105,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.58.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.58.0.tar.gz"; - sha256 = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115"; + name = "curl-7.60.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.60.0.tar.gz"; + sha256 = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5"; md5 = ""; - md5name = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115-curl-7.58.0.tar.gz"; + md5name = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5-curl-7.60.0.tar.gz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -455,11 +455,11 @@ md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; } { - name = "language-subtag-registry-2017-12-14.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2"; - sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362"; + name = "language-subtag-registry-2018-03-30.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2"; + sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854"; md5 = ""; - md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2"; + md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -623,11 +623,11 @@ md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; - sha256 = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf"; + name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769"; md5 = ""; - md5name = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; + md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; } { name = "officeotron-0.7.4-master.jar"; diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index b1aa10800d6f..22216af3723c 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "5"; minor = "4"; - patch = "6"; + patch = "7"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0icd8h221gp2dsbn6d35flwhqhcfpx66cjc5dg8yifhhvrfam74i"; + sha256 = "0s9s4nhp2whwxis54jbxrf1dwpnpl95b9781d1pdj4xk5z9v90fv"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 52baed720c5f..dbfeb0f2fe86 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme +, defaultIconTheme, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ] , withHelp ? true , kdeIntegration ? false @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "16g85bn6qkql81a0k9iv3nwrpg2kpvz5nk4r7lab5jzlcl20qplc"; + sha256 = "05ixmqbs3pkdpyqcwadz9i3wg797vimsm75rmfby7z71wc3frcyk"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "02382d09svcgmp5q2xglhbx1na9ycd77f5cbcj9jgs8lpkgwbxxc"; + sha256 = "0ifyh4m8mwpkb16g6883ivk2s2qybr4s4s7pdjzp4cpx1nalzibl"; }; }; @@ -238,6 +238,7 @@ in stdenv.mkDerivation rec { "--without-system-libstaroffice" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" + "--without-system-xmlsec" ]; checkPhase = '' @@ -258,12 +259,11 @@ in stdenv.mkDerivation rec { python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme - librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy + librevenge libe-book libmwaw glm glew ncurses epoxy libodfgen CoinMP librdf_rasqal defaultIconTheme - gdb ] ++ lib.optional kdeIntegration kdelibs4; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gdb ]; passthru = { inherit srcs jdk; diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index d572dd55b2b2..9edc6220899e 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gravit-0.5.1"; src = fetchurl { - url = "http://gravit.slowchop.com/media/downloads/${name}.tgz"; + url = "https://gravit.slowchop.com/media/downloads/${name}.tgz"; sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; }; @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.mesaPlatforms; + hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out }; } diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 3c7af809b884..945294c556f4 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,25 +1,32 @@ -{ mkDerivation, lib, fetchurl +{ mkDerivation, lib, fetchFromGitHub , cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv , qtscript, qtserialport, qttools -, qtmultimedia, qtlocation +, qtmultimedia, qtlocation, makeWrapper, qtbase }: mkDerivation rec { name = "stellarium-${version}"; - version = "0.16.1"; + version = "0.18.0"; - src = fetchurl { - url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "087x6mbcn2yj8d3qi382vfkzgdwmanxzqi5l1x3iranxmx9c40dh"; + src = fetchFromGitHub { + owner = "Stellarium"; + repo = "stellarium"; + rev = "v${version}"; + sha256 = "11rh4gan8bhqb2n6a94g773drbq4ffii7aqjwxv97r036579azb2"; }; nativeBuildInputs = [ cmake perl ]; buildInputs = [ freetype libpng libGLU_combined openssl libiconv qtscript qtserialport qttools - qtmultimedia qtlocation + qtmultimedia qtlocation qtbase makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/stellarium \ + --prefix QT_PLUGIN_PATH : "${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins" + ''; + meta = with lib; { description = "Free open-source planetarium"; homepage = http://stellarium.org/; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 75e99dcf6594..205d56f3fc87 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "3.922"; + version = "3.924"; src = fetchurl { url = "http://www.veripool.org/ftp/${name}.tgz"; - sha256 = "1srv8d1w3mwblfydznl3frswg98i3dkylx8x18c4807wsjk8vflg"; + sha256 = "0xarifraycmdzjxs0lscpwvrwr59z84p8g8dkyjssc463dqikjvx"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/celf/default.nix b/pkgs/applications/science/logic/celf/default.nix index 669cd46cd2ec..708270f772fd 100644 --- a/pkgs/applications/science/logic/celf/default.nix +++ b/pkgs/applications/science/logic/celf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linear logic programming system"; - homepage = http://github.com/clf/celf; + homepage = https://github.com/clf/celf; license = licenses.gpl3; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index 6e8797fcc40b..ec717002c2d6 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { that can be used for modelling, validation and verification of concurrent systems and protocols ''; - homepage = http://www.mcrl2.org/; + homepage = https://www.mcrl2.org/; license = licenses.boost; maintainers = with maintainers; [ moretea ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 02dc7f86fb3f..4993910634af 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }: let - version = "0.2.3"; + version = "0.2.4"; repo = "git-secret"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit repo; owner = "sobolevn"; rev = "v${version}"; - sha256 = "1swgw91zzs9n582500a34cppyngrqrqrnl80d1vd7i93xx1lkmv6"; + sha256 = "0lx2rjyhy3xh6ik755lbbl40v7a7ayyqk68jj8mnv42f2vhd66xl"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index ceec9f1e75b6..4e9b7d2428de 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -109,6 +109,7 @@ stdenv.mkDerivation { preInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin cp -a $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin + rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o ''; postInstall = diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 1a6e8bc56f40..c9f666390b55 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,38 +1,35 @@ -{ stdenv, fetchgit, go, ronn, groff, utillinux, Security }: +{ stdenv, buildGoPackage, fetchFromGitHub, go, ronn, ruby, groff, Security, utillinux }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "hub-${version}"; version = "2.4.0"; - src = fetchgit { - url = https://github.com/github/hub.git; - rev = "refs/tags/v${version}"; + goPackagePath = "github.com/github/hub"; + + src = fetchFromGitHub { + owner = "github"; + repo = "hub"; + rev = "v${version}"; sha256 = "1lr6vg0zhg2air9bnzcl811g97jraxq05l3cs46wqqflwy57xpz2"; }; + buildInputs = [ groff ronn ruby utillinux ] ++ + stdenv.lib.optional stdenv.isDarwin Security; - buildInputs = [ go ronn groff utillinux ] - ++ stdenv.lib.optional stdenv.isDarwin Security; - - buildPhase = '' + postPatch = '' mkdir bin ln -s ${ronn}/bin/ronn bin/ronn - patchShebangs . - make all man-pages ''; - installPhase = '' - prefix=$out sh -x < script/install.sh - - mkdir -p "$out/share/zsh/site-functions" - cp "etc/hub.zsh_completion" "$out/share/zsh/site-functions/_hub" - - mkdir -p "$out/etc/bash_completion.d" - cp "etc/hub.bash_completion.sh" "$out/etc/bash_completion.d/" + postInstall = '' + cd go/src/${goPackagePath} + install -D etc/hub.zsh_completion "$bin/share/zsh/site-functions/_hub" + install -D etc/hub.bash_completion.sh "$bin/etc/bash_completion.d/hub.bash_completion.sh" + install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish" - # Should we also install provided git-hooks? - # And fish completion? + make man-pages + cp -r share/man $bin/share/man ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index dc983e003365..db2fdf0199e3 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "3.6.3"; + version = "3.6.4"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "1bl4zz4k9whv5q6bkf6hyki26dkjhm19rzx2800zzadbrdgs7iz4"; + sha256 = "0n14lwmga0hhi4m4pwgpzpxmsmfy6an7b2pk59afsydhxjj88z4x"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 991842ba0dc1..b36147009a66 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, cmake, pkgconfig, lndir +{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi , makeWrapper, libXext, libGLU, qttools, qtbase @@ -25,21 +25,16 @@ assert !withQT -> default != "qt5"; stdenv.mkDerivation rec { name = "avidemux-${version}"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy"; + sha256 = "15g9h791qbnmycabbbl7s2b3n3xpvygm88qrfk35g2cw6957ik9w"; }; patches = [ ./dynamic_install_dir.patch ./bootstrap_logging.patch - # glibc 2.27 compat - (fetchpatch { - url = https://github.com/mean00/avidemux2/commit/afdd9c4b876d77a4974d3fa7d9f25caeffbdf13d.patch; - sha256 = "0mf8vpfdqybziqsfyvxwcdm3zsmnp64293icinhvfpq9xp5b6vn6"; - }) ]; nativeBuildInputs = [ yasm cmake pkgconfig ]; @@ -58,7 +53,10 @@ stdenv.mkDerivation rec { ++ lib.optionals withQT [ qttools qtbase ] ++ lib.optional withVPX libvpx; - buildCommand = '' + buildCommand = let + qtVersion = "5.${stdenv.lib.versions.minor qtbase.version}"; + wrapProgram = f: "wrapProgram ${f} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib"; + in '' unpackPhase cd "$sourceRoot" patchPhase @@ -73,11 +71,13 @@ stdenv.mkDerivation rec { mkdir $out cp -R install/usr/* $out - for i in $out/bin/*; do - wrapProgram $i \ - --set ADM_ROOT_DIR $out \ - --prefix LD_LIBRARY_PATH ":" "${libXext}/lib" - done + ${wrapProgram "$out/bin/avidemux3_cli"} + + ${stdenv.lib.optionalString withQT '' + ${wrapProgram "$out/bin/avidemux3_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins + ${wrapProgram "$out/bin/avidemux3_jobs_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins + ''} + ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux" fixupPhase diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 6572164c797e..0df5d42ee0ea 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase , qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols , qtgraphicaleffects, libmlt -, qmake, makeWrapper }: +, qmake, makeWrapper, fetchpatch, qttools }: assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "18.05.08"; + version = "18.06.02"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1qm1ycsx93qpw2vga25m3cr82vzqla1qqardjiln3iqfa0m93qsk"; + sha256 = "1pqpgsb8ix1akq326chf46vvl5h02dwmdskskf2n6impygsy4x7v"; }; enableParallelBuilding = true; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { ]; NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt"; + qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" ]; prePatch = '' sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp @@ -34,6 +35,12 @@ stdenv.mkDerivation rec { sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp ''; + patches = [ (fetchpatch { + url = https://github.com/mltframework/shotcut/commit/f304b7403cc7beb57b1610afd9c5c8173749e80b.patch; + name = "qt511.patch"; + sha256 = "1ynvyjchcb33a33x4w1ddnah2gyzmnm125ailgg6xy60lqsnsmp9"; + } ) ]; + postInstall = '' mkdir -p $out/share/shotcut cp -r src/qml $out/share/shotcut/ diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 3f5f0c05c308..6885caa7d60e 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,19 +1,25 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "0.12.1"; + version = "0.13.0"; name = "streamlink-${version}"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = "${version}"; - sha256 = "0r63fjp5qhnbp5kr4w2nn3gnj0wr0ik1pw1gyry8jl9rp2jq9db5"; + sha256 = "17i5j5a69d28abg13md2r2ycxgmd5h1pjy0pgca1zcqaqfq4v05x"; }; - checkInputs = with pythonPackages; [ pytest mock requests-mock ]; + postPatch = '' + # Fix failing test. This can be removed after version 0.13.0, see: + # https://github.com/streamlink/streamlink/commit/a27e1a2d8eec6eb23c6e1dc280c6afc1cd0b5b32 + substituteInPlace tests/test_plugin.py --replace "lambda: datetime" "datetime" + ''; - propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client ]) ++ [ rtmpdump ffmpeg ]; + checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; + + propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg ]; meta = with stdenv.lib; { homepage = https://github.com/streamlink/streamlink; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 5b3610243be0..711838b29447 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "${pname}-${version}"; pname = "amazon-ecs-agent"; - version = "1.14.0"; + version = "1.18.0"; goPackagePath = "github.com/aws/${pname}"; subPackages = [ "agent" ]; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "aws"; repo = pname; - sha256 = "12c8l0x8pm883rlbdr1m07r0kjkzggkfz35cjqz8pzyr5ymjdrc3"; + sha256 = "1l6c2if6wpjmq2hh6k818w38s1rsbwgd6igqy948dwcrb1g1mixr"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/rancher-compose/default.nix b/pkgs/applications/virtualization/rancher-compose/default.nix deleted file mode 100644 index 57aa6809d6c1..000000000000 --- a/pkgs/applications/virtualization/rancher-compose/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -let - generic = { version, sha256 }: buildGoPackage rec { - name = "rancher-compose-${version}"; - - goPackagePath = "github.com/rancher/rancher-compose"; - - src = fetchFromGitHub { - owner = "rancher"; - repo = "rancher-compose"; - rev = "v${version}"; - inherit sha256; - }; - - buildFlagsArray = '' - -ldflags= - -X github.com/rancher/rancher-compose/version.VERSION=${version} - ''; - - excludedPackages = "scripts"; - - meta = with lib; { - description = "Docker compose compatible client to deploy to Rancher"; - homepage = https://docs.rancher.com/rancher/rancher-compose/; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [maintainers.mic92]; - }; - }; -in { - # should point to a version compatible - # with the latest stable release of rancher - rancher-compose = generic { - version = "0.9.2"; - sha256 = "1wlsdjaa4j2b3c034hb6zci5h900b1msimmshz5h4g5hiaqb3khq"; - }; - - # for rancher v1.2.0-pre3+ - rancher-compose_0_10 = generic { - version = "0.10.0"; - sha256 = "17f3ya4qq0dzk4wvhgxp0lh9p8c87kpq7hmh3g21ashzqwmcflxl"; - }; -} diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 15ae244b3291..9c16733e4a07 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -2,10 +2,10 @@ libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, systemd}: stdenv.mkDerivation rec { - name = "spice-vdagent-0.17.0"; + name = "spice-vdagent-0.18.0"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0gdkyylyg1hksg0i0anvznqfli2q39335fnrmcd6847frpc8njpi"; + sha256 = "1bmyvapwj1x0m6y8q0r1df2q37vsnb04qkgnnrfbnzf1qzipxvl0"; }; postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index d6668cde2bdc..251b893f92ff 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, i3, autoreconfHook }: -i3.overrideDerivation (super : rec { +i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; version = "4.15.0.1"; @@ -11,7 +11,7 @@ i3.overrideDerivation (super : rec { sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal"; }; - nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; postUnpack = '' echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION @@ -19,7 +19,6 @@ i3.overrideDerivation (super : rec { # fatal error: GENERATED_config_enums.h: No such file or directory enableParallelBuilding = false; -}) // { meta = with stdenv.lib; { description = "A fork of the i3 tiling window manager with some additional features"; @@ -36,5 +35,4 @@ i3.overrideDerivation (super : rec { Configured via plain text file. Multi-monitor. UTF-8 clean. ''; }; - -} +}) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 2e50d35d4417..fa1ddcf810b7 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { - clock: time/date with configurable format - keyboard-layout ''; - homepage = http://github.com/PandorasFox/i3lock-color; + homepage = https://github.com/PandorasFox/i3lock-color; maintainers = with maintainers; [ garbas malyn ]; license = licenses.bsd3; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 014434011af0..11b7c49f5ebe 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "i3status-rust-${version}"; - version = "0.9.0.2018-03-31"; + version = "0.9.0.2018-06-22"; src = fetchFromGitHub { owner = "greshake"; repo = "i3status-rust"; - rev = "18f99299bcd5b63da4e315c8d78622c4bbf59c45"; - sha256 = "1pfcq3f724ri6jzchkgf96zd7lb5mc882r64ffx634gqf3n8ch41"; + rev = "fdca01e88a7ce9bf4de0f58a922de5131e33dd00"; + sha256 = "12dfvamf9a13b3fa7mqrwhjk3rl53463h03arqd8pvbch006hhqd"; }; - cargoSha256 = "1197hp6d4z14j0r22bvw9ly294li0ivg6yfql4lgi27hbvzag71h"; + cargoSha256 = "01pwknfzkv49cip6asqd4pzkh9l42v06abyd9lb09ip5pkcs60lq"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index a5d02093e3f6..6fc1797dd251 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib -, rev, sha256, version +, rev, sha256, version, patches ? [] }: stdenv.mkDerivation { @@ -14,6 +14,8 @@ stdenv.mkDerivation { repo = "yabar"; }; + inherit patches; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/window-managers/yabar/default.nix b/pkgs/applications/window-managers/yabar/default.nix index 4d42e3082f35..a33a75676ee9 100644 --- a/pkgs/applications/window-managers/yabar/default.nix +++ b/pkgs/applications/window-managers/yabar/default.nix @@ -1,10 +1,18 @@ -{ callPackage, attrs ? {} }: +{ callPackage, attrs ? {}, fetchpatch }: let - overrides = { + overrides = rec { version = "0.4.0"; - rev = "746387f0112f9b7aa2e2e27b3d69cb2892d8c63b"; + rev = version; sha256 = "1nw9dar1caqln5fr0dqk7dg6naazbpfwwzxwlkxz42shsc3w30a6"; + + patches = [ + (fetchpatch { + url = "https://github.com/geommer/yabar/commit/9779a5e04bd6e8cdc1c9fcf5d7ac31416af85a53.patch"; + sha256 = "1szhr3k1kq6ixgnp74wnzgfvgxm6r4zpc3ny2x2wzy6lh2czc07s"; + }) + ]; + } // attrs; in callPackage ./build.nix overrides diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 803d8b9fa12e..aca96f58ed97 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -280,6 +280,10 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" pic" '' + + optionalString targetPlatform.isMinGW '' + hardening_unsupported_flags+=" stackprotector" + '' + + '' substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix index 6c59a0faf049..54b54d278ffb 100644 --- a/pkgs/data/misc/brise/default.nix +++ b/pkgs/data/misc/brise/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { to support various Chinese input methods, including those based on modern dialects or historical diasystems of the Chinese language. ''; - homepage = http://rime.im; + homepage = https://rime.im; # Note that individual packages in this collection # may be released under different licenses license = licenses.gpl3; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 8e64fa698058..a72bae4384a9 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,32 +1,31 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }: stdenv.mkDerivation rec { name = "deepin-terminal-${version}"; - version = "2.9.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-terminal"; rev = version; - sha256 = "1pmg1acs44c30hz9rpr6x1l6lyvlylc2pz5lv4ai0rhv37n51yn2"; + sha256 = "11f2yc0fj05lwhgvdrbrs8xsdm7qgp6wb5wd1f9iyc5nxn7ccl1r"; }; patches = [ # Do not build vendored zssh and vte (fetchurl { name = "remove-vendor.patch"; - url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=5baa756e8e6ac8ce43fb122fce270756cc55086c; - sha256 = "0zrq004malphpy7xv5z502bpq30ybyj1rr4hlq4k5m4fpk29dlw6"; + url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=de701614c19c273b98b60fd6790795ff7d8a157e; + sha256 = "0g7hhvr7ay9g0cgc6qqvzhbcwvbzvrrilbn8w46ypfzj7w5hlkqv"; }) ]; postPatch = '' - substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\" substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh" ''; nativeBuildInputs = [ - pkgconfig vala cmake gettext + pkgconfig vala cmake ninja gettext # For setup hook gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 4470f11597eb..6c7f57b0162a 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -5,13 +5,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.28.2"; + version = "3.28.3"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0lx9amjxmfnwc0089griyxms9prmb78wfnfvdsvli8yw1cns4i74"; + sha256 = "1s1vlznc22q1f8fm8fhggi8xak52b6n952s562f3kpv6g0dm2x6k"; }; propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index a95162068599..5146123cfd46 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,19 +1,26 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python3, gobjectIntrospection -, intltool, libsoup, libxml2, libsecret, icu, sqlite +{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobjectIntrospection +, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.28.2"; + version = "3.28.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1azk8zh167a6hyxzz73yh36gbpf7i52b7zi10hnnnsywh80pj6jk"; + sha256 = "11sq795115vrcgxl9svscm6wg8isjj784c3d84qzb6z47zq92zj3"; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit tzdata; + }) + ]; + nativeBuildInputs = [ cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobjectIntrospection vala ]; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch b/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch new file mode 100644 index 000000000000..334235516591 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/src/calendar/libecal/e-cal-system-timezone.c ++++ b/src/calendar/libecal/e-cal-system-timezone.c +@@ -26,7 +26,7 @@ + #ifdef HAVE_SOLARIS + #define SYSTEM_ZONEINFODIR "/usr/share/lib/zoneinfo/tab" + #else +-#define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo" ++#define SYSTEM_ZONEINFODIR "@tzdata@/share/zoneinfo" + #endif + + #define ETC_TIMEZONE "/etc/timezone" diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix index 8d369f464335..c52533a344b2 100644 --- a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5 }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, glib }: stdenv.mkDerivation rec { name = "lxqt-build-tools-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "lxde"; repo = "lxqt-build-tools"; rev = version; - sha256 = "0i3pzgyd80n73dnqs8f6axinaji7biflgqsi33baxn4r1hy58ym1"; + sha256 = "0dcwzrijmn4sgivmy2zwz3xa4y69pwhranyw0m90g0pp55di2psz"; }; - nativeBuildInputs = [ cmake pkgconfig pcre qt5.qtbase ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ qt5.qtbase glib pcre ]; preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"''; diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix index 862a4ff9cf99..5a284d9b89a7 100644 --- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "pavucontrol-qt"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1pfqdzsbygvq77npsizydps25d9g6vgw177yqvmz3cg3a68dad27"; + sha256 = "1bxqpasfvaagbq8azl7536z2zk2725xg7jkvad5xh95zq1gb4hgk"; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; homepage = https://github.com/lxde/pavucontrol-qt; license = licenses.gpl2; - platforms = with platforms; unix; + platforms = with platforms; linux; maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 3383847f16c6..cd47f7b62b4f 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "caja-extensions-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1abi7s31mx7v8x0f747bmb3s8hrv8fv007pflv2n545yvn0m1dpj"; + sha256 = "01k7c3gw6rfd7vlch61zig22bvz40wlnalc5p3rz4d9i98fr643n"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 74d32ce1f216..57e4ed100a02 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "engrampa-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1pk053i14a0r5s9qkipwnp4qjg76b763203z64ymnpkslrrarnnm"; + sha256 = "09p9jaljaihc723zp17la6lw7h7q16ysk7q0fr0al0k11ss16w6f"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 23e167412919..4062d7c512ff 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "eom-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0320ph6cyh0m4cfyvky10j9prk2hry6rpm4jzgcn7ig03dnj4y0s"; + sha256 = "0z9l96j0q637hw2mkcc2w737acl7g2c5brgrlk4h73hjamfmsdrm"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index fb7a8308ee5f..15b81a628863 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmatekbd-${version}"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1d80xnbb8w51cv9cziybdxca037lksqkc5bd8wqlyb2p79z77426"; + sha256 = "1l1zbphs4snswf4bkrwkk6gsmb44bdhymcfgaaspzbrcmw3y7hr1"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 10a690546f76..8bf0d9bec18c 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "libmatemixer-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0jpfaqbspn2mjv6ysgzdmzhb07gx61yiiiwmrw94qymld2igrzb5"; + sha256 = "00p67mi0flsbgn15qpwq60rzf917s5islbmhirbvz6npcvv0d493"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 7efad3a5e3ae..9a7ba4f006f7 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmateweather-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1c8mvydb0h7z3zn0qahwlp15z5wl6nrv24q4z7ldhm340jnxsvh7"; + sha256 = "0bp1nn3b5gf5nqrdwl43fxbb82j74s3x8jkmp40ilv2qpc2mxwr1"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 42c74aa1173d..c1c6d96688ba 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marco-${version}"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1qnx47aibvl00qaf1jik457cwncxb71pf5pd1m3gdg7ky61ljkm4"; + sha256 = "1fn0yfqjp44gr4kly96qjsd73x06z1xyw6bpyhh09kdqwd80rgiy"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index 7e501fcf379b..52f21225cbb8 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-calc-${version}"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "00k063ia4dclvcpg1q733lbi56533s6mj8bgb1nrgna6y7zw4q87"; + sha256 = "1ghz03j9lfgrjrh8givsw83dpbkw4wlhq4ar3r5g1bf1z636jlx0"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 6bde7d7a0172..bc7538b6306f 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mate-control-center-${version}"; - version = "1.20.2"; + version = "1.20.3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1x40gxrz1hrzbdfl8vbag231g08h45vaky5z827k44qwl6pjd6nl"; + sha256 = "0wpi8b3zz10xd5i7ir7nd737a9vl4q17rc5nh8vfrqpyrcilqzkd"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 09f8da17e096..124cd644467e 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-desktop-${version}"; - version = "1.20.3"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "132z1wwmh5115cpgkx9w6hzkk87f1vh66paaf3b2d2qfci7myffs"; + sha256 = "0qd76p5zqgifiawkgv2casb9ll55j4qq4pfxgxj3j5zvjr3dgr47"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 7291b475fe16..115384584a68 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0lmsmsamgg1s6qrk19qwa76ld7x1k3pwhy4vs1ixn1as4iaaddk5"; + sha256 = "1xzlwmwz1jnksa4rs0smkxhqv3j50y78cf9y5g6aki9iw4dvhvva"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 514da3a11724..efc9a3d2c39f 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-media-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "09vbw7nc91ljnxm5sbrch0w7zzn2i6qjb1b50q402niwr5b0zicr"; + sha256 = "1db47m80qfb1xyrg1qxwvmkc53qp97yhvh86fgwjv00x96c3j9s9"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 51263f0d74e7..9815952c5405 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-menus-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1w1k6kdabmabhpqvkizk1si6ri4rmspsbj0252ki834ml0dxpnhg"; + sha256 = "1p8pkw6aby2hq2liqrnsf3lvyn2jqamfbs83fv6q7clw5w179sy6"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 59df2b7d59bd..748a45eda79c 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mate-notification-daemon-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0dq457npzid20yfwigdh8gfqgf5wv8p6jhbxfnzybam9xidlqc5f"; + sha256 = "0hwswgc3i6d7zvmj0as95xjjw431spxkf1d37mxwaf6j80gx0p78"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 3db773af9fc5..a65077872cfb 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-polkit-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "00c1rmi31gv1a3lk7smjp489kd3wrj0d6npagnb8p1rz0g88ha94"; + sha256 = "05g6k5z903p9p0dbi0y61z5chip52gqrhy5zrjn6xjxv1ad29lsk"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index c056b1f62fbd..e2b50127b89b 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-power-manager-${version}"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1s46jvjcrai6xb2k0dy7i121b9ihfl5h3y5809fg9fzrbvw6bafn"; + sha256 = "1z754jxnwashwxxfg3cxb9ifbqyjxgavzzwy2mjnzl6z7k95hvjh"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index b90211ae0611..036f996da6aa 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-terminal-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "03366hs7mxazn6m6y53ppkb1din4jywljg0lx8zw101qg6car0az"; + sha256 = "0yfr857mpxy35zzdmicvd7mpwka8s1h0rqagfjqc2p1gv4a7ka97"; }; buildInputs = [ diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index ae68e84ab1c2..8f93a0b37721 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -13,6 +13,7 @@ let inherit version; sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a"; }; + patches = []; }); platformio = self.callPackage ./core.nix { }; diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 9d30c2268554..de0585309996 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "platformio"; - version = "3.5.2"; + version = "3.5.3"; src = fetchPypi { inherit pname version; - sha256 = "bb311ce5b8f12c95bc45c2071626a4887a3632fb2472b4d69a873b2acfc2e4ec"; + sha256 = "1l4s2xh1p9h767amk9zapzivz4irl2y3kff3dna6icvsgq6rz011"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 5c1f931da9a2..f9f083f04d75 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A functional CLI language"; - homepage = http://fsharp.org/; + homepage = https://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/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index 354723dfa740..3ce7ae60e114 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = { description = "A functional CLI language"; - homepage = http://fsharp.org/; + homepage = https://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/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index fab9b8fe7458..d671743ee629 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -254,6 +254,9 @@ stdenv.mkDerivation ({ ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools) ; + # TODO: Use optionalString with next rebuild. + ${if (stdenv.cc.isClang && langFortran) then "NIX_CFLAGS_COMPILE" else null} = "-Wno-unused-command-line-argument"; + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix index 48e2ca0a585c..53693ff50521 100644 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -153,7 +153,10 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - passthru = { targetPrefix = ""; }; + passthru = { + targetPrefix = ""; + enableShared = true; + }; meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux"]; diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 3dd320e02572..2a906d918aa3 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -177,6 +177,7 @@ stdenv.mkDerivation rec { inherit bootPkgs targetPrefix; inherit llvmPackages; + inherit enableShared; # Our Cabal compiler name haskellCompilerName = "ghc-7.10.3"; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 53c5a218cb13..8062e93df549 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -183,6 +183,7 @@ stdenv.mkDerivation rec { inherit bootPkgs targetPrefix; inherit llvmPackages; + inherit enableShared; # Our Cabal compiler name haskellCompilerName = "ghc-8.0.2"; diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index c88d2a8685a6..9bd7dfcb9fc1 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -155,7 +155,10 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - passthru = { targetPrefix = ""; }; + passthru = { + targetPrefix = ""; + enableShared = true; + }; meta.license = stdenv.lib.licenses.bsd3; # AArch64 should work in theory but eventually some builds start segfaulting diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 4e9eff06f26e..fefd07b12043 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -8,7 +8,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 +, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. @@ -51,13 +51,16 @@ let '' + stdenv.lib.optionalString enableIntegerSimple '' INTEGER_LIBRARY = integer-simple '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = YES + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 ''; # Splicer will pull out correct variations @@ -93,6 +96,27 @@ stdenv.mkDerivation rec { sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; }) (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) + ] ++ stdenv.lib.optionals (hostPlatform != targetPlatform && targetPlatform.system == hostPlatform.system) [ + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-unphased-cross.patch"; + sha256 = "1hxj80bjx0x3w0f35cj3k2wipppr1ald03jwfy5q0xlxygdha17w"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-staged-cross.patch"; + sha256 = "12xsln3zyfpvml8bwdpbc003h6zl1qh2qcq1rhdrw02n45dz8lvc"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-ghci-cross.patch"; + sha256 = "03dcqf5af3vjhrky3f2z26j4d9h8qd9nkv76xp0l97h4cqk7vfqb"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-stage2-cross.patch"; + sha256 = "0pi2m85wjxaaablq6n4q5vyn9qxvry5d7nmja4b28i68yb4ly9g1"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-hp2ps-cross.patch"; + sha256 = "1fszfavf1cvrf02x500mi7jykcpvpl2i7i4qzr2qz9sbmyq063f0"; + }) ] ++ stdenv.lib.optional deterministicProfiling (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch"; @@ -134,6 +158,7 @@ stdenv.mkDerivation rec { # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform) [ "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" @@ -199,6 +224,7 @@ stdenv.mkDerivation rec { inherit bootPkgs targetPrefix; inherit llvmPackages; + inherit enableShared; # Our Cabal compiler name haskellCompilerName = "ghc-8.2.2"; diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix deleted file mode 100644 index ac8d76c63ed6..000000000000 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ /dev/null @@ -1,208 +0,0 @@ -{ stdenv, targetPackages -, buildPlatform, hostPlatform, targetPlatform - -# build-tools -, bootPkgs, alex, happy, hscolour -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 - -, libffi, libiconv ? null, ncurses - -, useLLVM ? !targetPlatform.isx86 -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(gmp.meta.available or false), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? targetPlatform != hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt - -, # Whetherto build terminfo. - enableTerminfo ? !targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross" -}: - -let - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - '' + stdenv.lib.optionalString enableIntegerSimple '' - INTEGER_LIBRARY = integer-simple - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = YES - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - toolsForTarget = - if hostPlatform == buildPlatform then - [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm - else assert targetPlatform == hostPlatform; # build != host == target - [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - -in -stdenv.mkDerivation rec { - version = "8.4.2"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "0yq4y0smn92sksnjjva28b8847krxizns6rm50j3pgq69br35k01"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [(fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf"; - sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - })] - ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ - # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatability. - strictDeps = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 - ghc alex happy hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = libDeps hostPlatform; - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = [ "format" ]; - - postInstall = '' - for bin in "$out"/lib/${name}/bin/*; do - isELF "$bin" || continue - paxmark m "$bin" - done - - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - - # Our Cabal compiler name - haskellCompilerName = "ghc-8.4.2"; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index c57058a63520..4d2f3894f178 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -7,7 +7,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 +, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. @@ -121,6 +121,8 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets ''; # TODO(@Ericson2314): Always pass "--target" and always prefix. @@ -193,6 +195,7 @@ stdenv.mkDerivation rec { inherit bootPkgs targetPrefix; inherit llvmPackages; + inherit enableShared; # Our Cabal compiler name haskellCompilerName = "ghc-8.4.3"; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index c128891ec382..8ccd72ef55a2 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -191,6 +191,7 @@ stdenv.mkDerivation rec { inherit bootPkgs targetPrefix; inherit llvmPackages; + inherit enableShared; # Our Cabal compiler name haskellCompilerName = "ghc-8.5"; diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index affed7e2d071..65b43f712ae2 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -42,6 +42,8 @@ let inherit (bootGhcjs) version; isGhcjs = true; + enableShared = true; + socket-io = nodePackages."socket.io"; # Relics of the old GHCJS build system @@ -96,4 +98,3 @@ in stdenv.mkDerivation { meta.platforms = passthru.bootPkgs.ghc.meta.platforms; } - diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 98eb58e6aae7..f09a577110b7 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -179,6 +179,8 @@ in mkDerivation (rec { # let us assume ghcjs is never actually cross compiled targetPrefix = ""; + enableShared = true; + inherit stage1Packages; mkStage2 = stage2 { inherit ghcjsBoot; diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 23e7ec222a63..6f5a65bd03c6 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1lbxnlj5l9i8k1dg33dh8ndx9vspk9dkpcbg06jbbswy6kadmx6f"; + sha256 = "0i89298dgnmpmam3ifkm0ax266vvbq1yz7wfw8wwrcma0szrbrnb"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 76f29eeaa0c0..342051230030 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.41"; + version = "1.2.50"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0p16xl2qhm7913abd06vvmsx956ny51jjfr6knkmrnk8y9r2g1xg"; + sha256 = "1abis73ij334vfwn9k4s9rsa1va7h31a9g97g84i2rrp7cq2q1mw"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 05893704d872..cc25a41b0400 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -13,7 +13,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - buildInputs = [ cmake libxml2 llvm python ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libxml2 llvm python ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" @@ -27,6 +28,8 @@ let postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp ''; outputs = [ "out" "lib" "python" ]; diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index cc3f5545146c..5a0410302f2f 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -17,15 +17,22 @@ stdenv.mkDerivation rec { patches = [ # glibc 2.26 fix ../../3.9/libc++/xlocale-glibc-2.26.patch - ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + ] + ++ lib.optional stdenv.isDarwin ./darwin.patch + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ../../libcxx-max_align_t.patch + ]; + + nativeBuildInputs = [ cmake ]; - buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix index 45fb7b5be4f6..8b25681c2dbf 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation { export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" '' + stdenv.lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 2c65234b6a47..b847a67e7e3f 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -36,8 +36,12 @@ in stdenv.mkDerivation rec { # Fix a segfault in llc # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html - patches = [ ./D17533-1.patch ] ++ - stdenv.lib.optionals (!stdenv.isDarwin) [./fix-llvm-config.patch]; + patches = [ ./D17533-1.patch ] + ++ stdenv.lib.optional (!stdenv.isDarwin) ./fix-llvm-config.patch + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../TLI-musl.patch + ../dynamiclibrary-musl.patch + ]; # hacky fix: New LLVM releases require a newer macOS SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is @@ -49,7 +53,7 @@ in stdenv.mkDerivation rec { --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \ --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" '' - + stdenv.lib.optionalString (stdenv ? glibc) '' + + '' ( cd projects/compiler-rt patch -p1 < ${ @@ -81,6 +85,14 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + # Not yet supported + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + ]; postBuild = '' diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index 1f6d80ab3be9..f597c559dba6 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -29,6 +29,8 @@ let postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp ''; outputs = [ "out" "lib" "python" ]; diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index 7e5c30bdfd35..bd2cc19d2e0b 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -17,15 +17,21 @@ stdenv.mkDerivation rec { patches = [ # glibc 2.26 fix ./xlocale-glibc-2.26.patch - ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + ] + ++ lib.optional stdenv.isDarwin ./darwin.patch + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ../../libcxx-max_align_t.patch + ]; - buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix index dc508757ab6d..dffb207a32b6 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation { export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" '' + stdenv.lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 71b67aa7dc57..708e471bd4ac 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -62,7 +62,10 @@ in stdenv.mkDerivation rec { url = https://github.com/llvm-mirror/llvm/commit/5340b5b3d970069aebf3dde49d8964583742e01a.patch; sha256 = "095f8knplwqbc2p7rad1kq8633i34qynni9jna93an7kyc80wdxl"; }) - ]; + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../TLI-musl.patch + ../dynamiclibrary-musl.patch + ]; postPatch = "" + '' @@ -91,7 +94,7 @@ in stdenv.mkDerivation rec { substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib patch -p1 < ./llvm-outputs.patch '' - + stdenv.lib.optionalString (stdenv ? glibc) '' + + '' ( cd projects/compiler-rt patch -p1 < ${ @@ -129,6 +132,14 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals (buildPlatform != hostPlatform) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildPackages.llvmPackages_39.llvm}/bin/llvm-tblgen" + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + # Not yet supported + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + ]; postBuild = '' diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 718abc420a97..6ce9c0d4792b 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./xlocale-glibc-2.26.patch ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch - ./max_align_t.patch + ../../libcxx-max_align_t.patch ]; prePatch = '' diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 41eb40e124eb..5eeec395b97a 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { export TRIPLE=x86_64-apple-darwin '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} - patch -p1 -d $(ls -d libcxx-*) -i ${./libc++/max_align_t.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index a371296db326..06bcd74456c4 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -83,7 +83,7 @@ in stdenv.mkDerivation (rec { patch -p0 < ${../aarch64.patch} '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../TLI-musl.patch} - patch -p1 -i ${./dynamiclibrary-musl.patch} + patch -p1 -i ${../dynamiclibrary-musl.patch} patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt ''; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 8027733bc527..07738048f8e2 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -30,10 +30,7 @@ let "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] - # Maybe with compiler-rt this won't be needed? - ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"; + ]; patches = [ ./purity.patch ]; @@ -50,13 +47,12 @@ let outputs = [ "out" "lib" "python" ]; + # Clang expects to find LLVMgold in its own prefix postInstall = '' - # Clang expects to find LLVMgold in its own prefix if [ -e ${llvm}/lib/LLVMgold.so ]; then ln -sv ${llvm}/lib/LLVMgold.so $out/lib fi - # Clang expects to find sanitizer libraries in its own prefix - ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ + ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix new file mode 100644 index 000000000000..19833e4d3d4a --- /dev/null +++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -0,0 +1,37 @@ +{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }: +with stdenv.lib; +stdenv.mkDerivation rec { + name = "compiler-rt-${version}"; + inherit version; + src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; + + nativeBuildInputs = [ cmake python llvm ]; + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + + configureFlags = [ + "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + ]; + + outputs = [ "out" "dev" ]; + + patches = [ + ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch; + + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + ''; + + # Hack around weird upsream RPATH bug + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + ln -s "$out/lib"/*/* "$out/lib" + ''; + + enableParallelBuilding = true; +} diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index c3c1d87f2e4e..ef2e1c29088f 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -14,7 +14,6 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3"; # Add man output without introducing extra dependencies. @@ -24,12 +23,19 @@ let tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + mkExtraBuildCommands = cc: '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' + echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags + ''; in { - llvm = overrideManOutput (callPackage ./llvm.nix { - inherit compiler-rt_src; - inherit (targetLlvmLibraries) libcxxabi; - }); + llvm = overrideManOutput (callPackage ./llvm.nix { }); + clang-unwrapped = overrideManOutput (callPackage ./clang { inherit clang-tools-extra_src; }); @@ -40,14 +46,23 @@ let clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; - libstdcxxClang = wrapCCWith { + libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraPackages = [ libstdcxxHook ]; + extraPackages = [ + libstdcxxHook + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; }; - libcxxClang = wrapCCWith { + libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; + extraPackages = [ + targetLlvmLibraries.libcxx + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; }; lld = callPackage ./lld.nix {}; @@ -59,6 +74,8 @@ let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { + compiler-rt = callPackage ./compiler-rt.nix {}; + stdenv = overrideCC stdenv buildLlvmTools.clang; libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 5070de1f48b1..8809859b5905 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -11,7 +11,6 @@ , version , release_version , zlib -, compiler-rt_src , libcxxabi , debugVersion ? false , enableManpages ? false @@ -32,8 +31,6 @@ in stdenv.mkDerivation (rec { unpackFile ${src} mv llvm-${version}* llvm sourceRoot=$PWD/llvm - unpackFile ${compiler-rt_src} - mv compiler-rt-* $sourceRoot/projects/compiler-rt ''; outputs = [ "out" "python" ] @@ -48,15 +45,7 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; - # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks - # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra - # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd - # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by - # a flag and turn the flag off during the stdenv build. postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ - --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \ --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" @@ -70,9 +59,6 @@ in stdenv.mkDerivation (rec { substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" rm unittests/Support/Path.cpp - - # Revert compiler-rt commit that makes codesign mandatory - patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt '' + stdenv.lib.optionalString stdenv.isAarch64 '' patch -p0 < ${../aarch64.patch} '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' @@ -80,7 +66,6 @@ in stdenv.mkDerivation (rec { substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt ''; # hacky fix: created binaries need to be run before installation @@ -95,7 +80,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" - "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" diff --git a/pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch b/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch index d5d7f07b5e11..d5d7f07b5e11 100644 --- a/pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch +++ b/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch diff --git a/pkgs/development/compilers/llvm/4/libc++/max_align_t.patch b/pkgs/development/compilers/llvm/libcxx-max_align_t.patch index 060be5b23de8..060be5b23de8 100644 --- a/pkgs/development/compilers/llvm/4/libc++/max_align_t.patch +++ b/pkgs/development/compilers/llvm/libcxx-max_align_t.patch diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 89dd7dc3fdc5..1676ce4884d9 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.nasm.us/; + homepage = https://www.nasm.us/; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; platforms = platforms.unix; maintainers = with maintainers; [ pSub willibutz ]; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 42a585ff51f0..e2aa5736c7a3 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-level dynamically typed programming language"; - homepage = http://nekovm.org; + homepage = https://nekovm.org; license = licenses.lgpl21; maintainers = [ maintainers.marcweber ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index de383410b9c6..a4b706d35aa5 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "45c74adb35f08dfa9add1112ae17330e5d902ebb4a36e7046caee8b79e6f3bd0"; }; - doCheck = true; + doCheck = !stdenv.isDarwin; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix index b39d57cc092b..5a3e75e648d9 100644 --- a/pkgs/development/compilers/ocaml/4.07.nix +++ b/pkgs/development/compilers/ocaml/4.07.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "07"; - patch_version = "0+beta2"; - sha256 = "0rrvl47kq982z2ns7cnasmlbj60mpmza2zyhl1kh45c5a3n7692n"; + patch_version = "0+rc1"; + sha256 = "0ggzh078k68na2mahj3nrqkl57i1iv9aymlz8mmlcd8hbvp1fcn8"; # If the executable is stripped it does not work dontStrip = true; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index d3f654749b04..1abf44f23495 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://opendylan.org; + homepage = https://opendylan.org; description = "A multi-paradigm functional and object-oriented programming language"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 95f4dc5b215f..d00080282d7c 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin"; meta = { - homepage = http://opendylan.org; + homepage = https://opendylan.org; description = "A multi-paradigm functional and object-oriented programming language"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index 75daad36f762..9b4816bb282e 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { '' + stdenv.lib.optionalString stdenv.isDarwin (with darwin; '' sed -i '/^[[:space:]]*\*x86-darwin\*)$/,/^[[:space:]]*\*) ;;/ c\ \ \*x86-darwin\*)\ -\ INCLFILE=${apple_sdk.sdk}/include/unistd.h\ +\ INCLFILE=${stdenv.lib.getDev apple_sdk.sdk}/include/unistd.h\ \ ;;\ \ \*) ;; ' base/runtime/config/gen-posix-names.sh diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index eb55be69188d..20a908858e9c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1051,6 +1051,12 @@ self: super: { strictDeps = true; }); + # dhall-json requires a very particular dhall version + dhall-json_1_2_0 = super.dhall-json_1_2_0.override { dhall = self.dhall_1_14_0; }; + + # https://github.com/fpco/streaming-commons/issues/49 + streaming-commons = dontCheck super.streaming-commons; + } // @@ -1069,14 +1075,3 @@ self: super: { in { inherit amazonka amazonka-core amazonka-test; }) - -// - -# The actual Cabal library gets built while building its `Setup.hs`. -(let - inherit (pkgs.lib) filterAttrs flip mapAttrs hasPrefix; - cabals = filterAttrs (n: v: hasPrefix "Cabal_" n) super; - fixCabal = n: v: addSetupDepends v [ self.mtl self.parsec ]; -in - mapAttrs fixCabal cabals -) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 437ff2d9d65a..d87a84c3c778 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 11.13 + # LTS Haskell 11.14 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -66,7 +66,7 @@ default-package-overrides: - aeson ==1.2.4.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 - - aeson-compat ==0.3.7.1 + - aeson-compat ==0.3.8 - aeson-diff ==1.1.0.5 - aeson-extra ==0.4.1.0 - aeson-generic-compat ==0.0.1.2 @@ -203,7 +203,7 @@ default-package-overrides: - asn1-parse ==0.9.4 - asn1-types ==0.3.2 - assert-failure ==0.1.2.2 - - astro ==0.4.2.0 + - astro ==0.4.2.1 - async ==2.1.1.1 - async-extra ==0.2.0.0 - async-refresh ==0.2.0.2 @@ -216,9 +216,11 @@ default-package-overrides: - attoparsec ==0.13.2.2 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 + - attoparsec-ip ==0.0.1 - attoparsec-iso8601 ==1.0.0.0 - attoparsec-path ==0.0.0.1 - attoparsec-time ==1 + - attoparsec-uri ==0.0.4 - audacity ==0.0.2 - authenticate ==1.3.4 - authenticate-oauth ==1.6 @@ -296,7 +298,7 @@ default-package-overrides: - blastxml ==0.3.2 - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.1.0 - - blaze-html ==0.9.0.1 + - blaze-html ==0.9.1.1 - blaze-markup ==0.8.2.1 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 @@ -325,7 +327,7 @@ default-package-overrides: - bson-lens ==0.1.1 - btrfs ==0.1.2.3 - buchhaltung ==0.0.7 - - buffer-builder ==0.2.4.5 + - buffer-builder ==0.2.4.6 - buffer-pipe ==0.0 - butcher ==1.3.0.0 - bv ==0.5 @@ -568,7 +570,7 @@ default-package-overrides: - dependent-sum ==0.4 - dependent-sum-template ==0.0.0.6 - deque ==0.2.1 - - deriving-compat ==0.4.2 + - deriving-compat ==0.4.3 - descriptive ==0.9.4 - dhall ==1.11.1 - dhall-json ==1.0.13 @@ -588,7 +590,7 @@ default-package-overrides: - disposable ==0.2.0.4 - distance ==0.1.0.0 - distributed-closure ==0.4.0 - - distributed-process ==0.7.3 + - distributed-process ==0.7.4 - distributed-process-lifted ==0.3.0.1 - distributed-process-monad-control ==0.5.1.3 - distributed-process-simplelocalnet ==0.2.4 @@ -880,6 +882,7 @@ default-package-overrides: - grouped-list ==0.2.2.0 - groups ==0.4.1.0 - gtk2hs-buildtools ==0.13.4.0 + - gym-http-api ==0.1.0.1 - H ==0.9.0.1 - h2c ==1.0.0 - hackage-db ==2.0 @@ -892,7 +895,7 @@ default-package-overrides: - hamilton ==0.1.0.2 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.5.6 + - hapistrano ==0.3.5.7 - happstack-jmacro ==7.0.12 - happstack-server ==7.5.1 - happstack-server-tls ==7.1.6.5 @@ -986,7 +989,7 @@ default-package-overrides: - hmatrix-backprop ==0.1.2.0 - hmatrix-gsl ==0.18.2.0 - hmatrix-gsl-stats ==0.4.1.7 - - hmatrix-morpheus ==0.1.1.1 + - hmatrix-morpheus ==0.1.1.2 - hmatrix-repa ==0.1.2.2 - hmatrix-special ==0.4.0.1 - hmatrix-vector-sized ==0.1.1.0 @@ -1018,8 +1021,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - HSet ==0.0.1 - hset ==2.2.0 + - HSet ==0.0.1 - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -1027,7 +1030,7 @@ default-package-overrides: - HSlippyMap ==3.0.1 - hslogger ==1.2.10 - hslua ==0.9.5.2 - - hslua-aeson ==0.3.0.1 + - hslua-aeson ==0.3.0.2 - hslua-module-text ==0.1.2.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 @@ -1066,10 +1069,10 @@ default-package-overrides: - html-email-validate ==0.2.0.0 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - HTTP ==4000.3.11 + - HTTP ==4000.3.12 - http2 ==1.6.3 - http-api-data ==0.3.7.2 - - http-client ==0.5.12.1 + - http-client ==0.5.13 - http-client-openssl ==0.2.1.1 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 @@ -1167,6 +1170,7 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.5.0.1 - io-streams-haproxy ==1.0.0.2 + - ip ==1.2.1 - ip6addr ==0.5.3 - iproute ==1.7.5 - IPv6Addr ==1.0.3 @@ -1180,7 +1184,7 @@ default-package-overrides: - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - - iso8601-time ==0.1.4 + - iso8601-time ==0.1.5 - iterable ==3.0 - ixset ==1.0.7 - ixset-typed ==0.3.1.1 @@ -1235,7 +1239,7 @@ default-package-overrides: - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - language-javascript ==0.6.0.11 - - language-puppet ==1.3.17 + - language-puppet ==1.3.18 - lapack-carray ==0.0.2 - lapack-ffi ==0.0.2 - lapack-ffi-tools ==0.1.0.1 @@ -1327,6 +1331,7 @@ default-package-overrides: - markdown ==0.1.17.1 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 + - markup ==4.0.4 - marvin-interpolate ==1.1.2 - massiv ==0.1.6.1 - massiv-io ==0.1.4.0 @@ -1463,7 +1468,7 @@ default-package-overrides: - netlib-carray ==0.0.1.1 - netlib-ffi ==0.0.1 - netpbm ==1.0.2 - - nettle ==0.2.0 + - nettle ==0.2.1 - netwire ==5.0.3 - netwire-input ==0.0.7 - netwire-input-glfw ==0.0.10 @@ -1610,7 +1615,7 @@ default-package-overrides: - picosat ==0.1.4 - pid1 ==0.1.2.0 - pinboard ==0.9.12.10 - - pinch ==0.3.2.0 + - pinch ==0.3.3.0 - pipes ==4.3.9 - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 @@ -1669,7 +1674,7 @@ default-package-overrides: - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - pretty-hex ==1.0 - - prettyprinter ==1.2.0.1 + - prettyprinter ==1.2.1 - prettyprinter-ansi-terminal ==1.1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 @@ -1722,7 +1727,8 @@ default-package-overrides: - QuickCheck ==2.10.1 - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 - - quickcheck-combinators ==0.0.2 + - quickcheck-classes ==0.4.12 + - quickcheck-combinators ==0.0.4 - quickcheck-instances ==0.3.18 - quickcheck-io ==0.2.0 - quickcheck-properties ==0.1 @@ -1788,7 +1794,7 @@ default-package-overrides: - regex-tdfa-text ==1.0.0.3 - reinterpret-cast ==0.1.0 - relational-query ==0.11.1.0 - - relational-query-HDBC ==0.6.7.0 + - relational-query-HDBC ==0.6.7.1 - relational-record ==0.2.1.2 - relational-schemas ==0.1.6.1 - rematch ==0.2.0.0 @@ -1860,6 +1866,7 @@ default-package-overrides: - semigroupoid-extras ==5 - semigroupoids ==5.2.2 - semigroups ==0.18.4 + - semirings ==0.1.3.0 - semiring-simple ==1.0.0.1 - semver ==0.3.3.1 - sendfile ==0.7.9 @@ -1915,7 +1922,7 @@ default-package-overrides: - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 - show-combinators ==0.1.0.0 - - show-prettyprint ==0.2.0.2 + - show-prettyprint ==0.2.2 - signal ==0.1.0.4 - silently ==1.2.5 - simple ==0.11.2 @@ -1931,11 +1938,11 @@ default-package-overrides: - skein ==1.0.9.4 - skeletons ==0.4.0 - skylighting ==0.6 - - slack-web ==0.2.0.4 + - slack-web ==0.2.0.5 - slave-thread ==1.0.2 - slug ==0.1.7 - smallcheck ==1.1.4 - - smoothie ==0.4.2.8 + - smoothie ==0.4.2.9 - smtp-mail ==0.1.4.6 - snap ==1.1.0.0 - snap-blaze ==0.2.1.5 @@ -1966,14 +1973,14 @@ default-package-overrides: - split ==0.2.3.3 - splitmix ==0 - Spock ==0.12.0.0 - - Spock-api ==0.12.0.0 - - Spock-api-server ==0.12.0.0 + - Spock-api ==0.12.0.1 + - Spock-api-server ==0.12.0.1 - Spock-core ==0.12.0.0 - Spock-lucid ==0.4.0.1 - Spock-worker ==0.3.1.0 - spoon ==0.3.1 - spreadsheet ==0.1.3.7 - - sqlite-simple ==0.4.15.0 + - sqlite-simple ==0.4.16.0 - sql-words ==0.1.6.1 - squeal-postgresql ==0.1.1.4 - srcloc ==0.5.1.2 @@ -2006,7 +2013,7 @@ default-package-overrides: - storable-tuple ==0.0.3.3 - storablevector ==0.2.13 - store ==0.4.3.2 - - store-core ==0.4.3 + - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - stratosphere ==0.19.1 - streaming ==0.2.1.0 @@ -2132,7 +2139,7 @@ default-package-overrides: - threads ==0.5.1.6 - threads-extras ==0.1.0.2 - threepenny-editors ==0.5.6 - - threepenny-gui ==0.8.2.3 + - threepenny-gui ==0.8.2.4 - threepenny-gui-flexbox ==0.4.2 - th-reify-compat ==0.0.1.4 - th-reify-many ==0.1.8 @@ -2248,6 +2255,7 @@ default-package-overrides: - uri-bytestring-aeson ==0.1.0.6 - uri-encode ==1.5.0.5 - uri-templater ==0.3.1.0 + - urlpath ==8.1.0 - userid ==0.1.3.2 - users ==0.5.0.0 - users-postgresql-simple ==0.5.0.2 @@ -2257,7 +2265,7 @@ default-package-overrides: - utility-ht ==0.0.14 - uuid ==1.3.13 - uuid-types ==1.0.3 - - vado ==0.0.9 + - vado ==0.0.10 - validation ==1 - validationt ==0.2.0.0 - validity ==0.4.0.4 @@ -2340,7 +2348,7 @@ default-package-overrides: - web-routes-th ==0.22.6.3 - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 - - websockets ==0.12.5.0 + - websockets ==0.12.5.1 - websockets-rpc ==0.6.0 - websockets-simple ==0.0.6.3 - websockets-snap ==0.10.3.0 @@ -2644,6 +2652,7 @@ dont-distribute-packages: accelerate-fourier-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-llvm-ptx: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-yices: [ i686-linux, x86_64-linux, x86_64-darwin ] + boolector: [ i686-linux, x86_64-linux, x86_64-darwin ] ccelerate-cuda: [ i686-linux, x86_64-linux, x86_64-darwin ] cublas: [ i686-linux, x86_64-linux, x86_64-darwin ] cufft: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7f3ddc48103b..9ac88dca83e3 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -30,7 +30,7 @@ in , profilingDetail ? "all-functions" # TODO enable shared libs for cross-compiling , enableSharedExecutables ? false -, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) +, enableSharedLibraries ? (ghc.enableShared or false) , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableStaticLibraries ? !hostPlatform.isWindows , enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" @@ -98,7 +98,7 @@ let else "package-conf"; # the target dir for haddock documentation - docdir = docoutput: docoutput + "/share/doc"; + docdir = docoutput: docoutput + "/share/doc/" + pname + "-" + version; newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; newCabalFile = fetchurl { @@ -179,7 +179,8 @@ let allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends; - nativeBuildInputs = [ ghc nativeGhc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ + depsBuildBuild = [ nativeGhc ]; + nativeBuildInputs = [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends; @@ -210,18 +211,6 @@ let cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf ${packageConfDir}/ continue fi - if [ -d "$p/include" ]; then - configureFlags+=" --extra-include-dirs=$p/include" - fi - if [ -d "$p/lib" ]; then - configureFlags+=" --extra-lib-dirs=$p/lib" - fi - '' - # It is not clear why --extra-framework-dirs does work fine on Linux - + optionalString (!buildPlatform.isDarwin || versionAtLeast nativeGhc.version "8.0") '' - if [[ -d "$p/Library/Frameworks" ]]; then - configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks" - fi ''; in @@ -242,7 +231,7 @@ stdenv.mkDerivation ({ inherit src; - inherit nativeBuildInputs; + inherit depsBuildBuild nativeBuildInputs; buildInputs = otherBuildInputs ++ optionals (!hasActiveLibrary) propagatedBuildInputs; propagatedBuildInputs = optionals hasActiveLibrary propagatedBuildInputs; @@ -286,6 +275,19 @@ stdenv.mkDerivation ({ + '' for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do ${buildPkgDb ghc.name "$packageConfDir"} + if [ -d "$p/include" ]; then + configureFlags+=" --extra-include-dirs=$p/include" + fi + if [ -d "$p/lib" ]; then + configureFlags+=" --extra-lib-dirs=$p/lib" + fi + '' + # It is not clear why --extra-framework-dirs does work fine on Linux + + optionalString (!buildPlatform.isDarwin || versionAtLeast nativeGhc.version "8.0") '' + if [[ -d "$p/Library/Frameworks" ]]; then + configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks" + fi + '' + '' done '' # only use the links hack if we're actually building dylibs. otherwise, the diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6042f24771f7..55cd821e1a2c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2492,6 +2492,7 @@ self: { pname = "Cabal"; version = "2.2.0.1"; sha256 = "0yqa6fm9jvr0ka6b1mf17bf43092dc1bai6mqyiwwwyz0h9k1d82"; + setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath mtl parsec pretty process text time transformers unix @@ -3605,22 +3606,23 @@ self: { "DOH" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers , filepath, http-client, http-client-tls, http-types - , interpolatedstring-perl6, lens, mtl, QuickCheck - , quickcheck-instances, text, time, unordered-containers, uri + , interpolatedstring-perl6, lens, mtl, network-uri, QuickCheck + , quickcheck-instances, text, time, unordered-containers }: mkDerivation { pname = "DOH"; - version = "0.1.2.0"; - sha256 = "1l70h2213lmpy8mkac4iy9wfcqiqcsp1dvgx9lby470hn77jmg3w"; + version = "0.1.4.0"; + sha256 = "1rpmsl07m4qy33axhw39qxay6bw299cs4zqa8nq6w4bcqz44fqav"; libraryHaskellDepends = [ aeson aeson-casing base bytestring containers filepath http-client - http-client-tls http-types lens mtl text time unordered-containers - uri + http-client-tls http-types lens mtl network-uri text time + unordered-containers ]; testHaskellDepends = [ aeson aeson-casing base bytestring containers filepath http-client http-client-tls http-types interpolatedstring-perl6 lens mtl - QuickCheck quickcheck-instances text time unordered-containers uri + network-uri QuickCheck quickcheck-instances text time + unordered-containers ]; description = "Complete API bindings for DigitalOcean API V2"; license = stdenv.lib.licenses.mit; @@ -8069,13 +8071,19 @@ self: { }) {}; "HNumeric" = callPackage - ({ mkDerivation, base, normaldistribution, random }: + ({ mkDerivation, base, math-functions, parallel, parallel-io + , random + }: mkDerivation { pname = "HNumeric"; - version = "0.4.0.0"; - sha256 = "1vr2i6xm4ix9iym41cp04ipf38hv6n76baf38c8mf25b5cibfblf"; - libraryHaskellDepends = [ base normaldistribution random ]; - testHaskellDepends = [ base normaldistribution random ]; + version = "0.5.0.2"; + sha256 = "1z6r9z7s89z9bihiy37scjrb8k3gb6zi7fl77d3sdldy2x0ajgrh"; + libraryHaskellDepends = [ + base math-functions parallel parallel-io random + ]; + testHaskellDepends = [ + base math-functions parallel parallel-io random + ]; description = "Haskell Numeric Library with pure functionality, R & MATLAB Syntax"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -8581,28 +8589,6 @@ self: { }: mkDerivation { pname = "HTTP"; - version = "4000.3.11"; - sha256 = "0idnclf1gnvqsygppanr0gj6dfvxj1rsz8q7hhahfw82v0wjplps"; - libraryHaskellDepends = [ - array base bytestring mtl network network-uri parsec time - ]; - testHaskellDepends = [ - base bytestring case-insensitive conduit conduit-extra deepseq - http-types httpd-shed HUnit mtl network network-uri pureMD5 split - test-framework test-framework-hunit wai warp - ]; - description = "A library for client-side HTTP"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HTTP_4000_3_12" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive, conduit - , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl - , network, network-uri, parsec, pureMD5, split, test-framework - , test-framework-hunit, time, wai, warp - }: - mkDerivation { - pname = "HTTP"; version = "4000.3.12"; sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3"; libraryHaskellDepends = [ @@ -8615,7 +8601,6 @@ self: { ]; description = "A library for client-side HTTP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HTTP-Simple" = callPackage @@ -10005,8 +9990,8 @@ self: { }: mkDerivation { pname = "HsYAML"; - version = "0.1.1.0"; - sha256 = "1dih7i0c1fayqrz9x27hfhvg0rb0w1m70a702qhbyjr5jczlh6rb"; + version = "0.1.1.1"; + sha256 = "1qxblx2s67n4jmnzai00hqp92iz3kvmzl1pqyx6l9zgllmh94zrh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10237,6 +10222,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "IPv6Addr_1_0_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "1.0.4"; + sha256 = "1hgb0jygywhz74mndbk94v7pw9h4wfy902wxhnhdd9rb51dcb0d9"; + libraryHaskellDepends = [ + aeson attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + description = "Library to deal with IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IPv6DB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger , hedis, hspec, http-client, http-types, IPv6Addr, mtl @@ -16970,20 +16974,6 @@ self: { ({ mkDerivation, aeson, base, deepseq, hvect, reroute }: mkDerivation { pname = "Spock-api"; - version = "0.12.0.0"; - sha256 = "005ydqf5nq527n3axm8mdi3igsjx76kghabxzfawa9m45yyvrzcc"; - revision = "1"; - editedCabalFile = "0w0xah0lirgrs1xvlw5z6saa3wvzdl5r3yq3zxipg7kmrfxgbfbz"; - libraryHaskellDepends = [ aeson base deepseq hvect reroute ]; - description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "Spock-api_0_12_0_1" = callPackage - ({ mkDerivation, aeson, base, deepseq, hvect, reroute }: - mkDerivation { - pname = "Spock-api"; version = "0.12.0.1"; sha256 = "0mg5r6rdcgy1yc1lx739bwhlndwyfb9hx0dcwqii7a5sy20qy960"; libraryHaskellDepends = [ aeson base deepseq hvect reroute ]; @@ -17012,18 +17002,6 @@ self: { ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }: mkDerivation { pname = "Spock-api-server"; - version = "0.12.0.0"; - sha256 = "1kiin49jgdbw38cf4x89f00hpdxd2bq4plfasxqyqx9qh8344wr9"; - libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ]; - description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "Spock-api-server_0_12_0_1" = callPackage - ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }: - mkDerivation { - pname = "Spock-api-server"; version = "0.12.0.1"; sha256 = "14si03c1xcjfhmjpv717x4ipbd5x7h2sqrld7nnh0pgajzfx8m08"; libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ]; @@ -19086,6 +19064,8 @@ self: { pname = "WordNet"; version = "1.1.0"; sha256 = "0b44xxkihafzsw25xx484xxw17zlzzqbj0bx8cs2nvf3p7jxd02k"; + revision = "2"; + editedCabalFile = "08i5izbni7xism94h6ncmdvfy88gny2vybapv0fkzgw3wyf6arhq"; libraryHaskellDepends = [ array base containers filepath ]; description = "Haskell interface to the WordNet database"; license = stdenv.lib.licenses.bsd3; @@ -19098,6 +19078,8 @@ self: { pname = "WordNet-ghc74"; version = "0.1.3"; sha256 = "1ab5wybawa3dfq89dn0g3zdhsqd03bcm3qky2d4z6irw7afdqrr8"; + revision = "1"; + editedCabalFile = "1wdx2xv6zxvwkz3jkkd4vcdf9hyyivbfwyln9dd30m67ip7illp3"; libraryHaskellDepends = [ array base containers filepath ]; description = "Haskell interface to the WordNet database"; license = stdenv.lib.licenses.bsd3; @@ -21826,34 +21808,6 @@ self: { }: mkDerivation { pname = "aeson-compat"; - version = "0.3.7.1"; - sha256 = "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r"; - revision = "3"; - editedCabalFile = "1smql0v6b9f4pb3jnrm8kspyq2ygvznk1wkhzp0x7bjd7psrnmy9"; - libraryHaskellDepends = [ - aeson attoparsec attoparsec-iso8601 base base-compat bytestring - containers exceptions hashable scientific tagged text time - time-locale-compat unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat base-orphans bytestring - containers exceptions hashable QuickCheck quickcheck-instances - scientific tagged tasty tasty-hunit tasty-quickcheck text time - time-locale-compat unordered-containers vector - ]; - description = "Compatibility layer for aeson"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-compat_0_3_8" = callPackage - ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base - , base-compat, base-orphans, bytestring, containers, exceptions - , hashable, QuickCheck, quickcheck-instances, scientific, tagged - , tasty, tasty-hunit, tasty-quickcheck, text, time - , time-locale-compat, unordered-containers, vector - }: - mkDerivation { - pname = "aeson-compat"; version = "0.3.8"; sha256 = "0j4v13pgk21zy8hqkbx8hw0n05jdl17qphxz9rj4h333pr547r3i"; libraryHaskellDepends = [ @@ -21869,7 +21823,6 @@ self: { ]; description = "Compatibility layer for aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-decode" = callPackage @@ -22004,12 +21957,14 @@ self: { }: mkDerivation { pname = "aeson-filthy"; - version = "0.1.1"; - sha256 = "1jv3avgbjrpgp7sfamvrlk04gbiczbjbqw6m88i9b6m45gxs7zaq"; + version = "0.1.2"; + sha256 = "1sph4iq87vl66rbxvhhh5j699yskpb8zs1mvc3nvp60nyg1145b8"; libraryHaskellDepends = [ aeson base bytestring text unordered-containers ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ + aeson base bytestring doctest text unordered-containers + ]; description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -23102,6 +23057,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alarmclock_0_5_0_1" = callPackage + ({ mkDerivation, async, base, clock, hspec, stm, time + , unbounded-delays + }: + mkDerivation { + pname = "alarmclock"; + version = "0.5.0.1"; + sha256 = "0l357h9admskcqap4dq5niafpvr1dkf3wvrw166rd2568dp061a6"; + libraryHaskellDepends = [ + async base clock stm time unbounded-delays + ]; + testHaskellDepends = [ + async base clock hspec stm time unbounded-delays + ]; + description = "Wake up and perform an action at a certain time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "alea" = callPackage ({ mkDerivation, base, optparse-applicative, random, text }: mkDerivation { @@ -23199,8 +23173,8 @@ self: { ({ mkDerivation, base, deepseq, template-haskell, text }: mkDerivation { pname = "alex-tools"; - version = "0.3.1"; - sha256 = "11b7lw8kzzkpaqr6rdh5rcdh21mj5xz2qd9m04rsryvqlxa2y87g"; + version = "0.4"; + sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi"; libraryHaskellDepends = [ base deepseq template-haskell text ]; description = "A set of functions for a common use case of Alex"; license = stdenv.lib.licenses.isc; @@ -27415,18 +27389,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "apecs_0_3_0_2" = callPackage + "apecs_0_4_0_0" = callPackage ({ mkDerivation, async, base, containers, criterion, linear, mtl , QuickCheck, template-haskell, vector }: mkDerivation { pname = "apecs"; - version = "0.3.0.2"; - sha256 = "1j9vw55z9igpjmll99x0pxz792m0w0n1r8w1sy96kj0jqk5y2l5i"; + version = "0.4.0.0"; + sha256 = "0wpjs90q9nwknbn6shk7bazc0kdhllhvg13432h2hckqbmrfp836"; libraryHaskellDepends = [ async base containers mtl template-haskell vector ]; - testHaskellDepends = [ base containers QuickCheck vector ]; + testHaskellDepends = [ + base containers criterion linear QuickCheck vector + ]; benchmarkHaskellDepends = [ base criterion linear ]; description = "A fast ECS for game engine programming"; license = stdenv.lib.licenses.bsd3; @@ -29529,23 +29505,6 @@ self: { }: mkDerivation { pname = "astro"; - version = "0.4.2.0"; - sha256 = "1bj7zmgr4i23ig5jwc9w2sc967569325gdjwyrf6xm100hzw5zc6"; - libraryHaskellDepends = [ base matrix time ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 time - ]; - description = "Amateur astronomical computations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "astro_0_4_2_1" = callPackage - ({ mkDerivation, base, HUnit, matrix, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, time - }: - mkDerivation { - pname = "astro"; version = "0.4.2.1"; sha256 = "0agy9a91n1sy6rgdgwvdz354x452j2lg7nr3by7z9r22rwdxwpfs"; libraryHaskellDepends = [ base matrix time ]; @@ -29555,7 +29514,6 @@ self: { ]; description = "Amateur astronomical computations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "astview" = callPackage @@ -32297,22 +32255,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "backprop_0_2_4_0" = callPackage + "backprop_0_2_5_0" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, directory - , hmatrix, lens, microlens, mwc-random, primitive, reflection - , simple-reflect, time, transformers, type-combinators, vector + , hmatrix, microlens, microlens-th, mwc-random, primitive + , reflection, simple-reflect, time, transformers, vector, vinyl }: mkDerivation { pname = "backprop"; - version = "0.2.4.0"; - sha256 = "0l53ixz171nv92wgmrj7zcv458svg3b3zrxn3a8rx5aphb3m9vwc"; + version = "0.2.5.0"; + sha256 = "1xbbmv6cp9n21x2bqpr0p4cls994mchxp7hd7k6ib83avr0vwbda"; libraryHaskellDepends = [ base containers deepseq microlens primitive reflection - simple-reflect transformers type-combinators vector + simple-reflect transformers vector vinyl ]; benchmarkHaskellDepends = [ - base criterion deepseq directory hmatrix lens mwc-random time - vector + base criterion deepseq directory hmatrix microlens microlens-th + mwc-random time vector ]; description = "Heterogeneous automatic differentation"; license = stdenv.lib.licenses.bsd3; @@ -32634,8 +32592,8 @@ self: { }: mkDerivation { pname = "barbies"; - version = "0.1.0.1"; - sha256 = "1mflfgwcz5krncfx5gx60n1j5x624y55kskmrp3nns4ihlrk6m7a"; + version = "0.1.2.0"; + sha256 = "1n8m6qi30fz5xx67v0l7dsirrpd8h0smb7qd8d1q3w83yi606kvl"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "Classes for working with types that can change clothes"; @@ -33137,33 +33095,31 @@ self: { }) {}; "baserock-schema" = callPackage - ({ mkDerivation, algebraic-graphs, base, bytestring, docopt, errors - , flippers, gitlab-api, hspec, microlens-platform, mtl, QuickCheck - , rio, yaml, yaml-pretty-extras + ({ mkDerivation, aeson, base, etc, gitlab-api, hashable, hspec + , lens-aeson, microlens-platform, QuickCheck, rio + , yaml-pretty-extras }: mkDerivation { pname = "baserock-schema"; - version = "0.0.2.0"; - sha256 = "02lz48177jrnn7fwk7kjlh38a6kv7f197skf69mx0xgs88xjwrn9"; + version = "0.0.3.4"; + sha256 = "19r072s5032wcs4j647naixmk3j7h4ppniar78f6hxlkcz1hsc10"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - algebraic-graphs base errors flippers microlens-platform mtl rio - yaml yaml-pretty-extras + aeson base microlens-platform rio yaml-pretty-extras ]; executableHaskellDepends = [ - algebraic-graphs base docopt errors flippers gitlab-api - microlens-platform mtl rio yaml yaml-pretty-extras + aeson base etc gitlab-api hashable lens-aeson microlens-platform + rio yaml-pretty-extras ]; testHaskellDepends = [ - algebraic-graphs base bytestring errors flippers hspec - microlens-platform mtl QuickCheck rio yaml yaml-pretty-extras + aeson base hspec microlens-platform QuickCheck rio + yaml-pretty-extras ]; description = "Baserock Definitions Schema"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {gitlab-api = null;}; + }) {}; "basex-client" = callPackage ({ mkDerivation, base, network, pureMD5, utf8-string }: @@ -37327,27 +37283,6 @@ self: { }: mkDerivation { pname = "blaze-html"; - version = "0.9.0.1"; - sha256 = "0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf"; - libraryHaskellDepends = [ - base blaze-builder blaze-markup bytestring text - ]; - testHaskellDepends = [ - base blaze-builder blaze-markup bytestring containers HUnit - QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - description = "A blazingly fast HTML combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-html_0_9_1_1" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring - , containers, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-html"; version = "0.9.1.1"; sha256 = "06xv8fqhclfjj61z74cgggn4lmx1s7diakxg84mnkgfvk11983pa"; libraryHaskellDepends = [ @@ -37360,7 +37295,6 @@ self: { ]; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-html-contrib" = callPackage @@ -38321,6 +38255,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "boolector" = callPackage + ({ mkDerivation, base, boolector, c2hs, containers, mtl }: + mkDerivation { + pname = "boolector"; + version = "0.0.0.1"; + sha256 = "00ngv3asmn58bli7hb3033yn98zj0680m2skid2021p3kv4km3c4"; + libraryHaskellDepends = [ base containers mtl ]; + librarySystemDepends = [ boolector ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base ]; + testSystemDepends = [ boolector ]; + description = "Haskell bindings for the Boolector SMT solver"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) boolector;}; + "boolexpr" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -39117,8 +39067,8 @@ self: { pname = "brittany"; version = "0.11.0.0"; sha256 = "1fgcim4q5y7csk8c038rm97w6b8bgynmi6h1dwyr2hsmzw9hxa26"; - revision = "1"; - editedCabalFile = "1v5k1gsy9d1xrw1qw1mdhm00ryalnd3dp531sc44lx8brgxypywf"; + revision = "2"; + editedCabalFile = "1f20w6zzbygnpa7f6xbaqxx34l62r53ikywg2snn0zkfizf3lcgx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39479,8 +39429,8 @@ self: { }: mkDerivation { pname = "buffer-builder"; - version = "0.2.4.5"; - sha256 = "08g47zaqrh40lvkwijpx3x8xflpnjvrijd9bsfv0m94139xrncmc"; + version = "0.2.4.6"; + sha256 = "0r2xn5rc9kg99zcx5x8p15mm6isk0vdr4szc0vyywbj1k96kwf2l"; libraryHaskellDepends = [ base bytestring mtl text unordered-containers vector ]; @@ -39933,8 +39883,8 @@ self: { }: mkDerivation { pname = "butter"; - version = "0.1.0.2"; - sha256 = "13by76xgxkjqfdgsfdsc20r8nfcjwg00wp3yr1jwcjq2acqxm3ak"; + version = "0.1.0.6"; + sha256 = "0r215qycck6w6286w0y69ghpzmcp1bl23j44arabrh2p39lb4h46"; libraryHaskellDepends = [ aeson base bytestring containers forkable-monad free HUnit network-simple stm template-haskell text transformers @@ -45878,8 +45828,8 @@ self: { ({ mkDerivation, base, criterion, QuickCheck, random }: mkDerivation { pname = "cl3"; - version = "1.0.0.0"; - sha256 = "1a15nbx0q260bs5bh10vckvlbzfgjs5f676r3drki77hggkidvjh"; + version = "1.0.0.1"; + sha256 = "0wgmzygjwyb6djlmxj9k7ffwp60jf3lai8jki525r4as5rggyypi"; libraryHaskellDepends = [ base random ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -46916,8 +46866,8 @@ self: { }: mkDerivation { pname = "clifm"; - version = "0.5.0.0"; - sha256 = "1j3a3d17y3cxzq5c01j2vylgdc4380vg2bs2s44k9yxjpry1dv28"; + version = "0.5.2.1"; + sha256 = "0prbasvk804mzdwjzprj7v1s1wjzlqjih0pdzi1vdskfqjcyy9n2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -49685,14 +49635,13 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "composition-prelude_1_5_0_0" = callPackage - ({ mkDerivation, base, cpphs }: + "composition-prelude_1_5_0_5" = callPackage + ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "1.5.0.0"; - sha256 = "01rbbqnwmm615af1yrg4afk4dvv24y2k52m6c1rz9xkyyg8ii0hq"; + version = "1.5.0.5"; + sha256 = "0nap1qfvp7zjw2z0fz1z700wx27wlgihavp2x4h5jz9jc80ssmra"; libraryHaskellDepends = [ base ]; - libraryToolDepends = [ cpphs ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -50473,6 +50422,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit_1_3_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, gauge, hspec, kan-extensions + , mono-traversable, mtl, mwc-random, primitive, QuickCheck + , resourcet, safe, silently, split, text, transformers, unix + , unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "conduit"; + version = "1.3.0.3"; + sha256 = "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v"; + libraryHaskellDepends = [ + base bytestring directory exceptions filepath mono-traversable mtl + primitive resourcet text transformers unix unliftio-core vector + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath hspec + mono-traversable mtl QuickCheck resourcet safe silently split text + transformers unliftio vector + ]; + benchmarkHaskellDepends = [ + base containers deepseq gauge hspec kan-extensions mwc-random + transformers vector + ]; + description = "Streaming data processing library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, containers, criterion @@ -51670,15 +51648,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "containers_0_5_11_0" = callPackage + "containers_0_6_0_1" = callPackage ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq , ghc-prim, HUnit, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2, transformers }: mkDerivation { pname = "containers"; - version = "0.5.11.0"; - sha256 = "0j29w09kvcn1c0yi4clmrdbgs2gqmpxs2m7q80ib2ix1smm25kaq"; + version = "0.6.0.1"; + sha256 = "0smc1g58l968jxcjxhxcd4qpfm4zk7zr6r4q6wf6ay75av9rf4d7"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck @@ -51737,10 +51715,8 @@ self: { ({ mkDerivation, containers }: mkDerivation { pname = "containers-verified"; - version = "0.5.11.0"; - sha256 = "01qcsxrrg2zjqnd1r4i2m8a1wb9nyyss32rckfs7wni42ladzj07"; - revision = "3"; - editedCabalFile = "092g7yj27pxpap1qh4spp2yvb1y22jaca9s4x36rnkafvqn0yyl3"; + version = "0.6.0.1"; + sha256 = "08cwfn71ffvjfp252l3whic90rqyq1jvrk0m9xp54kh3g2rdqma9"; libraryHaskellDepends = [ containers ]; description = "Formally verified drop-in replacement of containers"; license = stdenv.lib.licenses.mit; @@ -59928,14 +59904,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_9_1_0" = callPackage + "dejafu_1_10_1_0" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "1.9.1.0"; - sha256 = "1bkyy3dsd24gwzng87w85j42wkmycjkqg78nvcragdhvjh1bsv3v"; + version = "1.10.1.0"; + sha256 = "17ib90sy40ynlpjagq7f2r2kw040qjgrhwnbncyicaravips3vva"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -60331,8 +60307,8 @@ self: { }: mkDerivation { pname = "derive"; - version = "2.6.3"; - sha256 = "06m3m1jsvms1nvgm6b83p28ma61h8ldagl7a3fsjp8hswpr0hgpj"; + version = "2.6.4"; + sha256 = "08vhs17h6lzgdr2b0iyl8scilfivvir5fav1qxxpqmdm7f8f8dis"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60480,8 +60456,8 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.4.2"; - sha256 = "0vwpir5sd0x0r5ml83qg9hrwyq1s2psalpl8m007mh3hr8d4wgvz"; + version = "0.4.3"; + sha256 = "1c3m6x05q5d0vzkjp2x3m8nlfl9qq6qglncsz69cmd637nhjxp10"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -60725,6 +60701,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dfinity-radix-tree" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bloomfilter + , BoundedChan, bytestring, cmdargs, conduit, containers + , cryptohash-sha256, data-default-class, deepseq, ghc-prim + , lens-simple, leveldb-haskell, lrucaching, resourcet, semigroups + , serialise, text, unordered-containers + }: + mkDerivation { + pname = "dfinity-radix-tree"; + version = "0.0.0"; + sha256 = "1ksxg3qf7g5hnsrcl3bfcdq81v05xk787g4ry4qj3vlkwss5pcnc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base16-bytestring bloomfilter BoundedChan bytestring conduit + containers cryptohash-sha256 data-default-class deepseq ghc-prim + lens-simple leveldb-haskell lrucaching resourcet semigroups + serialise + ]; + executableHaskellDepends = [ + aeson base base16-bytestring bytestring cmdargs cryptohash-sha256 + data-default-class resourcet text unordered-containers + ]; + description = "A Merkleized key–value data store"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "dfrac" = callPackage ({ mkDerivation, base, scientific }: mkDerivation { @@ -61317,10 +61320,8 @@ self: { }: mkDerivation { pname = "diagrams-core"; - version = "1.4.1"; - sha256 = "0zirk4v8qbyv0zbalh28ms9njafnj4z579dvrjvxbg6gqqcx3mcl"; - revision = "2"; - editedCabalFile = "1q5h4gsin9p6cx0nypjyp6a1rmpr76n4dvw8hscack4gp9a8pjvl"; + version = "1.4.1.1"; + sha256 = "10mnicfyvawy3jlpgf656fx2y4836x04p3z1lpgyyr1nkvwyk0m1"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -61624,8 +61625,8 @@ self: { pname = "diagrams-solve"; version = "0.1.1"; sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4"; - revision = "1"; - editedCabalFile = "1aabxq020ycmwynm96dvqh9xbvcsw7s4593kca35i4zl2kzg14bb"; + revision = "2"; + editedCabalFile = "1zgpx0jmgfr3mg77w3nz08cmgzlwfav2c6bcn68f53z829a6y5lf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq tasty tasty-hunit tasty-quickcheck @@ -61983,6 +61984,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "diffmap" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "diffmap"; + version = "0.1.0.0"; + sha256 = "0i6dyvp8ds1wz9jm7nva076pc18mz24fiz50gqgq3xv76aghl0i0"; + libraryHaskellDepends = [ base containers ]; + description = "diff on maps"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "difftodo" = callPackage ({ mkDerivation, base, bytestring, diff-parse, highlighter2 , optparse-applicative, pretty-show, process, protolude, tasty @@ -63101,30 +63113,6 @@ self: { }: mkDerivation { pname = "distributed-process"; - version = "0.7.3"; - sha256 = "1m771siv3dvrc1i3pxl3iqrnz63wvq6i80wyvi5m64m16xgiisg5"; - revision = "1"; - editedCabalFile = "0vrk3lrrsc7rrzrkfqcc5q36clr8cy51v6dv4hpmi89fyngx6lz5"; - libraryHaskellDepends = [ - base binary bytestring containers data-accessor deepseq - distributed-static exceptions hashable mtl network-transport random - rank1dynamic stm syb template-haskell time transformers - ]; - benchmarkHaskellDepends = [ - base binary bytestring network-transport-tcp - ]; - description = "Cloud Haskell: Erlang-style concurrency in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "distributed-process_0_7_4" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , data-accessor, deepseq, distributed-static, exceptions, hashable - , mtl, network-transport, network-transport-tcp, random - , rank1dynamic, stm, syb, template-haskell, time, transformers - }: - mkDerivation { - pname = "distributed-process"; version = "0.7.4"; sha256 = "01ck0vhy8rrilyph6ijpxdmh9jijfbx2ri7k2hmacbblwj4bzafq"; libraryHaskellDepends = [ @@ -63137,7 +63125,6 @@ self: { ]; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-async" = callPackage @@ -64194,14 +64181,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "docker-build-cacher_1_9_4" = callPackage + "docker-build-cacher_2_0_0" = callPackage ({ mkDerivation, base, containers, foldl, language-docker , system-filepath, text, turtle }: mkDerivation { pname = "docker-build-cacher"; - version = "1.9.4"; - sha256 = "1p62q8hq19zgjwaqgclkjqh6ylpbr5jxw82f36xzqximws1jsmkp"; + version = "2.0.0"; + sha256 = "1y5w6l75fvszx33f254a6sncvb3wab0iq7dci3qbj7s2147vl63n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -66274,8 +66261,8 @@ self: { }: mkDerivation { pname = "eap"; - version = "0.9.0.1"; - sha256 = "0z7ab3i16424gpxwjhc4x7c55yhvzx5qjm80f2klpf94zz4w37ab"; + version = "0.9.0.2"; + sha256 = "0bgx7sxpmvhd84j7kkqznazw7p1fl862w7jxlap473g2q5365kqc"; libraryHaskellDepends = [ base binary bytestring cryptonite memory mtl pretty-hex ]; @@ -67556,14 +67543,14 @@ self: { }) {}; "elf" = callPackage - ({ mkDerivation, base, binary, bytestring }: + ({ mkDerivation, base, binary, bytestring, containers, hspec }: mkDerivation { pname = "elf"; - version = "0.28"; - sha256 = "0mzikwgd3dnzjgj1xa69lgrs38pnvwffvblckrqnwf0h7fd149wy"; - enableSeparateDataOutput = true; + version = "0.29"; + sha256 = "1b4g98fk1p8mk0zdh6fwzm3vnzcrhvpysx4g4ahcbgbr4bqhjra2"; libraryHaskellDepends = [ base binary bytestring ]; - description = "Parser for ELF object format"; + testHaskellDepends = [ base bytestring containers hspec ]; + description = "An Elf parser"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -68168,8 +68155,8 @@ self: { }: mkDerivation { pname = "emailparse"; - version = "0.2.0.9"; - sha256 = "13fg4sly6a3v8xy9prrn9nh3ly14y8k2jghr9b7dmyi7pvmlpss7"; + version = "0.2.0.10"; + sha256 = "0w6jkimaiy1ld6aydmq5jz4g248awkj4wnpq6knpn0wfxjsqz0r8"; libraryHaskellDepends = [ attoparsec base bytestring either either-unwrap mime MissingH strptime text text-icu time word8 @@ -71350,8 +71337,8 @@ self: { }: mkDerivation { pname = "expressions"; - version = "0.1.7"; - sha256 = "0pg5hxnxj0zm4s4miw9xjqw2yipd29lqj00svhrsf1pqkb5n98x0"; + version = "0.1.8"; + sha256 = "18ys1937sf8lw07mavg4r7f5l6j9sygmx7szp5lxvs12l95x0jfb"; libraryHaskellDepends = [ attoparsec base containers free lattices singletons text transformers @@ -71368,8 +71355,8 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.1.5"; - sha256 = "07ah8bb7pv1jzj4aa783s8axh909hnysfy21x9slwgc8nwlx6rcr"; + version = "0.1.6"; + sha256 = "0la7acpr9vd67crgj87920wlckyhzvilz9jv86ms1hiwwmvl1c7a"; libraryHaskellDepends = [ base containers expressions list-t singletons transformers z3 ]; @@ -71759,6 +71746,17 @@ self: { license = "GPL"; }) {}; + "facts" = callPackage + ({ mkDerivation, base, exceptions, mtl, template-haskell }: + mkDerivation { + pname = "facts"; + version = "0.0.1.0"; + sha256 = "12ifja6vgm8hafs23fzb2jfk0jiz4nss1if5b86950y3mc995rfx"; + libraryHaskellDepends = [ base exceptions mtl template-haskell ]; + description = "Refined types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "factual-api" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , curl, dataenc, hoauth, HTTP, MissingH, text, unordered-containers @@ -72289,6 +72287,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fastly" = callPackage + ({ mkDerivation, aeson, base, bytestring, bytestring-lexing, hspec + , http-client, http-client-tls, http-types, iproute, mtl + , old-locale, text, thyme, unordered-containers, wai + }: + mkDerivation { + pname = "fastly"; + version = "0.1.0.0"; + sha256 = "0b23dh7cfbjmynqbzc44kz5809dg3zx8i32sdglb1b0nxhabnp7b"; + libraryHaskellDepends = [ + aeson base bytestring bytestring-lexing http-client http-client-tls + http-types iproute mtl old-locale text thyme unordered-containers + wai + ]; + testHaskellDepends = [ base hspec text ]; + description = "A highly experimental Fastly API client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fastparser" = callPackage ({ mkDerivation, base, bytestring, bytestring-lexing, containers , criterion, kan-extensions, microlens, thyme, transformers @@ -74140,6 +74157,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "firebase-database" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , generic-random, HsOpenSSL, hspec, http-client, http-client-tls + , http-streams, http-types, io-streams, lens, mtl, nano-http + , QuickCheck, split, string-conversions, text, unordered-containers + }: + mkDerivation { + pname = "firebase-database"; + version = "0.0.1"; + sha256 = "1pwf4jb2kajs21dlq7qz90s3xzv05h1mblra1yszq3gkvz8afalh"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring generic-random HsOpenSSL + http-client http-client-tls http-streams http-types io-streams lens + mtl nano-http split string-conversions text unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring generic-random HsOpenSSL hspec + http-client http-client-tls http-streams http-types io-streams lens + mtl nano-http QuickCheck split string-conversions text + unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Google Firebase Database SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {nano-http = null;}; + "firefly" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring , case-insensitive, containers, cookie, http-types, mtl, regex-pcre @@ -74823,21 +74868,22 @@ self: { }) {}; "flat" = callPackage - ({ mkDerivation, array, base, bytestring, containers, cpu, deepseq - , derive, dlist, ghc-prim, mono-traversable, pretty, primitive - , tasty, tasty-hunit, tasty-quickcheck, text, transformers, vector + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, doctest, filemanip, ghc-prim, mono-traversable, pretty + , primitive, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck, text, vector }: mkDerivation { pname = "flat"; - version = "0.3"; - sha256 = "10kn80qydxmfkbgx0j35f478i781lhn52c76ijsww5iccm889ykw"; + version = "0.3.2"; + sha256 = "0489w132m6j47m0jf1svwvql3fmw58iz9l2rqnhn4c5gg91wj53q"; libraryHaskellDepends = [ - array base bytestring containers cpu deepseq dlist ghc-prim - mono-traversable pretty primitive text transformers vector + array base bytestring containers deepseq dlist ghc-prim + mono-traversable pretty primitive text vector ]; testHaskellDepends = [ - base bytestring containers cpu deepseq derive ghc-prim pretty tasty - tasty-hunit tasty-quickcheck text + base bytestring containers deepseq doctest filemanip ghc-prim + quickcheck-instances tasty tasty-hunit tasty-quickcheck text ]; description = "Principled and efficient bit-oriented binary serialization"; license = stdenv.lib.licenses.bsd3; @@ -76176,8 +76222,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "forkable-monad"; - version = "0.2.0.2"; - sha256 = "19a4wagdj2d66w7ka9s480rq3d0i3n5q0zyi2v9sckb6lj3lx175"; + version = "0.2.0.3"; + sha256 = "0qnl3bvqiwh6d7lm3w06is5ivh025c7024695m7fzajvzbpk67jp"; libraryHaskellDepends = [ base transformers ]; description = "An implementation of forkIO for monad stacks"; license = stdenv.lib.licenses.bsd3; @@ -78326,8 +78372,8 @@ self: { }: mkDerivation { pname = "funflow"; - version = "1.0.0"; - sha256 = "1lcww83dzhbmml5l4yrypbw18l8x1m3pzblcnmgd90a9874gmq0f"; + version = "1.0.1"; + sha256 = "114fi0z54cl93ympb1vir1fc55q8ijbg09ax4v8k05nmb916p2s0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79084,6 +79130,20 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "gdp" = callPackage + ({ mkDerivation, base, lawful }: + mkDerivation { + pname = "gdp"; + version = "0.0.0.2"; + sha256 = "1gqs19wjyng0nacwvi7sjxnhnxjy2az0jwjyy6w2r5g4w9dgykr1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base lawful ]; + executableHaskellDepends = [ base ]; + description = "Reason about invariants and preconditions with ghosts of departed proofs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gearbox" = callPackage ({ mkDerivation, base, GLUT, OpenGLRaw, Vec }: mkDerivation { @@ -80879,8 +80939,8 @@ self: { }: mkDerivation { pname = "geodetics"; - version = "0.0.5"; - sha256 = "1fpfdn4bhdqjnrhiqd8yg5j4vs3rwlsr6nav3cjrvrhynlmqlcaq"; + version = "0.0.6"; + sha256 = "0hp5p6m6szj1h5hzmrs3pyj4cfvcvkgdc95s5xa0lcxc3z8bn7g2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base dimensional ]; testHaskellDepends = [ @@ -84404,6 +84464,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gitlab-api" = callPackage + ({ mkDerivation, aeson, base, hspec, http-conduit, http-types + , microlens-platform, rio, yaml + }: + mkDerivation { + pname = "gitlab-api"; + version = "0.0.0.2"; + sha256 = "1lfwsqhncj3sp7h6ixmm0yv9vnby9qfi2y4q980d9d473mzvy7rv"; + libraryHaskellDepends = [ + aeson base http-conduit http-types microlens-platform rio yaml + ]; + testHaskellDepends = [ base hspec rio ]; + description = "Gitlab Web API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath @@ -84743,6 +84819,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glabrous_0_3_6" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , cereal, cereal-text, directory, either, hspec, text + , unordered-containers + }: + mkDerivation { + pname = "glabrous"; + version = "0.3.6"; + sha256 = "1ba1smngfq6xqwcbfg10sy2qjxh7miyd8qbfmmv14klzwimk44ri"; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring cereal cereal-text + either text unordered-containers + ]; + testHaskellDepends = [ + base directory either hspec text unordered-containers + ]; + description = "A template DSL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "glade" = callPackage ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools , libglade @@ -88937,15 +89034,15 @@ self: { "greskell" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover , greskell-core, hint, hspec, semigroups, text, transformers - , unordered-containers + , unordered-containers, vector }: mkDerivation { pname = "greskell"; - version = "0.1.1.0"; - sha256 = "1mf1fgp1i3pxayhgkc4jmx3fjx3s16vcn9n2jbg750d6nif6yyxi"; + version = "0.2.0.0"; + sha256 = "0zj7gcj4a4msgnzafhy7wh5npwfc5rnn4lnmr5h33q7impws1fgz"; libraryHaskellDepends = [ aeson base greskell-core semigroups text transformers - unordered-containers + unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring doctest doctest-discover greskell-core hint @@ -88957,23 +89054,48 @@ self: { }) {}; "greskell-core" = callPackage - ({ mkDerivation, aeson, base, doctest, doctest-discover, hspec - , QuickCheck, scientific, semigroups, text, unordered-containers + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , doctest-discover, hashable, hspec, QuickCheck, scientific + , semigroups, text, unordered-containers, uuid, vector }: mkDerivation { pname = "greskell-core"; - version = "0.1.1.0"; - sha256 = "0in0ilj337zm00qg0qxcmiai8xvlni5vz4sz0h0dmc3pmg57zmh0"; + version = "0.1.2.0"; + sha256 = "1246z4zz5jzwbjikkrld3j667kp26v1b135xd62r3akcplxagzd9"; libraryHaskellDepends = [ - aeson base scientific semigroups text unordered-containers + aeson base containers hashable scientific semigroups text + unordered-containers uuid vector ]; testHaskellDepends = [ - aeson base doctest doctest-discover hspec QuickCheck text + aeson base bytestring doctest doctest-discover hspec QuickCheck + text unordered-containers vector ]; description = "Haskell binding for Gremlin graph query language - core data types and tools"; license = stdenv.lib.licenses.bsd3; }) {}; + "greskell-websocket" = callPackage + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring + , greskell-core, hashtables, hspec, safe-exceptions, stm, text + , unordered-containers, uuid, vector, websockets + }: + mkDerivation { + pname = "greskell-websocket"; + version = "0.1.0.0"; + sha256 = "171pr07dlsvkmj0jqr60dc6a4g8sfqaz0hvwwfagzklg31m961mq"; + libraryHaskellDepends = [ + aeson async base base64-bytestring bytestring greskell-core + hashtables safe-exceptions stm text unordered-containers uuid + vector websockets + ]; + testHaskellDepends = [ + aeson base bytestring greskell-core hspec unordered-containers uuid + vector + ]; + description = "Haskell client for Gremlin Server using WebSocket serializer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "grid" = callPackage ({ mkDerivation, base, cereal, containers, QuickCheck , test-framework, test-framework-quickcheck2 @@ -89731,8 +89853,8 @@ self: { }: mkDerivation { pname = "gtk-sni-tray"; - version = "0.1.3.1"; - sha256 = "1wsq7d47px11c64k38nqxms408yd4il35ai8r53p76qnd04s8saw"; + version = "0.1.3.2"; + sha256 = "0rqv0a6d1si4l0rl8c0w2i5hz4g4saafbvm93mhw35dixdvaqdsw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92042,8 +92164,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.7.2"; - sha256 = "15z8xyx9dd3wb2fdrbhh5kmd32njr586h76x0rdp4kddij7a5x56"; + version = "1.7.5"; + sha256 = "0a0m67flsnnbh9ch6pb135avvriy0scpfx39f38d9zwr8lrrs5p3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93458,32 +93580,6 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.5.6"; - sha256 = "0viv359hv3wzdhnfzmq4ynbxyr3a347q7ixarwff85nn9zx7kw2c"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base filepath formatting gitrev mtl path process time transformers - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process temporary - ]; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hapistrano_0_3_5_7" = callPackage - ({ mkDerivation, aeson, async, base, directory, filepath - , formatting, gitrev, hspec, mtl, optparse-applicative, path - , path-io, process, stm, temporary, time, transformers, yaml - }: - mkDerivation { - pname = "hapistrano"; version = "0.3.5.7"; sha256 = "0fis5g2fg0x5pw7r0p7qy090v90gzqza5qjnpzinnq1yipmr872p"; isLibrary = true; @@ -93501,7 +93597,6 @@ self: { ]; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -94587,8 +94682,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.10"; - sha256 = "1h1cz15x531y0h7ss79jbhziypjwwjl70w5hrpcljdfy1kkcgd2m"; + version = "0.0.0.11"; + sha256 = "1x0dm5x4jr1k619s7ad78bb717c8572s8pakailf8g2wsyc340gr"; libraryHaskellDepends = [ base containers free hasbolt lens mtl neat-interpolation template-haskell text th-lift-instances @@ -96388,6 +96483,8 @@ self: { pname = "haskell-src-exts"; version = "1.19.1"; sha256 = "0wd93cqzdk1wq8csha8c8sphksi2jb3gr9g8rk3m9mkkfs3b5xgh"; + revision = "1"; + editedCabalFile = "120jvvksnzj3dfgxx1774asalw4wn2i507n3lyhfp95k9z1ny5rh"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ @@ -96527,6 +96624,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-meta_0_8_0_3" = callPackage + ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb + , template-haskell, test-framework, test-framework-hunit + , th-orphans + }: + mkDerivation { + pname = "haskell-src-meta"; + version = "0.8.0.3"; + sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4"; + libraryHaskellDepends = [ + base haskell-src-exts pretty syb template-haskell th-orphans + ]; + testHaskellDepends = [ + base haskell-src-exts HUnit pretty template-haskell test-framework + test-framework-hunit + ]; + description = "Parse source to template-haskell abstract syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-meta-mwotton" = callPackage ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts , pretty, syb, template-haskell @@ -98382,25 +98500,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hasql_1_3_0_1" = callPackage + "hasql_1_3_0_2" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , criterion, data-default-class, dlist, hashable, hashtables , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase - , semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , text-builder, transformers, vector + , tasty, tasty-hunit, tasty-quickcheck, text, text-builder + , transformers, vector }: mkDerivation { pname = "hasql"; - version = "1.3.0.1"; - sha256 = "07v79w80k0xrvr4whlcx205a9fpdvlbqdzhq911r7sh3df10kg8f"; + version = "1.3.0.2"; + sha256 = "12xq08y54r6fia9nk4cp9gqflmml7b0zd8xhgnx3ylycl8r52h8m"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring bytestring-strict-builder contravariant contravariant-extras data-default-class dlist hashable hashtables loch-th mtl placeholders postgresql-binary - postgresql-libpq profunctors semigroups text text-builder - transformers vector + postgresql-libpq profunctors text text-builder transformers vector ]; testHaskellDepends = [ bug data-default-class QuickCheck quickcheck-instances rebase @@ -104507,8 +104624,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.5"; - sha256 = "00kib9b80s0bhdv267dgybl68knmzzmq7n0maygzc0kxc9k1bwj1"; + version = "2.1.6"; + sha256 = "1sxdbb9zqhydx304v2as4y3r1yaqbgy9vcbygsaz3dy6rkifn23v"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -104603,8 +104720,8 @@ self: { }: mkDerivation { pname = "hlrdb-core"; - version = "0.1.1.1"; - sha256 = "1c74v3fq1cw6fq33rmmmm6hb595a8f6iyv934w8kww74g79qli7d"; + version = "0.1.2.0"; + sha256 = "1j3ds4kkr1ns7y46b3s29bhi63n31ggvcq4mlyp2xafw2z4nbyl3"; libraryHaskellDepends = [ base bytestring hashable hedis lens mtl profunctors random time unordered-containers @@ -104753,7 +104870,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hmatrix-backprop_0_1_2_2" = callPackage + "hmatrix-backprop_0_1_2_3" = callPackage ({ mkDerivation, backprop, base, finite-typelits , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog , hmatrix, hmatrix-vector-sized, microlens, microlens-platform @@ -104761,8 +104878,8 @@ self: { }: mkDerivation { pname = "hmatrix-backprop"; - version = "0.1.2.2"; - sha256 = "130lby9nx21mcn85qy86xgmzjm9qyb98b0fhgafkyr2fgfnnqphj"; + version = "0.1.2.3"; + sha256 = "1x833a48czc2hphswxgwf1ihkgxz13w3bz2d2zs9dqq8xkzdf4mx"; libraryHaskellDepends = [ backprop base ghc-typelits-knownnat ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens vector vector-sized @@ -104878,27 +104995,6 @@ self: { }: mkDerivation { pname = "hmatrix-morpheus"; - version = "0.1.1.1"; - sha256 = "1y7ckwgv20j72ji0n30jj0iiibx9i3k053jh2cp17q1lnks836vj"; - libraryHaskellDepends = [ base hmatrix ]; - librarySystemDepends = [ blas liblapack ]; - testHaskellDepends = [ - base hmatrix HUnit MonadRandom test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ base criterion hmatrix ]; - description = "Low-level machine learning auxiliary functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; - - "hmatrix-morpheus_0_1_1_2" = callPackage - ({ mkDerivation, base, blas, criterion, hmatrix, HUnit, liblapack - , MonadRandom, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "hmatrix-morpheus"; version = "0.1.1.2"; sha256 = "19q52n5j1n5db7b2pv0iabh1xygpybgiszswginab5khc01fxwzj"; libraryHaskellDepends = [ base hmatrix ]; @@ -110111,29 +110207,6 @@ self: { }: mkDerivation { pname = "hslua-aeson"; - version = "0.3.0.1"; - sha256 = "0h4l38bag7kd4d66iprv9hj36q8czqsxr5v6xgmn91wz4cadb42w"; - revision = "1"; - editedCabalFile = "02p97fsn7g6n0l5i9k0mrffqhw2a3y74vi0zaynsl224r4vwqsbp"; - libraryHaskellDepends = [ - aeson base hashable hslua scientific text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base hashable hslua hspec HUnit ieee754 QuickCheck - quickcheck-instances scientific text unordered-containers vector - ]; - description = "Allow aeson data types to be used with lua"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hslua-aeson_0_3_0_2" = callPackage - ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit - , ieee754, QuickCheck, quickcheck-instances, scientific, text - , unordered-containers, vector - }: - mkDerivation { - pname = "hslua-aeson"; version = "0.3.0.2"; sha256 = "0qfqq2xz5jqws1bh7iwznnv50kgqc1v5xxvnrraqkmz7hh4wyam2"; libraryHaskellDepends = [ @@ -110146,7 +110219,6 @@ self: { ]; description = "Allow aeson data types to be used with lua"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslua-module-text" = callPackage @@ -112532,8 +112604,8 @@ self: { }: mkDerivation { pname = "htoml-megaparsec"; - version = "2.0.0.0"; - sha256 = "0szpk1zszpvd0hs4jljjnlrr60159b33rqxhb1bgbbap2nxzxsgs"; + version = "2.0.0.1"; + sha256 = "0ahwlsqh98lv6hpf9lwsf1i99w0vdw1bsgy947s9gadrg8nbx849"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -112723,35 +112795,6 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.12.1"; - sha256 = "0gnnkcy2d2v1k44ip59s7l86jgigllsp3lsqsac08zr19lr1clab"; - revision = "1"; - editedCabalFile = "03x2ms2nl3jjm2sfk8dwy02v920czhmdlkyfy3kqc1sg4nw2134y"; - libraryHaskellDepends = [ - array base blaze-builder bytestring case-insensitive containers - cookie deepseq exceptions filepath ghc-prim http-types memory - mime-types network network-uri random stm streaming-commons text - time transformers - ]; - testHaskellDepends = [ - async base blaze-builder bytestring case-insensitive containers - deepseq directory hspec http-types monad-control network - network-uri streaming-commons text time transformers zlib - ]; - doCheck = false; - description = "An HTTP client engine"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client_0_5_13" = callPackage - ({ mkDerivation, array, async, base, blaze-builder, bytestring - , case-insensitive, containers, cookie, deepseq, directory - , exceptions, filepath, ghc-prim, hspec, http-types, memory - , mime-types, monad-control, network, network-uri, random, stm - , streaming-commons, text, time, transformers, zlib - }: - mkDerivation { - pname = "http-client"; version = "0.5.13"; sha256 = "12q0w3avdkddrp7cgvwkmmfxdi4cz1ajic8jlrgp2plhn8ggnag2"; libraryHaskellDepends = [ @@ -112768,7 +112811,6 @@ self: { doCheck = false; description = "An HTTP client engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -114021,12 +114063,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_1_2_0_4" = callPackage + "hunit-dejafu_1_2_0_5" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.2.0.4"; - sha256 = "017hdbimpi2wpwdyis3gmwrzxszafws6jxwi4jwm44psnqpl9hry"; + version = "1.2.0.5"; + sha256 = "17k7sg2ifvmikzjlzhawc65afq32lva5p79szva6xplghh689xv6"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; @@ -114466,8 +114508,8 @@ self: { }: mkDerivation { pname = "hw-dsv"; - version = "0.2"; - sha256 = "1jkkhkk7rpskxnbiaz7a520nf19f3hl8vxi5gl5k6nvjw6z0zy1q"; + version = "0.2.1"; + sha256 = "1kb8dc05dfslpqnjw42qnnxg16xfd2jz17ag9vgmci88rnsanaxv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118506,7 +118548,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_6_0_3" = callPackage + "influxdb_1_6_0_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck @@ -118516,8 +118558,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.0.3"; - sha256 = "06ywpr2wpc8kx4kjkmpq6lapbpqwq3c0sxla21v58psj033ihzl9"; + version = "1.6.0.4"; + sha256 = "191w8f52r5qgmrsj131sx5kjqzfcrh3z4wbh2kdv9hyfp717hz2r"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -120795,25 +120837,12 @@ self: { ({ mkDerivation, base, hspec, HUnit, time }: mkDerivation { pname = "iso8601-time"; - version = "0.1.4"; - sha256 = "09h1jfdj9fv1nsryhka2mgl8nig9840f5kv06vyyh7l4l1z767bn"; - libraryHaskellDepends = [ base time ]; - testHaskellDepends = [ base hspec HUnit time ]; - description = "Convert to/from the ISO 8601 time format"; - license = stdenv.lib.licenses.mit; - }) {}; - - "iso8601-time_0_1_5" = callPackage - ({ mkDerivation, base, hspec, HUnit, time }: - mkDerivation { - pname = "iso8601-time"; version = "0.1.5"; sha256 = "1j7h1xix7vpb88dnksis14rnvw0p528m3d54fg3h51765d5l9kgj"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec HUnit time ]; description = "Convert to/from the ISO 8601 time format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "isobmff-builder" = callPackage @@ -123128,8 +123157,8 @@ self: { pname = "json-schema"; version = "0.7.4.1"; sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an"; - revision = "15"; - editedCabalFile = "07a5qvmg6bz54k5f608d8lvaay97s6df503rq047sjwa6dipcm0x"; + revision = "16"; + editedCabalFile = "0mn7aj3rr4vpg99kcpvgq1qvdl28dx9yld2b9pb79wdva9x69c2h"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -123735,22 +123764,32 @@ self: { }) {}; "jvm-binary" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, criterion - , directory, filepath, tasty, tasty-discover, tasty-hspec - , tasty-quickcheck, text, vector + ({ mkDerivation, attoparsec, base, binary, bytestring, containers + , criterion, data-binary-ieee754, deepseq, deriving-compat + , directory, filepath, generic-random + , hspec-expectations-pretty-diff, mtl, QuickCheck, tasty + , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell + , text, vector }: mkDerivation { pname = "jvm-binary"; - version = "0.0.2"; - sha256 = "1hdqhp84il50c6wimdvxwdd95gw580hskhmrnn2snqcwj7n1ywfh"; + version = "0.1.0"; + sha256 = "0s64cwr86ipl7gpcgdgx50l7mm5h91njgir4mn2d82fzzq08x881"; libraryHaskellDepends = [ - base binary bytestring containers text vector + attoparsec base binary bytestring containers data-binary-ieee754 + deepseq deriving-compat mtl template-haskell text vector ]; testHaskellDepends = [ - base binary bytestring containers directory filepath tasty - tasty-discover tasty-hspec tasty-quickcheck text + attoparsec base binary bytestring containers data-binary-ieee754 + deepseq deriving-compat directory filepath generic-random + hspec-expectations-pretty-diff mtl QuickCheck tasty tasty-discover + tasty-hspec tasty-quickcheck template-haskell text vector + ]; + benchmarkHaskellDepends = [ + attoparsec base binary bytestring containers criterion + data-binary-ieee754 deepseq deriving-compat mtl template-haskell + text vector ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A library for reading Java class-files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -127066,15 +127105,15 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "language-docker_6_0_1" = callPackage + "language-docker_6_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process , QuickCheck, split, template-haskell, text, th-lift, time }: mkDerivation { pname = "language-docker"; - version = "6.0.1"; - sha256 = "01dfs90300h03mlwn05a7k2gsffyxxkjypyykbnc9ky2cx6vwfax"; + version = "6.0.2"; + sha256 = "0690i0cd1208g72ckqhiw7grs9m4wx1kp4w516c7x0ibrv9ri8ap"; libraryHaskellDepends = [ base bytestring containers free megaparsec mtl prettyprinter split template-haskell text th-lift time @@ -127429,17 +127468,17 @@ self: { }) {}; "language-lua" = callPackage - ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq - , directory, filepath, happy, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, text + ({ mkDerivation, alex, alex-tools, array, base, bytestring + , criterion, deepseq, directory, filepath, happy, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "language-lua"; - version = "0.10.0"; - sha256 = "0qiwzprwj7kfppa0a3h1ir1bxwwfq48wl31hv1c724p5vyv1480c"; - revision = "2"; - editedCabalFile = "08c0ivrp357lpxhxqq78z8wqnhwdd3gycsn6yhmf8xnk8bv6yz7h"; - libraryHaskellDepends = [ array base bytestring deepseq text ]; + version = "0.11.0"; + sha256 = "1b65bfjdx7287d65s2ki05yfps8k0w6jfq4avna4z37cqssa0z59"; + libraryHaskellDepends = [ + alex-tools array base bytestring deepseq text + ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base bytestring deepseq directory filepath QuickCheck tasty @@ -127665,8 +127704,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.17"; - sha256 = "0n71grhaw59z3vqkys499kx06q10fn6l5r4sfim17vyxdy0bz8xq"; + version = "1.3.18"; + sha256 = "1cdzs5m6xwrsnchbj66ij844wd869by0jjih8jwap2rmnx9ckxbi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -127688,8 +127727,8 @@ self: { ]; testHaskellDepends = [ base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl - protolude scientific strict-base-types temporary text transformers - unordered-containers vector + pcre-utils protolude scientific strict-base-types temporary text + transformers unordered-containers vector ]; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; @@ -131190,8 +131229,8 @@ self: { ({ mkDerivation, base, containers, mtl, safe }: mkDerivation { pname = "lines-of-action"; - version = "0.0.0"; - sha256 = "0m047q5x6lqgmw3kfai24jk8x44vib4xmflz7n2xq7b791k1fkrg"; + version = "0.0.1"; + sha256 = "1sikhdahhxqi9i285zphbpnz60vyxjdhvz2qd70hmy7x3ckymb42"; libraryHaskellDepends = [ base containers mtl safe ]; description = "Lines of Action, 2-player strategy board game"; license = stdenv.lib.licenses.mit; @@ -131454,6 +131493,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linux-namespaces_0_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, unix }: + mkDerivation { + pname = "linux-namespaces"; + version = "0.1.3.0"; + sha256 = "1rvkzfmd07sz46k059ly80cjgwx67igfw8zsw8c6ljsp3hsdn4hl"; + libraryHaskellDepends = [ base bytestring unix ]; + description = "Work with linux namespaces: create new or enter existing ones"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linux-perf" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, ghc-events, mtl, pretty, process, unix @@ -136572,6 +136623,24 @@ self: { "markup" = callPackage ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl + , path-extra, resourcet, text, transformers-base, urlpath + }: + mkDerivation { + pname = "markup"; + version = "4.0.4"; + sha256 = "1brk619d2abryvwyw9pj7g4axs1rc6p51cf4yf5q1p6f0zvi2dyb"; + libraryHaskellDepends = [ + attoparsec-uri base blaze-html blaze-markup clay comonad lucid + mmorph monad-control monad-logger mtl path-extra resourcet text + transformers-base urlpath + ]; + description = "Abstraction for HTML-embedded content"; + license = stdenv.lib.licenses.mit; + }) {}; + + "markup_4_2_0" = callPackage + ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup + , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl , path, path-extra, resourcet, text, transformers-base, urlpath }: mkDerivation { @@ -136585,6 +136654,7 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -137484,25 +137554,25 @@ self: { }) {}; "mbug" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, http-client - , http-client-tls, optparse-applicative, process, scalpel-core - , tagsoup, text, th-printf, time, xdg-basedir + ({ mkDerivation, base, bytestring, directory, extra, formatting + , http-client, http-client-tls, optparse-applicative, process + , scalpel-core, tagsoup, text, time, xdg-basedir }: mkDerivation { pname = "mbug"; - version = "1.1"; - sha256 = "1chz9za1zbdw1awm252img4krmya1zq3jb4alrsplf2ijb2c80ls"; + version = "1.2"; + sha256 = "0rzfayssvifwb7p8m00lv8s1m5paa86nc6ndwi6ih34lhi30qcr8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory extra http-client http-client-tls - optparse-applicative process scalpel-core tagsoup text th-printf - time xdg-basedir + base bytestring directory extra formatting http-client + http-client-tls optparse-applicative process scalpel-core tagsoup + text time xdg-basedir ]; executableHaskellDepends = [ - base bytestring directory extra http-client http-client-tls - optparse-applicative process scalpel-core tagsoup text th-printf - time xdg-basedir + base bytestring directory extra formatting http-client + http-client-tls optparse-applicative process scalpel-core tagsoup + text time xdg-basedir ]; description = "download bugs mailboxes"; license = stdenv.lib.licenses.gpl3; @@ -138439,6 +138509,29 @@ self: { license = "GPL"; }) {}; + "menoh" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, filepath + , JuicyPixels, menoh, monad-control, optparse-applicative + , transformers, vector + }: + mkDerivation { + pname = "menoh"; + version = "0.1.1"; + sha256 = "0cbkhafibm65yn4222kfy8j6zkw6q6k3962hwjhbvp2n57avh789"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers monad-control transformers vector + ]; + libraryPkgconfigDepends = [ menoh ]; + executableHaskellDepends = [ + base filepath JuicyPixels optparse-applicative vector + ]; + description = "Haskell binding for Menoh DNN inference library"; + license = stdenv.lib.licenses.mit; + }) {menoh = null;}; + "mercury-api" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, clock, directory , hashable, HUnit, optparse-applicative, text, unordered-containers @@ -139367,10 +139460,8 @@ self: { }: mkDerivation { pname = "midi-util"; - version = "0.2"; - sha256 = "1vnpc4ja72a1p6b44ypx0pirg2wnin9jfnfmcq715f599dyxaapr"; - revision = "2"; - editedCabalFile = "0nl8vrrffm8780pj8kadchq2sdyglvnl91bn1yrflh4pqlm2jzq8"; + version = "0.2.0.1"; + sha256 = "0s37csd1x039q0cb487pd811jz7h0i26chvvbmwffh11bc2icjzc"; libraryHaskellDepends = [ base containers event-list midi non-negative ]; @@ -143996,6 +144087,67 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "multipool" = callPackage + ({ mkDerivation, base, bytestring, hashable, monad-logger, mtl + , persistent, resource-pool, text, unordered-containers + }: + mkDerivation { + pname = "multipool"; + version = "0.1.0.1"; + sha256 = "1mcdsn4ja9w8bnxrz4dglwbzq6bxg5xq2iik8da49n8l8ah2xq78"; + libraryHaskellDepends = [ + base bytestring hashable monad-logger mtl persistent resource-pool + text unordered-containers + ]; + testHaskellDepends = [ + base bytestring hashable monad-logger mtl persistent resource-pool + text unordered-containers + ]; + description = "Generalized system for reading and writing to distributed systems that have primary/replica topologies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "multipool-persistent" = callPackage + ({ mkDerivation, base, mtl, multipool, persistent, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "multipool-persistent"; + version = "0.1.0.1"; + sha256 = "0nw56wpgwvzk8ib3av42zkpj5xviw3m3qlig791rl4074yj60wn2"; + libraryHaskellDepends = [ + base mtl multipool persistent unliftio-core unordered-containers + ]; + testHaskellDepends = [ + base mtl multipool persistent unliftio-core unordered-containers + ]; + description = "Read and write from appropriate persistent sql instances in replicated environments"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "multipool-persistent-postgresql" = callPackage + ({ mkDerivation, base, monad-logger, mtl, multipool + , multipool-persistent, persistent, persistent-postgresql + , postgresql-common-persistent, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "multipool-persistent-postgresql"; + version = "0.1.0.1"; + sha256 = "11y8hr9f5f7ni7nxz1h6bi7jn3pj09ngjrqgliwihx60ind2dk6q"; + libraryHaskellDepends = [ + base monad-logger mtl multipool multipool-persistent persistent + persistent-postgresql postgresql-common-persistent unliftio-core + unordered-containers + ]; + testHaskellDepends = [ + base monad-logger mtl multipool multipool-persistent persistent + persistent-postgresql postgresql-common-persistent unliftio-core + unordered-containers + ]; + description = "Read and write appropriately from both master and replicated postgresql instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multirec" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -146106,6 +146258,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "neat-interpolation_0_3_2_2" = callPackage + ({ mkDerivation, base, base-prelude, HTF, megaparsec + , template-haskell, text + }: + mkDerivation { + pname = "neat-interpolation"; + version = "0.3.2.2"; + sha256 = "0ffcr6q9bmvlmz5j8s0q08pbqzcfz9pkh8gz52arzscflpncbj5n"; + libraryHaskellDepends = [ + base base-prelude megaparsec template-haskell text + ]; + testHaskellDepends = [ base-prelude HTF ]; + description = "A quasiquoter for neat and simple multiline text interpolation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "needle" = callPackage ({ mkDerivation, base, containers, haskell-src-meta, mtl, parsec , parsec-extra, template-haskell, text, vector @@ -146708,8 +146877,32 @@ self: { }: mkDerivation { pname = "nettle"; - version = "0.2.0"; - sha256 = "1plv9r86ljgjvvb8ny8zayrcdrmy7cd8jfvq4vp56b407dqq8092"; + version = "0.2.1"; + sha256 = "0d7phckzar2mzazw15g6ca60izmrdyxjv114ag305lbh6ly76wah"; + libraryHaskellDepends = [ + base byteable bytestring crypto-cipher-types securemem tagged + ]; + libraryPkgconfigDepends = [ nettle ]; + testHaskellDepends = [ + array base bytestring crypto-cipher-tests crypto-cipher-types HUnit + QuickCheck tagged test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + description = "safe nettle binding"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) nettle;}; + + "nettle_0_3_0" = callPackage + ({ mkDerivation, array, base, byteable, bytestring + , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle + , QuickCheck, securemem, tagged, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "nettle"; + version = "0.3.0"; + sha256 = "0pbxpxr9xdw3ha5lm9vnsbsvq0kzzsqv6gfk041ijllf1sc0hgyg"; libraryHaskellDepends = [ base byteable bytestring crypto-cipher-types securemem tagged ]; @@ -148866,6 +149059,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "non-empty-containers" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "non-empty-containers"; + version = "0.1.0.0"; + sha256 = "021rfs019kb3h9zz2ycdg7ia65b1hr2rlxzihcdkqywklvxvykxw"; + libraryHaskellDepends = [ base containers ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "non-empty-sequence" = callPackage ({ mkDerivation, base, containers, semigroups }: mkDerivation { @@ -148953,6 +149156,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nonemptymap" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "nonemptymap"; + version = "0.0.2.0"; + sha256 = "0h08xki7z69xrni2r6l7b5wyg6sfdm0hfq2l35q50yac83srfs0v"; + libraryHaskellDepends = [ base containers ]; + description = "A NonEmptyMap Implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nonfree" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -149713,12 +149927,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "numhask_0_2_2_0" = callPackage + "numhask_0_2_3_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "numhask"; - version = "0.2.2.0"; - sha256 = "0i0acm03qirj6xnpyv87v4vss7bmcnzkv8j7rymvshp92nrxihgd"; + version = "0.2.3.0"; + sha256 = "1d4sc2gwra18zw9f063d28alf69nf0ikzsfxgc10z1zgy5bfyxny"; libraryHaskellDepends = [ base ]; description = "numeric classes"; license = stdenv.lib.licenses.bsd3; @@ -149748,33 +149962,29 @@ self: { "numhask-histogram" = callPackage ({ mkDerivation, base, containers, doctest, foldl, numhask-prelude - , numhask-range, protolude, tasty, tdigest + , numhask-range, tdigest }: mkDerivation { pname = "numhask-histogram"; - version = "0.1.2.1"; - sha256 = "0pjl4xqfi9kr56sr83ais1mx9k3rz739axr9wrj0n1xzdp4q9yr9"; + version = "0.1.3.0"; + sha256 = "1d4b1iv6czhc9747p5df3qlbj34nzlz608qp975cg31i63inz2ix"; libraryHaskellDepends = [ base containers foldl numhask-prelude numhask-range tdigest ]; - testHaskellDepends = [ base doctest protolude tasty ]; + testHaskellDepends = [ base doctest numhask-prelude ]; description = "See readme.md"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numhask-prelude" = callPackage - ({ mkDerivation, base, doctest, numhask, protolude, QuickCheck - , tasty, tasty-quickcheck - }: + ({ mkDerivation, base, doctest, numhask, protolude }: mkDerivation { pname = "numhask-prelude"; - version = "0.0.5.1"; - sha256 = "0bpisfh0ngxbxpb080fpd02bjvl451n0rqdr1c3zxyljv6xnkbvj"; - libraryHaskellDepends = [ - base numhask protolude QuickCheck tasty tasty-quickcheck - ]; - testHaskellDepends = [ base doctest QuickCheck tasty ]; + version = "0.1.0.1"; + sha256 = "0px2ijdzll1912h652dvncvjhapwrg2z1dni87w2afzk477mpwdi"; + libraryHaskellDepends = [ base numhask protolude ]; + testHaskellDepends = [ doctest ]; description = "A numeric prelude"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -149798,24 +150008,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "numhask-range_0_2_2_1" = callPackage + "numhask-range_0_2_3_1" = callPackage ({ mkDerivation, adjunctions, base, distributive, doctest - , numhask-prelude, protolude, QuickCheck, semigroupoids, tasty + , numhask-prelude, numhask-test, protolude, QuickCheck + , semigroupoids, tasty }: mkDerivation { pname = "numhask-range"; - version = "0.2.2.1"; - sha256 = "1bay0jsarz7d2kbgi3zvdl2dip9arv9qdlk41szgvsbgqbadxjxf"; + version = "0.2.3.1"; + sha256 = "1zfw49cgjwbx6v6ljqbl46d1nkiah0p79pjargjsfpfks9ra2qkc"; libraryHaskellDepends = [ adjunctions base distributive numhask-prelude protolude QuickCheck semigroupoids ]; - testHaskellDepends = [ base doctest numhask-prelude tasty ]; + testHaskellDepends = [ + base doctest numhask-prelude numhask-test tasty + ]; description = "Numbers that are range representations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "numhask-test" = callPackage + ({ mkDerivation, base, numhask-prelude, QuickCheck, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "numhask-test"; + version = "0.1.0.0"; + sha256 = "1czcgnqxxm835q9m2iw3xyd8qwjpgdpjs1n9zzpd5sk6rklcjx6y"; + libraryHaskellDepends = [ + base numhask-prelude QuickCheck tasty tasty-quickcheck + ]; + testHaskellDepends = [ base numhask-prelude QuickCheck tasty ]; + description = "Laws and tests for numhask"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nums" = callPackage ({ mkDerivation }: mkDerivation { @@ -150067,6 +150296,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "o-clock_1_0_0" = callPackage + ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob + , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec + , tiempo, time-units, type-spec + }: + mkDerivation { + pname = "o-clock"; + version = "1.0.0"; + sha256 = "18wmy90fn514dmjsyk8n6q4p1nvks6lbi0077s00p6hv247p353j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ghc-prim ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog + tasty-hspec type-spec + ]; + benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ]; + description = "Type-safe time library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "oanda-rest-api" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens @@ -150502,24 +150754,23 @@ self: { }) {}; "odpic-raw" = callPackage - ({ mkDerivation, base, c2hs, conduit, hspec, monad-control - , monad-logger, odpic, QuickCheck, resourcet, text, time - , unliftio-core + ({ mkDerivation, base, bytestring, c2hs, conduit, Decimal, hspec + , odpic, resourcet, time }: mkDerivation { pname = "odpic-raw"; - version = "0.2.1"; - sha256 = "0py56g2d05b11yw7wi5lmaglixzk63kwlpnnwk3v1vy8daky73w6"; + version = "0.3.0"; + sha256 = "0s4n82kddl4xwjaj98xmgisip68l2ib6ca7z4nqfy8lzchvmls6j"; libraryHaskellDepends = [ - base conduit monad-control resourcet text time unliftio-core + base bytestring conduit Decimal resourcet time ]; librarySystemDepends = [ odpic ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base conduit hspec monad-logger QuickCheck resourcet text + base bytestring conduit Decimal hspec resourcet time ]; description = "Oracle Database Bindings"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) odpic;}; @@ -152245,8 +152496,8 @@ self: { }: mkDerivation { pname = "optparse-applicative-simple"; - version = "1.0.2"; - sha256 = "0kn740shja07mpaj9hy5blw1bcgy6ncpfyz3rqy3cglh2fzswsk2"; + version = "1.0.3"; + sha256 = "07v47fa2yc3rxdn1lbgbsq8ggfd7zlknz2ib8wf628g95n0dl7ya"; libraryHaskellDepends = [ attoparsec attoparsec-data base-prelude optparse-applicative text ]; @@ -153608,10 +153859,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.2.0"; - sha256 = "0pydgdpm8fqj4dbv5swbyxkh1bkmqzj3gcas9r04vvzh6mmr22ia"; - revision = "1"; - editedCabalFile = "1x19k4jb8ld8kp4fkcmxj5maw3w3dqv5axh5ay6m6qr5kl77ijgp"; + version = "0.3.2.1"; + sha256 = "0rxinqgfri1zlq1di4dx949migm3j76lvb10hvmpa4rxz0fkq0l6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -154009,8 +154258,8 @@ self: { ({ mkDerivation, base, gitrev, template-haskell }: mkDerivation { pname = "panic"; - version = "0.4.0.0"; - sha256 = "12m18s4d8xvwwf4vhv4p544h03abgkjx7bfwl22gxr1y8f7gb8wl"; + version = "0.4.0.1"; + sha256 = "0hidfg8yzp5vzq8y422c442b45jkr8a9s38s8n78wyi5811fpp0m"; libraryHaskellDepends = [ base gitrev template-haskell ]; description = "A convenient way to panic"; license = stdenv.lib.licenses.isc; @@ -155214,6 +155463,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parsix" = callPackage + ({ mkDerivation, base, bytestring, containers, fingertree, mtl + , parsers, prettyprinter, prettyprinter-ansi-terminal, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "parsix"; + version = "0.1.0.1"; + sha256 = "0qpn5vjgp0392nb6nirp92s2g5jxr4jcpg35j0w1mg5ym5ra4mm1"; + libraryHaskellDepends = [ + base bytestring containers fingertree mtl parsers prettyprinter + prettyprinter-ansi-terminal text transformers + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck text + ]; + description = "Parser combinators with slicing, error recovery, and syntax highlighting"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "partage" = callPackage ({ mkDerivation, base, containers, data-lens-light, data-partition , dawg-ord, HUnit, mmorph, mtl, pipes, PSQueue, random, tasty @@ -158585,27 +158854,6 @@ self: { "pinch" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq - , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text - , unordered-containers, vector - }: - mkDerivation { - pname = "pinch"; - version = "0.3.2.0"; - sha256 = "0r0pxdhzlmfg8h13fi10bvy1wxvsk1ckzzlcxbpg6zrly9n0z4m1"; - libraryHaskellDepends = [ - array base bytestring containers deepseq ghc-prim hashable text - unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers hspec hspec-discover QuickCheck text - unordered-containers vector - ]; - description = "An alternative implementation of Thrift for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pinch_0_3_3_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, semigroups , text, unordered-containers, vector }: @@ -158623,7 +158871,6 @@ self: { ]; description = "An alternative implementation of Thrift for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pinchot" = callPackage @@ -159665,6 +159912,8 @@ self: { pname = "pipes-safe"; version = "2.2.9"; sha256 = "160qba0r8lih186qfrpvnx1m2j632x5b7n1x53mif9aag41n9w8p"; + revision = "1"; + editedCabalFile = "08jxmxfhxfi3v19bvvmfs50c74ci6v36503knsb4qdscx9lr864d"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes primitive transformers transformers-base @@ -161964,6 +162213,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "postgresql-common" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: + mkDerivation { + pname = "postgresql-common"; + version = "0.1.0.1"; + sha256 = "16b90sxn9f9rxrdr2l5gqcs6307djqaqzr31lnb4qa95dz72fl7n"; + libraryHaskellDepends = [ + attoparsec base bytestring postgresql-simple + ]; + testHaskellDepends = [ + attoparsec base bytestring postgresql-simple + ]; + description = "Library for sharing common PostgreSQL types across Haskell PostgreSQL libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "postgresql-common-persistent" = callPackage + ({ mkDerivation, base, bytestring, persistent, postgresql-common + , text + }: + mkDerivation { + pname = "postgresql-common-persistent"; + version = "0.1.0.0"; + sha256 = "1kjmrnigc00362f1b55gw6k67i13rqpjaklz8v9z5jd78ac3xnq6"; + libraryHaskellDepends = [ + base bytestring persistent postgresql-common text + ]; + testHaskellDepends = [ + base bytestring persistent postgresql-common text + ]; + description = "Persistent compatibility for postgresql-common"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postgresql-config" = callPackage ({ mkDerivation, aeson, base, bytestring, monad-control, mtl , postgresql-simple, resource-pool, time @@ -162548,8 +162831,8 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2"; - sha256 = "17w7i1glzn2kvq61f1f9xcfz7z7hmwzjl08xh32hp6nir21ycmq5"; + version = "2.0.1"; + sha256 = "1asn43c0n0f4f694y3q3hkjmf4rhdh4gsax25syyb57bicp0mw8h"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -162573,24 +162856,24 @@ self: { }) {}; "potoki-core" = callPackage - ({ mkDerivation, acquire, attoparsec, base, base-prelude - , bytestring, directory, foldl, hashable, profunctors, ptr - , QuickCheck, quickcheck-instances, random, rerebase, stm, tasty - , tasty-hunit, tasty-quickcheck, text, transformers, unagi-chan + ({ mkDerivation, acquire, attoparsec, base, bytestring, directory + , foldl, hashable, ilist, profunctors, ptr, QuickCheck + , quickcheck-instances, random, rerebase, stm, tasty, tasty-hunit + , tasty-quickcheck, text, transformers, unagi-chan , unordered-containers, vector }: mkDerivation { pname = "potoki-core"; - version = "2"; - sha256 = "13zgqw4csypx5m97xfpbxxxic7rxms0xrz6wz5kk5x2pn6i9mgjl"; + version = "2.1"; + sha256 = "04i94rk7skcvaqyapl88iw1npz84jhd1gr17darjvwxyvdvrm1h0"; libraryHaskellDepends = [ - acquire attoparsec base base-prelude bytestring directory foldl - hashable profunctors ptr stm text transformers unagi-chan + acquire attoparsec base bytestring directory foldl hashable + profunctors ptr stm text transformers unagi-chan unordered-containers vector ]; testHaskellDepends = [ - attoparsec QuickCheck quickcheck-instances random rerebase tasty - tasty-hunit tasty-quickcheck + acquire attoparsec foldl ilist QuickCheck quickcheck-instances + random rerebase tasty tasty-hunit tasty-quickcheck ]; description = "Low-level components of \"potoki\""; license = stdenv.lib.licenses.mit; @@ -162598,21 +162881,34 @@ self: { }) {}; "potoki-hasql" = callPackage - ({ mkDerivation, base, bytestring, hasql, potoki, potoki-core + ({ mkDerivation, acquire, base, bytestring, hasql, potoki-core , profunctors, text, vector }: mkDerivation { pname = "potoki-hasql"; - version = "1.5"; - sha256 = "1pxl1fcw1khp4gbhpranv685ri67995d76nisx7ba7l2vg438mn8"; + version = "1.6"; + sha256 = "1na6nc9cbimhwzwppz48ssffhdx0j223pmkk8wkjkj9xpzpnx2w1"; libraryHaskellDepends = [ - base bytestring hasql potoki potoki-core profunctors text vector + acquire base bytestring hasql potoki-core profunctors text vector ]; description = "Integration of \"potoki\" and \"hasql\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "potoki-zlib" = callPackage + ({ mkDerivation, acquire, base, bytestring, potoki-core, zlib }: + mkDerivation { + pname = "potoki-zlib"; + version = "0.3"; + sha256 = "0baayjaw3x5hfx6xdhiq3j8j012x6nrlql8fc6r51xpk3blwg588"; + libraryHaskellDepends = [ + acquire base bytestring potoki-core zlib + ]; + description = "Streaming ZLib decompression"; + license = stdenv.lib.licenses.mit; + }) {}; + "potrace" = callPackage ({ mkDerivation, base, bindings-potrace, bytestring, containers , data-default, JuicyPixels, vector @@ -163662,30 +163958,6 @@ self: { }: mkDerivation { pname = "prettyprinter"; - version = "1.2.0.1"; - sha256 = "0rh5bb6inq4yvv6r53sc1q3msmpvjcq8fw4sn3vwivrq44c7nf8i"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ - base bytestring doctest pgp-wordlist tasty tasty-hunit - tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - ansi-wl-pprint base containers criterion deepseq mtl QuickCheck - random text transformers - ]; - description = "A modern, easy to use, well-documented, extensible prettyprinter"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "prettyprinter_1_2_1" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers - , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck - , random, tasty, tasty-hunit, tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "prettyprinter"; version = "1.2.1"; sha256 = "1kvza7jp5n833m8rj0bc35bd2p8wx3fq0iqflm9nbh3wm05kwrg7"; isLibrary = true; @@ -163701,7 +163973,6 @@ self: { ]; description = "A modern, easy to use, well-documented, extensible pretty-printer"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prettyprinter-ansi-terminal" = callPackage @@ -166733,6 +167004,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pusher-http-haskell_1_5_1_5" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, hashable, hspec, http-client, http-types, memory + , QuickCheck, scientific, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "1.5.1.5"; + sha256 = "0bidqvyx5ss3zgw2ypbwnii1vqfqp0kwyf31h53pvza7c3xrpq4x"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite hashable + http-client http-types memory text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite hspec + http-client http-types QuickCheck scientific text time transformers + unordered-containers vector + ]; + description = "Haskell client library for the Pusher HTTP API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -167839,23 +168135,11 @@ self: { ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { pname = "quickcheck-combinators"; - version = "0.0.2"; - sha256 = "0r8vf4dgczga2c0lkz4z6a22naxw44yfdj1wvfqncv9x18r7pkbz"; - libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; - description = "Simple type-level combinators for augmenting QuickCheck instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-combinators_0_0_4" = callPackage - ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: - mkDerivation { - pname = "quickcheck-combinators"; version = "0.0.4"; sha256 = "0i5hv58b8vgqbmwb7j8c9xr6qv0v5n2zjh3a9rab8x6hsdlb0mvv"; libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; description = "Simple type-level combinators for augmenting QuickCheck instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-instances" = callPackage @@ -168653,8 +168937,8 @@ self: { }: mkDerivation { pname = "radius"; - version = "0.5.0.1"; - sha256 = "0mrgcrhi99imclc400lp666gimxv4gkg4svjr49p9aip5dx03bjh"; + version = "0.5.0.2"; + sha256 = "08y57j4235ajkf3z05p8lcixgr2x1m6mih5l0bfic4gxfvs818wc"; libraryHaskellDepends = [ base binary bytestring cryptonite iproute memory ]; @@ -172279,6 +172563,8 @@ self: { pname = "regex-tdfa"; version = "1.2.3"; sha256 = "1n80ssz9k73s444b4hda6fhp1vyzg0fc5fvz0309fi9dh6xpxcc9"; + revision = "1"; + editedCabalFile = "05ygcwwi8zjd40r05kavbmlx6nw6gyb2yicaarwd45sxs1zk73rz"; libraryHaskellDepends = [ array base bytestring containers ghc-prim mtl parsec regex-base ]; @@ -172853,27 +173139,54 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query_0_11_3_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, product-isomorphic + , quickcheck-simple, sql-words, template-haskell, text + , th-reify-compat, time, time-locale-compat, transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.11.3.0"; + sha256 = "1g7jvhp5vv17hbddc2p6j39gfg638y2b0jjky9jxrcjkww1ii16p"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + product-isomorphic sql-words template-haskell text th-reify-compat + time time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers product-isomorphic quickcheck-simple transformers + ]; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic - , relational-query, relational-schemas, sql-words, template-haskell - , th-data-compat, transformers + , QuickCheck, quickcheck-simple, relational-query + , relational-schemas, sql-words, template-haskell, th-data-compat + , transformers }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.6.7.0"; - sha256 = "1g10z6076lrlal3ismvz4q4pxpawy749zwxpyvvfdhld2qqhg74c"; + version = "0.6.7.1"; + sha256 = "011zvhwkdl7py1mdb5n65zc98xdfm013lpqc2kd37v9pvn11g28s"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record product-isomorphic relational-query relational-schemas sql-words template-haskell th-data-compat transformers ]; + testHaskellDepends = [ + base convertible HDBC QuickCheck quickcheck-simple + ]; description = "HDBC instance of relational-query and typed query interface for HDBC"; license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query-HDBC_0_6_7_1" = callPackage + "relational-query-HDBC_0_6_8_0" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic , QuickCheck, quickcheck-simple, relational-query @@ -172882,8 +173195,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.6.7.1"; - sha256 = "011zvhwkdl7py1mdb5n65zc98xdfm013lpqc2kd37v9pvn11g28s"; + version = "0.6.8.0"; + sha256 = "1piriqd6rngbdlf9bx9zabbmpn255iqs29z6f8pkxr5qn3q33dzz"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record product-isomorphic relational-query @@ -172915,6 +173228,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-record_0_2_2_0" = callPackage + ({ mkDerivation, base, persistable-record + , persistable-types-HDBC-pg, product-isomorphic, relational-query + , relational-query-HDBC + }: + mkDerivation { + pname = "relational-record"; + version = "0.2.2.0"; + sha256 = "1nmkjq5jrs38d0mmdpy8ygkjncg3j5yjbkcv7mxrm8wlqdijdg8b"; + libraryHaskellDepends = [ + base persistable-record persistable-types-HDBC-pg + product-isomorphic relational-query relational-query-HDBC + ]; + description = "Meta package of Relational Record"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-record-examples" = callPackage ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3 , persistable-record, relational-query, relational-query-HDBC @@ -172922,8 +173253,8 @@ self: { }: mkDerivation { pname = "relational-record-examples"; - version = "0.5.0.0"; - sha256 = "0p49sb8ssvhbhmq4wicj7b46q53vibw686rr3xfy6iz82j64mklb"; + version = "0.5.1.0"; + sha256 = "0xsd1syrs1fsxkkbc7zb0dwl9wqjyf31n44h4b3la93pcjv4dl7q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173925,26 +174256,30 @@ self: { }) {}; "require" = callPackage - ({ mkDerivation, base, bytestring, criterion, megaparsec, tasty - , tasty-hspec, text, universum + ({ mkDerivation, base, bytestring, criterion, directory, inliterate + , megaparsec, optparse-generic, tasty, tasty-hspec, text, universum }: mkDerivation { pname = "require"; - version = "0.2.1"; - sha256 = "0cf19mcjmqn50gz2fc32b67s8za6bb7i2k0h6sj25b457xv9rdx2"; + version = "0.3.2"; + sha256 = "0f84rq90srzx1zhcygmwk4zfcdgmgxg634nh7kp79fgam0vy7b7b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring megaparsec text universum + base bytestring directory inliterate megaparsec optparse-generic + text universum ]; executableHaskellDepends = [ - base bytestring megaparsec text universum + base bytestring directory inliterate megaparsec optparse-generic + text universum ]; testHaskellDepends = [ - base bytestring megaparsec tasty tasty-hspec text universum + base bytestring directory inliterate megaparsec optparse-generic + tasty tasty-hspec text universum ]; benchmarkHaskellDepends = [ - base bytestring criterion megaparsec text universum + base bytestring criterion directory inliterate megaparsec + optparse-generic text universum ]; description = "Scrap your qualified import clutter"; license = stdenv.lib.licenses.asl20; @@ -175043,6 +175378,39 @@ self: { license = "unknown"; }) {}; + "riak_1_1_2_5" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary + , blaze-builder, bytestring, containers, criterion + , data-default-class, deepseq, enclosed-exceptions, exceptions + , hashable, HUnit, mersenne-random-pure64, monad-control, mtl + , network, process, protocol-buffers, pureMD5, QuickCheck, random + , resource-pool, riak-protobuf, semigroups, stm, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, time, transformers + , transformers-base, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "riak"; + version = "1.1.2.5"; + sha256 = "1ln7qm6rl8nr4fc1109pk0jmnqhw4dm3q2jfmvd4a34whplzwln7"; + libraryHaskellDepends = [ + aeson async attoparsec base bifunctors binary blaze-builder + bytestring containers data-default-class deepseq + enclosed-exceptions exceptions hashable mersenne-random-pure64 + monad-control network protocol-buffers pureMD5 random resource-pool + riak-protobuf semigroups stm text time transformers + transformers-base unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default-class HUnit mtl + process QuickCheck riak-protobuf semigroups tasty tasty-hunit + tasty-quickcheck template-haskell text yaml + ]; + benchmarkHaskellDepends = [ base bytestring criterion semigroups ]; + description = "A Haskell client for the Riak decentralized data store"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "riak-protobuf" = callPackage ({ mkDerivation, array, base, parsec, protocol-buffers , protocol-buffers-descriptor @@ -175223,19 +175591,46 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rio_0_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, hashable, hspec, microlens, mtl, primitive + , process, text, time, typed-process, unix, unliftio + , unordered-containers, vector + }: + mkDerivation { + pname = "rio"; + version = "0.1.3.0"; + sha256 = "1bb20lc2kjk3ly54zkp00p80rysrvcqgkhl4lprgcq70svf5xk3i"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable microlens mtl primitive process text time typed-process + unix unliftio unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable hspec microlens mtl primitive process text time + typed-process unix unliftio unordered-containers vector + ]; + description = "A standard library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rio-orphans" = callPackage - ({ mkDerivation, base, exceptions, hspec, monad-control, resourcet - , rio, transformers-base + ({ mkDerivation, base, exceptions, fast-logger, hspec + , monad-control, monad-logger, resourcet, rio, transformers-base }: mkDerivation { pname = "rio-orphans"; - version = "0.1.0.0"; - sha256 = "09wy9h6smh532lrh13qzmni91yfb702x8i97r24d3ny6i3krzqi7"; + version = "0.1.1.0"; + sha256 = "0klbshdsv3gq3l7g1d6gq2wxdqjlqxbnwk1lbg5dpbz7yrnjr3by"; libraryHaskellDepends = [ - base exceptions monad-control resourcet rio transformers-base + base exceptions fast-logger monad-control monad-logger resourcet + rio transformers-base ]; testHaskellDepends = [ - base exceptions hspec monad-control resourcet rio transformers-base + base exceptions fast-logger hspec monad-control monad-logger + resourcet rio transformers-base ]; description = "Orphan instances for the RIO type in the rio package"; license = stdenv.lib.licenses.mit; @@ -177035,6 +177430,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "safe-buffer-monad" = callPackage + ({ mkDerivation, base, hspec, mtl, safe-exceptions, stm, unliftio + }: + mkDerivation { + pname = "safe-buffer-monad"; + version = "0.1.0"; + sha256 = "0l82m3llk6haxzswk8hxkhn1gn37y0zzzan1dnkcg35gk7a9vakd"; + libraryHaskellDepends = [ base mtl safe-exceptions stm ]; + testHaskellDepends = [ + base hspec mtl safe-exceptions stm unliftio + ]; + description = "A monadic buffer resilient to exceptions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "safe-coerce" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -178086,7 +178496,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) z3;}; - "sbv_7_8" = callPackage + "sbv_7_9" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , crackNum, data-binary-ieee754, deepseq, directory, doctest , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty @@ -178095,8 +178505,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "7.8"; - sha256 = "12k47j4xv08dl61qfz2g3dla8rwsx6s7yy5mfnv21c5d2x2bxk6i"; + version = "7.9"; + sha256 = "0x57ppvlzvaqsd3aazx8gqcrqgjiqs06ch5rkkjsd0c9nifpb04m"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum data-binary-ieee754 deepseq @@ -180025,16 +180435,19 @@ self: { "self-extract" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, extra, file-embed - , path, path-io, process, unix-compat + , path, path-io, process, unix-compat, ztar }: mkDerivation { pname = "self-extract"; - version = "0.2.1"; - sha256 = "0as9qxqh1pc695ds7kah5x241psnmfsp9hz2ilvvl73yanfg7j90"; + version = "0.3.1"; + sha256 = "01kzvjzb6rh86jzvh4n4802bvzgjz34rwmcrpm4aqzxpca9ax556"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bytestring Cabal extra file-embed path path-io process - unix-compat + unix-compat ztar ]; + executableHaskellDepends = [ base ]; description = "A Haskell library to make self-extracting executables"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180965,6 +181378,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant_0_14" = callPackage + ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat + , bytestring, Cabal, cabal-doctest, case-insensitive, doctest + , hspec, hspec-discover, http-api-data, http-media, http-types + , mmorph, mtl, natural-transformation, network-uri, QuickCheck + , quickcheck-instances, singleton-bool, string-conversions, tagged + , text, vault + }: + mkDerivation { + pname = "servant"; + version = "0.14"; + sha256 = "0akady8lnv5vz9c339cx97p91a1zvplsidjrcc7da6xqwwlaj94k"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bytestring case-insensitive + http-api-data http-media http-types mmorph mtl + natural-transformation network-uri singleton-bool + string-conversions tagged text vault + ]; + testHaskellDepends = [ + aeson aeson-compat base base-compat bytestring doctest hspec + QuickCheck quickcheck-instances string-conversions text + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-JuicyPixels" = callPackage ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant , servant-server, wai, warp @@ -181015,8 +181457,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "servant-auth"; - version = "0.3.1.0"; - sha256 = "0fa8r5rwrihsadzv74npb16yfvw3lzn3faajw660n5vxz36l56ia"; + version = "0.3.2.0"; + sha256 = "12s1m7vqp0ka8nani4cnrb6fad2y5mxji95bba2b6b07ih8xbd3v"; libraryHaskellDepends = [ base ]; description = "Authentication combinators for servant"; license = stdenv.lib.licenses.bsd3; @@ -181031,8 +181473,8 @@ self: { }: mkDerivation { pname = "servant-auth-client"; - version = "0.3.2.0"; - sha256 = "1504cdqcq6fzr8f483662xdxcp99fpsxbizva1gqk248ymrxi2i5"; + version = "0.3.3.0"; + sha256 = "1pxkwpg1in3anamfvrp8gd7iihng0ikhl4k7ymz5d75ma1qwa2j9"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core text @@ -181086,8 +181528,8 @@ self: { }: mkDerivation { pname = "servant-auth-docs"; - version = "0.2.9.0"; - sha256 = "173gmbgyka6hg6hgchkaw96wv4nb7qr3qwypym520k6zi7cn8b9l"; + version = "0.2.10.0"; + sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -181142,31 +181584,25 @@ self: { , bytestring, bytestring-conversion, case-insensitive, cookie , crypto-api, data-default-class, entropy, hspec, hspec-discover , http-api-data, http-client, http-types, jose, lens, lens-aeson - , markdown-unlit, monad-time, mtl, QuickCheck, servant-auth - , servant-server, tagged, text, time, transformers + , markdown-unlit, monad-time, mtl, QuickCheck, servant + , servant-auth, servant-server, tagged, text, time, transformers , unordered-containers, wai, warp, wreq }: mkDerivation { pname = "servant-auth-server"; - version = "0.3.2.0"; - sha256 = "1ykjjd1lqivavsxdg8akj9vfh4miblslcwdyhlrgz2ci2f31wify"; - isLibrary = true; - isExecutable = true; + version = "0.4.0.0"; + sha256 = "0fwa3v7nkyhrwxrp4sf0aikh5mgkdpn2grz8sr4sszhswp2js4ip"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring bytestring-conversion case-insensitive cookie crypto-api data-default-class entropy http-api-data http-types jose lens - monad-time mtl servant-auth servant-server tagged text time + monad-time mtl servant servant-auth servant-server tagged text time unordered-containers wai ]; - executableHaskellDepends = [ - aeson base markdown-unlit mtl servant-auth servant-server - transformers warp - ]; testHaskellDepends = [ aeson base bytestring case-insensitive hspec http-client http-types - jose lens lens-aeson mtl QuickCheck servant-server time wai warp - wreq + jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth + servant-server time transformers wai warp wreq ]; testToolDepends = [ hspec-discover ]; description = "servant-server/servant-auth compatibility"; @@ -181180,8 +181616,8 @@ self: { }: mkDerivation { pname = "servant-auth-swagger"; - version = "0.2.9.0"; - sha256 = "10vldaywdjshb21ifw418i68i2nnvm0l89plyk7hkf7br2qnfwjc"; + version = "0.2.10.0"; + sha256 = "04ndbbhdmpgb8yshki6q2j46a5q8fzvlb4nn8x8gv0mqkriq79sh"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -181325,6 +181761,8 @@ self: { pname = "servant-blaze"; version = "0.8"; sha256 = "155f20pizgkhn0hczwpxwxw1i99h0l6kfwwhs2r6bmr305aqisj6"; + revision = "1"; + editedCabalFile = "1sw72b1x6diyk13mwxfmv50nix0n2lf7cv55p4n2d4bs7r5388q3"; libraryHaskellDepends = [ base blaze-html http-media servant ]; testHaskellDepends = [ base blaze-html servant-server wai warp ]; description = "Blaze-html support for servant"; @@ -181339,8 +181777,8 @@ self: { pname = "servant-cassava"; version = "0.10"; sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v"; - revision = "2"; - editedCabalFile = "11f5azqs007dfk5zr6sa43cri809k7jlf680gf3d7zcwhlf3xiq4"; + revision = "3"; + editedCabalFile = "1asq4w9dbl0ccwqdpvkhbh5fkvwd73iqd09a776ynf0vq3k05kh6"; libraryHaskellDepends = [ base base-compat bytestring cassava http-media servant vector ]; @@ -181432,6 +181870,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-client_0_14" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , exceptions, generics-sop, hspec, hspec-discover, http-api-data + , http-client, http-media, http-types, HUnit, markdown-unlit + , monad-control, mtl, network, QuickCheck, semigroupoids, servant + , servant-client-core, servant-server, stm, text, time + , transformers, transformers-base, transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.14"; + sha256 = "0jr2057y7vp6d2jcnisawkajinnqm68h024crh929r9fdka0p1n6"; + libraryHaskellDepends = [ + base base-compat bytestring containers exceptions http-client + http-media http-types monad-control mtl semigroupoids + servant-client-core stm text time transformers transformers-base + transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring generics-sop hspec http-api-data + http-client http-types HUnit markdown-unlit mtl network QuickCheck + servant servant-client-core servant-server text transformers + transformers-compat wai warp + ]; + testToolDepends = [ hspec-discover ]; + description = "automatical derivation of querying functions for servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-client-core" = callPackage ({ mkDerivation, base, base-compat, base64-bytestring, bytestring , containers, deepseq, exceptions, generics-sop, hspec @@ -181454,6 +181922,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-client-core_0_14" = callPackage + ({ mkDerivation, base, base-compat, base64-bytestring, bytestring + , containers, deepseq, exceptions, free, generics-sop, hspec + , hspec-discover, http-api-data, http-media, http-types + , network-uri, QuickCheck, safe, servant, text + }: + mkDerivation { + pname = "servant-client-core"; + version = "0.14"; + sha256 = "0qnazinjb19hpajxp9fam1pz9lcl1brjw84fcymh7i6sbwvk60kn"; + libraryHaskellDepends = [ + base base-compat base64-bytestring bytestring containers exceptions + free generics-sop http-api-data http-media http-types network-uri + safe servant text + ]; + testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Core functionality and class for client function generation for servant APIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-csharp" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , heredocs, http-types, lens, mtl, servant, servant-foreign @@ -181521,6 +182011,8 @@ self: { pname = "servant-dhall"; version = "0.1"; sha256 = "12rr4xknj44ynswzpx11dgymki86gfhhs2gcg0pjfg9w0k416mi9"; + revision = "1"; + editedCabalFile = "19rqigavivhzdakf9dwqa5s5q855r1q4xrimip913lq9ircrqz54"; libraryHaskellDepends = [ base base-compat bytestring dhall formatting http-media megaparsec prettyprinter servant text @@ -181543,8 +182035,8 @@ self: { pname = "servant-docs"; version = "0.11.2"; sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b"; - revision = "3"; - editedCabalFile = "16hbrgp5r6mjhcncz8y2gq8q6z3h2b9sl0fzl0yi0w0vp7whgpm5"; + revision = "4"; + editedCabalFile = "0fflpj4miwpq5w6xm26678jvhibxzjri53680v8kwm9y92l6h9ga"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181717,8 +182209,8 @@ self: { pname = "servant-foreign"; version = "0.11.1"; sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735"; - revision = "1"; - editedCabalFile = "1g9631l7cw0kgnsidi943fnzkvddjnm3vgm11ha5vh10pczvn6rb"; + revision = "2"; + editedCabalFile = "19g405wqhhadyb70sgkm5ddprp9qb84pphszp3fzq2r4h5n2pc2i"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -181734,8 +182226,8 @@ self: { pname = "servant-generate"; version = "0.1"; sha256 = "0i71d95yfrlj5m5wr8ksxq8nkvwbsj81d4qm3j24pcgf6a32rrcw"; - revision = "1"; - editedCabalFile = "1viavg5pijjsdcmmdi7ibr9cvfz3r3b646jxxvmya10ss3zvlzh4"; + revision = "2"; + editedCabalFile = "00y5ji53sz59wys4nk2xcdpggydvkkqdxnm0aqj5raxzmakqnraq"; libraryHaskellDepends = [ base servant servant-server ]; description = "Utilities for generating mock server implementations"; license = stdenv.lib.licenses.bsd3; @@ -181757,6 +182249,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-generic_0_1_0_2" = callPackage + ({ mkDerivation, base, network-uri, servant, servant-server, text + , warp + }: + mkDerivation { + pname = "servant-generic"; + version = "0.1.0.2"; + sha256 = "0pv0hgw85gmamvv8cd1yz03b56yfja8r1xrkvlzgb5lpw1ghxn0s"; + libraryHaskellDepends = [ base servant servant-server ]; + testHaskellDepends = [ + base network-uri servant servant-server text warp + ]; + description = "Specify Servant APIs with records"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-github" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, hspec , http-api-data, http-client, http-client-tls, http-link-header @@ -181876,8 +182385,8 @@ self: { pname = "servant-js"; version = "0.9.3.2"; sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02"; - revision = "1"; - editedCabalFile = "11q54f0hx8ggfsrklaf8dk1gra597097gl60j667bmy8266l33ad"; + revision = "2"; + editedCabalFile = "1mz21yf77nzfb30hlqncyx3jwr50ab7qh0m0cv8pds6s76s6k9sj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181931,6 +182440,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-lucid_0_8_1" = callPackage + ({ mkDerivation, base, http-media, lucid, servant, servant-server + , text, wai, warp + }: + mkDerivation { + pname = "servant-lucid"; + version = "0.8.1"; + sha256 = "0g8icz12ydyxyv710fhixswdphiri0b44pw5p0dr21cvwbaxawb6"; + libraryHaskellDepends = [ base http-media lucid servant text ]; + testHaskellDepends = [ base lucid servant-server wai warp ]; + description = "Servant support for lucid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-match" = callPackage ({ mkDerivation, base, bytestring, hspec, http-types, network-uri , servant, text, utf8-string @@ -181979,8 +182503,8 @@ self: { pname = "servant-mock"; version = "0.8.4"; sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr"; - revision = "1"; - editedCabalFile = "0izm1slx384cgfaf16r3w1h6cqpssahphb9b0ccy2m04ysgy7chp"; + revision = "2"; + editedCabalFile = "0brnvssfcg105kkkj646wih8apnhd5gvy25c576i93x0nxb0n39j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182006,8 +182530,8 @@ self: { }: mkDerivation { pname = "servant-multipart"; - version = "0.11.1"; - sha256 = "06wnmazi4f2lgk2ziyh0wjnjl5gs88rsb0f6bpphxkv7wy3agv4q"; + version = "0.11.2"; + sha256 = "0w58gab42l3sz7min2pgv6ihfjz28gys5yky0p83kj5smwhys5nx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182048,6 +182572,8 @@ self: { pname = "servant-nix"; version = "0.1"; sha256 = "1bg2pxfq5g4imppsn9snlw2mzl8qrdr1hpxk7pppwp9cpcy3bsvg"; + revision = "1"; + editedCabalFile = "0h4x2rjyrg6ah9cil6zsci6wra8gmvb1kv2zq6zs7mqw9426vvfb"; libraryHaskellDepends = [ base bytestring hnix http-media servant text ]; @@ -182241,6 +182767,8 @@ self: { pname = "servant-quickcheck"; version = "0.0.7.2"; sha256 = "0zsf68c44yijmgkcd2qmcwz9p0kiix6dzhk3g4ifz60s6kv3jfbh"; + revision = "1"; + editedCabalFile = "1slgq8q0hmh904ssn5sfmi6mbpd3vkqvc59m3g9kfgzf5j70py2h"; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -182391,6 +182919,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-server_0_14" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, Cabal, cabal-doctest, containers, directory, doctest + , exceptions, filepath, hspec, hspec-discover, hspec-wai + , http-api-data, http-media, http-types, monad-control, mtl + , network, network-uri, QuickCheck, resourcet, safe, servant + , should-not-typecheck, string-conversions, tagged, temporary, text + , transformers, transformers-base, transformers-compat, wai + , wai-app-static, wai-extra, warp, word8 + }: + mkDerivation { + pname = "servant-server"; + version = "0.14"; + sha256 = "03vkr4xscll4wg09qfp4fdl9aazkx61zfsk3qv4isixvg1c2iwps"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-compat base64-bytestring bytestring containers exceptions + filepath http-api-data http-media http-types monad-control mtl + network network-uri resourcet servant string-conversions tagged + text transformers transformers-base transformers-compat wai + wai-app-static word8 + ]; + executableHaskellDepends = [ aeson base servant text wai warp ]; + testHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring directory + doctest hspec hspec-wai http-types mtl QuickCheck resourcet safe + servant should-not-typecheck string-conversions temporary text + transformers transformers-compat wai wai-extra + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs and serving them"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-smsc-ru" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, HUnit, mtl, QuickCheck, quickcheck-text @@ -182590,8 +183155,8 @@ self: { pname = "servant-swagger"; version = "1.1.5"; sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg"; - revision = "2"; - editedCabalFile = "1q45dgawmi46q9ps2z7y7kbwvl8pjbzq58s7jzrh096aaiv5141a"; + revision = "3"; + editedCabalFile = "0bjsaqrf3pjiv247mvrybwrsaklh23npwrycvmm8f2y1hraadv8d"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base bytestring hspec http-media insert-ordered-containers @@ -182642,6 +183207,8 @@ self: { pname = "servant-swagger-ui"; version = "0.3.0.3.13.2"; sha256 = "0llkcag9bnhvni6ddar966i0pwql93s5icvw6pxa9ra5v14v7p5n"; + revision = "1"; + editedCabalFile = "1ka19i4r7s85qlpk5sm90gm5yf82nd03clgyqzm8w8jn7y3fji19"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -182658,10 +183225,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui-core"; - version = "0.3"; - sha256 = "1ji54q9x787dr5l81qn0shw2n3b8k9aglli03gxfbvs0l7ga5xrd"; - revision = "1"; - editedCabalFile = "1dh2ra39x2syzg4lw1cklr7hgr52gp72f4iy5zw4zwgy27hbq48v"; + version = "0.3.1"; + sha256 = "05lnm9p86rd9rxsz7f1zm5vkqzjcq2fd8an7c8y5fk4kxj6rydxb"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -182679,6 +183244,8 @@ self: { pname = "servant-swagger-ui-jensoleg"; version = "0.3"; sha256 = "1ymw2lkfn0bkmddvpmv0ikv45fqac2zidnli8bfyp92jf0b5dnik"; + revision = "1"; + editedCabalFile = "1r097cz7kl3kknkp23ss3yl97nq6zzn0p9nxrxgxs5d9d62nb0rg"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -182695,6 +183262,8 @@ self: { pname = "servant-swagger-ui-redoc"; version = "0.3.0.1.21.2"; sha256 = "1p3mq7m5hvid7g7jwpf2jz923512wlprh6gikq5x2vcb14d40qwl"; + revision = "1"; + editedCabalFile = "11lldvcppw71a7i963lymsqy74dkl46zhqnp30g33mfmbvgbwh23"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -182779,8 +183348,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9"; - revision = "19"; - editedCabalFile = "1hlfly2j0c3c4sbzbkbzvwgvfnngkmx0r67ddv4ccg2if6pc5nqv"; + revision = "20"; + editedCabalFile = "0g13cchj5wnjpypsj9fgwk4ypy8xzzwrpry2f9zlsyp0lvkqjqrw"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -184870,22 +185439,6 @@ self: { }: mkDerivation { pname = "show-prettyprint"; - version = "0.2.0.2"; - sha256 = "1snkahqn081rnm6qs54hwgc3y2pwgadrvh8a81lw7rl1mfp261kg"; - libraryHaskellDepends = [ - ansi-wl-pprint base prettyprinter trifecta - ]; - testHaskellDepends = [ base doctest ]; - description = "Robust prettyprinter for output of auto-generated Show instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "show-prettyprint_0_2_2" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter - , trifecta - }: - mkDerivation { - pname = "show-prettyprint"; version = "0.2.2"; sha256 = "0mdgx484vgf2lif4a58vm8yl8zghxh0533038r76l5xlkc5qczgh"; libraryHaskellDepends = [ @@ -184894,7 +185447,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Robust prettyprinter for output of auto-generated Show instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "show-type" = callPackage @@ -186380,6 +186932,8 @@ self: { pname = "siphon"; version = "0.8.1"; sha256 = "0f0i6clnlzkmks7l7pjxyvv2xq7lcd45fmdpzr7xqfwdn17mq6sx"; + revision = "2"; + editedCabalFile = "0kw20g5qghyh1nh9x8dm70frx3jl89npylr2aypvw8igffwsj531"; libraryHaskellDepends = [ attoparsec base bytestring colonnade streaming text transformers vector @@ -186982,30 +187536,6 @@ self: { }: mkDerivation { pname = "slack-web"; - version = "0.2.0.4"; - sha256 = "1wbqz6shqm39ivmw7k2pwslaygxf4rxxbkiczxzpvd29y5pm81ah"; - libraryHaskellDepends = [ - aeson base containers errors http-api-data http-client - http-client-tls megaparsec mtl servant servant-client - servant-client-core text time transformers - ]; - testHaskellDepends = [ - aeson base containers errors hspec http-api-data megaparsec text - time - ]; - description = "Bindings for the Slack web API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "slack-web_0_2_0_5" = callPackage - ({ mkDerivation, aeson, base, containers, errors, hspec - , http-api-data, http-client, http-client-tls, megaparsec, mtl - , servant, servant-client, servant-client-core, text, time - , transformers - }: - mkDerivation { - pname = "slack-web"; version = "0.2.0.5"; sha256 = "1bplhq3qd4hssp6s6710fgxdbmwm0gknsgs0p4n3hz3w30rp6b56"; libraryHaskellDepends = [ @@ -187500,25 +188030,12 @@ self: { ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { pname = "smoothie"; - version = "0.4.2.8"; - sha256 = "0fy0rygg2r73zfcgxmamlz1xfbpfxbljxcwjx9rnp0c8v9aq2m2s"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ aeson base linear text vector ]; - description = "Smooth curves via several interpolation modes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "smoothie_0_4_2_9" = callPackage - ({ mkDerivation, aeson, base, linear, text, vector }: - mkDerivation { - pname = "smoothie"; version = "0.4.2.9"; sha256 = "0kra42nh86dfp66ngr4bmb8d530nh7b9pra1vlykc0sx9b1zpjnk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base linear text vector ]; description = "Smooth curves via several interpolation modes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smsaero" = callPackage @@ -189885,8 +190402,8 @@ self: { ({ mkDerivation, base, split, WAVE }: mkDerivation { pname = "soundgen"; - version = "0.1.0.1"; - sha256 = "0vjl992xsb06ry6bbyi9zbgiyf5117zr5hpdmpjcy9d2g0bzi2q2"; + version = "0.1.1.0"; + sha256 = "198nxjskmlqdn1wnw5zjwxqqs3b03qv2v48g1pzf9llcgvcy37vf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base split WAVE ]; @@ -191359,26 +191876,6 @@ self: { "sqlite-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only - , semigroups, text, time, transformers - }: - mkDerivation { - pname = "sqlite-simple"; - version = "0.4.15.0"; - sha256 = "1qk9dzrqfyjavyl9p0l24hbncp2c1faxx0yvjz5iq3s4dl6fswf0"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-textual bytestring containers - direct-sqlite Only semigroups text time transformers - ]; - testHaskellDepends = [ - base base16-bytestring bytestring direct-sqlite HUnit text time - ]; - description = "Mid-Level SQLite client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sqlite-simple_0_4_16_0" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only , semigroups, template-haskell, text, time, transformers }: mkDerivation { @@ -191395,7 +191892,6 @@ self: { ]; description = "Mid-Level SQLite client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sqlite-simple-errors" = callPackage @@ -192132,8 +192628,8 @@ self: { }: mkDerivation { pname = "stack-prism"; - version = "0.1.6"; - sha256 = "1nwxjhwpjg40kp55g017918dmzxjzj0q0pndhr7gdjnd2d1w4fj9"; + version = "0.1.7"; + sha256 = "0a09x8b78j08cn0l492hj6yx15fhs6bipaiwgjqsax37ynnrxhqz"; libraryHaskellDepends = [ base profunctors tagged template-haskell transformers ]; @@ -192550,8 +193046,8 @@ self: { }: mkDerivation { pname = "stackage2nix"; - version = "0.7.0"; - sha256 = "0g3abhr63jnqw231k6kai9c5gqh15dyxrr78fqw5ga98l3p2b8jl"; + version = "0.7.1"; + sha256 = "1yiz7gbzv8bqil6zgp28n18lj34mdpg6xx0bzk8x9956zxsiwhis"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193170,8 +193666,8 @@ self: { }: mkDerivation { pname = "status-notifier-item"; - version = "0.2.2.0"; - sha256 = "19v7n1hv9ldrcv8h5wcv7lvshwzry0zm9qhvzspb5zvdawgy32zh"; + version = "0.2.2.1"; + sha256 = "0i81hrmrhf4qpwhxbvg681kq4r96nhzhspc3jgi04h4ayx7c0vx0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193310,28 +193806,29 @@ self: { "steeloverseer" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring - , containers, directory, filepath, fsnotify, hspec, mtl - , optparse-applicative, process, regex-tdfa, resourcet, semigroups - , stm, streaming, text, yaml + , containers, directory, exceptions, filepath, fsnotify, hspec + , managed, mtl, optparse-applicative, process, regex-tdfa + , semigroups, stm, streaming, text, unix, yaml }: mkDerivation { pname = "steeloverseer"; - version = "2.0.1.0"; - sha256 = "0njsj7kyyf4vkk4i2yy93swlhiz5xkrdam2dd060qfi7ya8n3h6x"; + version = "2.0.2.0"; + sha256 = "1jj8akshhns3azi9vgfclg9xhbl40nyr1lmf12pisw3mzbd7ld28"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal async base bytestring containers fsnotify mtl - process regex-tdfa resourcet semigroups stm streaming text yaml + aeson ansi-terminal async base bytestring containers exceptions + fsnotify managed mtl process regex-tdfa semigroups stm streaming + text unix yaml ]; executableHaskellDepends = [ - async base bytestring directory filepath fsnotify mtl - optparse-applicative regex-tdfa resourcet semigroups stm streaming - text yaml + async base bytestring directory exceptions filepath fsnotify + managed mtl optparse-applicative regex-tdfa semigroups stm + streaming text yaml ]; testHaskellDepends = [ - async base bytestring fsnotify hspec mtl regex-tdfa resourcet - semigroups stm streaming text yaml + async base bytestring exceptions fsnotify hspec managed mtl + regex-tdfa semigroups stm streaming text yaml ]; description = "A file watcher and development tool"; license = stdenv.lib.licenses.bsd3; @@ -194089,8 +194586,8 @@ self: { }: mkDerivation { pname = "store-core"; - version = "0.4.3"; - sha256 = "0fx4ylhqm79pi6k8qzby6nb0d7nlq5za8n3fir1v97wl34vmr3gf"; + version = "0.4.4"; + sha256 = "1489ydwmq3vd9lz193m5w277wvb9g74ssc1ncfjdry2g0y6czbjv"; libraryHaskellDepends = [ base bytestring ghc-prim primitive text transformers ]; @@ -194836,21 +195333,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "streamly_0_2_1" = callPackage + "streamly_0_3_0" = callPackage ({ mkDerivation, atomic-primops, base, containers, deepseq - , exceptions, gauge, hspec, lifted-base, lockfree-queue - , monad-control, mtl, QuickCheck, random, stm, transformers - , transformers-base + , exceptions, gauge, heaps, hspec, lockfree-queue, monad-control + , mtl, QuickCheck, random, transformers, transformers-base }: mkDerivation { pname = "streamly"; - version = "0.2.1"; - sha256 = "157zxg03ibgxdrghpcdyj22fd7zd02fmgnib13yf0jwwc400c4gp"; + version = "0.3.0"; + sha256 = "0ssp66w8qbfbx9p6hdgvddp3d82i1b4b0n9jbji6cyvf7v8b7m1k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - atomic-primops base containers exceptions lifted-base - lockfree-queue monad-control mtl stm transformers transformers-base + atomic-primops base containers exceptions heaps lockfree-queue + monad-control mtl transformers transformers-base ]; testHaskellDepends = [ base containers exceptions hspec mtl QuickCheck random transformers @@ -199205,6 +199701,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tar-conduit_0_2_3_1" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , conduit-extra, containers, criterion, deepseq, directory + , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh + }: + mkDerivation { + pname = "tar-conduit"; + version = "0.2.3.1"; + sha256 = "0z108pzvh4r87dykapxl36bhby4jhkya53dy2pglb891m54wswpc"; + libraryHaskellDepends = [ + base bytestring conduit conduit-combinators directory filepath + safe-exceptions text unix + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators conduit-extra + containers deepseq directory filepath hspec QuickCheck weigh + ]; + benchmarkHaskellDepends = [ + base bytestring conduit conduit-combinators containers criterion + deepseq directory filepath hspec + ]; + description = "Extract and create tar files using conduit for streaming"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tardis" = callPackage ({ mkDerivation, base, mmorph, mtl }: mkDerivation { @@ -199437,12 +199959,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_1_2_0_5" = callPackage + "tasty-dejafu_1_2_0_6" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.2.0.5"; - sha256 = "1xx72sw7rc4lg1wy5fpfjpxiwqynchlvvcyz4mb7dac6a3rbynf3"; + version = "1.2.0.6"; + sha256 = "193bf26vccbs0wpdhcqi0pi8mw806acrk1hpr2a7jl70jfwxhp98"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; @@ -202965,6 +203487,23 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "th-abstraction_0_2_7_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.2.7.0"; + sha256 = "1233x853gcc18xm0d8ysf7rlkg9aphy2j6hn78yxchalglfwjixf"; + revision = "1"; + editedCabalFile = "1fafzr80vbnamqq72rwnhk1ih3iyxzb8j2xfdgn691irv4fv6839"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + description = "Nicer interface for reified information about data types"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-alpha" = callPackage ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar @@ -203879,30 +204418,6 @@ self: { "threepenny-gui" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, deepseq, exceptions, file-embed, filepath, hashable - , network-uri, safe, snap-core, snap-server, stm, template-haskell - , text, transformers, unordered-containers, vault, vector - , websockets, websockets-snap - }: - mkDerivation { - pname = "threepenny-gui"; - version = "0.8.2.3"; - sha256 = "17lh51ifw29a641xhkpcclnpxl7jvp6dmx9rbxqn5wgqclvi5qwb"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson async base bytestring containers data-default deepseq - exceptions file-embed filepath hashable network-uri safe snap-core - snap-server stm template-haskell text transformers - unordered-containers vault vector websockets websockets-snap - ]; - description = "GUI framework that uses the web browser as a display"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "threepenny-gui_0_8_2_4" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , data-default, deepseq, exceptions, file-embed, filepath, hashable , safe, snap-core, snap-server, stm, template-haskell, text , transformers, unordered-containers, vault, vector, websockets , websockets-snap @@ -203922,7 +204437,6 @@ self: { ]; description = "GUI framework that uses the web browser as a display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threepenny-gui-contextmenu" = callPackage @@ -208294,6 +208808,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "turtle_1_5_9" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, criterion, directory, doctest, exceptions, foldl + , hostname, managed, optional-args, optparse-applicative, process + , semigroups, stm, system-fileio, system-filepath, temporary, text + , time, transformers, unix, unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.5.9"; + sha256 = "13x2qk8j2qxqqk60y17h7g1p76gj3xxyc4g78mb4d4ajq6smk91x"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions foldl hostname managed optional-args + optparse-applicative process semigroups stm system-fileio + system-filepath temporary text time transformers unix unix-compat + ]; + testHaskellDepends = [ base doctest system-filepath temporary ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Shell programming, Haskell-style"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -208770,8 +209308,8 @@ self: { }: mkDerivation { pname = "twitter-conduit"; - version = "0.2.3"; - sha256 = "1xspyig287y2x9y0f6390jd8zmzc2nf2zcsnjd9y69a1qjchviv9"; + version = "0.3.0"; + sha256 = "1p3cas4yy8k0knf5mljmjjzzknwhcaw1x08z7q4jlc9y06323by1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base bytestring conduit @@ -209867,8 +210405,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "typenums"; - version = "0.1.1"; - sha256 = "1n8fwcpwk5qpjljvwi2mfh0rg7sv58cvlzk165bj3bqcac2ffrq4"; + version = "0.1.1.1"; + sha256 = "0zkm10hwdwh4msl60nzm81d409xlch03rb5vv38zhkd3hzqs104v"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Type level numbers using existing Nat functionality"; @@ -210129,6 +210667,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ua-parser_0_7_5_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, criterion, data-default + , deepseq, file-embed, filepath, HUnit, pcre-light, tasty + , tasty-hunit, tasty-quickcheck, text, yaml + }: + mkDerivation { + pname = "ua-parser"; + version = "0.7.5.0"; + sha256 = "08nbzzhndxba039rl5s4ap5ndnfj774546xzvqf9ph8r05dmr690"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring data-default file-embed pcre-light text yaml + ]; + testHaskellDepends = [ + aeson base bytestring data-default file-embed filepath HUnit + pcre-light tasty tasty-hunit tasty-quickcheck text yaml + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion data-default deepseq file-embed + filepath pcre-light text yaml + ]; + description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uacpid" = callPackage ({ mkDerivation, base, containers, directory, filepath, hslogger , mtl, network, process, regex-compat, time, time-locale-compat @@ -212570,6 +213134,25 @@ self: { "urlpath" = callPackage ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph + , monad-control, monad-control-aligned, monad-logger, mtl + , path-extra, resourcet, split, strict, text, transformers + , transformers-base, vector + }: + mkDerivation { + pname = "urlpath"; + version = "8.1.0"; + sha256 = "0gv5mjhhmxq5zppda431vddpcl138qglxiyksj588d4zzg3kd8iy"; + libraryHaskellDepends = [ + attoparsec-uri base exceptions mmorph monad-control + monad-control-aligned monad-logger mtl path-extra resourcet split + strict text transformers transformers-base vector + ]; + description = "Painfully simple URL deployment"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "urlpath_9_0_0" = callPackage + ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph , monad-control, monad-control-aligned, monad-logger, mtl, path , path-extra, resourcet, split, strict, text, transformers , transformers-base, vector @@ -212585,6 +213168,7 @@ self: { ]; description = "Painfully simple URL deployment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "urn" = callPackage @@ -213439,29 +214023,6 @@ self: { }: mkDerivation { pname = "vado"; - version = "0.0.9"; - sha256 = "0y48niwv78xydjnz26rfja509blp0km279mypr2yzwm0xdif3s2s"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base directory filepath process text - ]; - executableHaskellDepends = [ - attoparsec base directory filepath process text - ]; - testHaskellDepends = [ - attoparsec base directory filepath process QuickCheck text - ]; - description = "Runs commands on remote machines using ssh"; - license = stdenv.lib.licenses.mit; - }) {}; - - "vado_0_0_10" = callPackage - ({ mkDerivation, attoparsec, base, directory, filepath, process - , QuickCheck, text - }: - mkDerivation { - pname = "vado"; version = "0.0.10"; sha256 = "04rdjhc1ny2xwmwvbf70bwjgyv5kzl8s83m79qr3i04vicax14gd"; isLibrary = true; @@ -213477,7 +214038,6 @@ self: { ]; description = "Runs commands on remote machines using ssh"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "valid-names" = callPackage @@ -213873,6 +214433,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "valor" = callPackage + ({ mkDerivation, base, checkers, hspec, hspec-checkers, QuickCheck + , text, transformers + }: + mkDerivation { + pname = "valor"; + version = "0.0.0.1"; + sha256 = "1cjkfalsrpw579bg12ldmzjmmkj9l7b35j2vp37qqgd39m1dm29a"; + libraryHaskellDepends = [ base text transformers ]; + testHaskellDepends = [ + base checkers hspec hspec-checkers QuickCheck text transformers + ]; + description = "Simple general structured validation library"; + license = stdenv.lib.licenses.mit; + }) {}; + "value-supply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -215237,6 +215813,8 @@ self: { pname = "vinyl"; version = "0.7.0"; sha256 = "1gch1cx10466j2cyj7q4x0s3g9sjy35l5j9mvq4sfnf4sql1cfps"; + revision = "1"; + editedCabalFile = "0g5b9g7mkjib4ar1v6jfn5m15vj1zg7qn4ffhz03labh3zlkw7zz"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base doctest hspec lens should-not-typecheck singletons @@ -215257,6 +215835,8 @@ self: { pname = "vinyl"; version = "0.8.1.1"; sha256 = "0gwgsk7xf64291s6crvzlry1bvcvwaqmvxpl605id4bb099kqfnh"; + revision = "1"; + editedCabalFile = "0mb694y03r185r0p473zh6bl4j0l4na9km0r3x8czjil7x9yb0vr"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ base doctest hspec lens microlens should-not-typecheck singletons @@ -217842,6 +218422,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wasm" = callPackage + ({ mkDerivation, alex, array, base, base64-bytestring, bytestring + , cereal, containers, deepseq, directory, filepath, happy, ieee754 + , mtl, optparse-applicative, tasty, tasty-hunit, text, transformers + , utf8-string, vector + }: + mkDerivation { + pname = "wasm"; + version = "1.0.0"; + sha256 = "0l5llqc05fr7zkva3ll8hy0qxx19r17qs6zcp098yz6vsnkavzx6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring cereal containers deepseq ieee754 mtl text + transformers utf8-string vector + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + base base64-bytestring bytestring optparse-applicative + ]; + testHaskellDepends = [ + base bytestring directory filepath mtl tasty tasty-hunit text + ]; + testToolDepends = [ alex happy ]; + description = "WebAssembly Language Toolkit and Interpreter"; + license = stdenv.lib.licenses.mit; + }) {}; + "watchdog" = callPackage ({ mkDerivation, base, mtl, time }: mkDerivation { @@ -218876,40 +219484,6 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.12.5.0"; - sha256 = "19vp0mjpib66980q12iv7xkc6j82nkwlyiir0n964nyzl478v3rd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive containers entropy network - random SHA streaming-commons text - ]; - testHaskellDepends = [ - attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive containers entropy HUnit - network QuickCheck random SHA streaming-commons test-framework - test-framework-hunit test-framework-quickcheck2 text - ]; - benchmarkHaskellDepends = [ - attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive containers criterion entropy - network random SHA text - ]; - doCheck = false; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets_0_12_5_1" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , bytestring, bytestring-builder, case-insensitive, containers - , criterion, entropy, HUnit, network, QuickCheck, random, SHA - , streaming-commons, test-framework, test-framework-hunit - , test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; version = "0.12.5.1"; sha256 = "1v9zmd34bmh0y02njff4n1vkp1d5jdpq9dlva0z7sr0glv8c3drz"; isLibrary = true; @@ -218933,7 +219507,6 @@ self: { doCheck = false; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-rpc" = callPackage @@ -219109,8 +219682,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "1.0.5"; - sha256 = "0blaknr11j95sxdm6k2pyfmq1f2llg4hdmy24rvjy9jb82d3vrsi"; + version = "1.0.6"; + sha256 = "07i84ypb0n1qnfcv5y2aksicl36lmxd2bmlmdn2riqj9bhy98vij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219481,6 +220054,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wild-bind_0_1_2_1" = callPackage + ({ mkDerivation, base, containers, hspec, microlens, QuickCheck + , semigroups, stm, text, transformers + }: + mkDerivation { + pname = "wild-bind"; + version = "0.1.2.1"; + sha256 = "1jklfafgv9i2xzsrcz77wzf5p4sxz6cgk1nw3ydzsar5f3jyqxmf"; + libraryHaskellDepends = [ + base containers semigroups text transformers + ]; + testHaskellDepends = [ + base hspec microlens QuickCheck stm transformers + ]; + description = "Dynamic key binding framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wild-bind-indicator" = callPackage ({ mkDerivation, base, containers, gtk, text, transformers , wild-bind @@ -219533,6 +220125,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wild-bind-x11_0_2_0_4" = callPackage + ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl + , semigroups, stm, text, time, transformers, wild-bind, X11 + }: + mkDerivation { + pname = "wild-bind-x11"; + version = "0.2.0.4"; + sha256 = "0wfhva3xkjykf6nl4ghvmp7lx2g0isg09hhb4m44qg0cgv7rzh5z"; + libraryHaskellDepends = [ + base containers fold-debounce mtl semigroups stm text transformers + wild-bind X11 + ]; + testHaskellDepends = [ + async base hspec text time transformers wild-bind X11 + ]; + description = "X11-specific implementation for WildBind"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wilton-ffi" = callPackage ({ mkDerivation, aeson, base, bytestring, utf8-string }: mkDerivation { @@ -219604,34 +220216,34 @@ self: { }) {}; "winery" = callPackage - ({ mkDerivation, base, binary, bytestring, cassava, containers - , deepseq, fast-builder, gauge, hashable, mtl, prettyprinter + ({ mkDerivation, base, binary, bytestring, cassava, containers, cpu + , deepseq, fingertree, gauge, hashable, mtl, prettyprinter , prettyprinter-ansi-terminal, serialise, text, transformers , unordered-containers, vector }: mkDerivation { pname = "winery"; - version = "0.1"; - sha256 = "1i8myd2adkwsini5lvs8418yipr8lx3plsp02f0ja4w726f0d6br"; + version = "0.1.1"; + sha256 = "10f6il6vf7p6613xg9jk1s8rd0hppmirpazhibplsqscr6nnjaar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers fast-builder hashable mtl prettyprinter - prettyprinter-ansi-terminal text transformers unordered-containers - vector + base bytestring containers cpu fingertree hashable mtl + prettyprinter prettyprinter-ansi-terminal text transformers + unordered-containers vector ]; executableHaskellDepends = [ - base bytestring containers fast-builder hashable mtl prettyprinter - prettyprinter-ansi-terminal text transformers unordered-containers - vector + base bytestring containers cpu fingertree hashable mtl + prettyprinter prettyprinter-ansi-terminal text transformers + unordered-containers vector ]; testHaskellDepends = [ - base bytestring containers fast-builder hashable mtl prettyprinter - prettyprinter-ansi-terminal text transformers unordered-containers - vector + base bytestring containers cpu fingertree hashable mtl + prettyprinter prettyprinter-ansi-terminal text transformers + unordered-containers vector ]; benchmarkHaskellDepends = [ - base binary bytestring cassava containers deepseq fast-builder + base binary bytestring cassava containers cpu deepseq fingertree gauge hashable mtl prettyprinter prettyprinter-ansi-terminal serialise text transformers unordered-containers vector ]; @@ -228415,6 +229027,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ztar" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath, path + , path-io, QuickCheck, tar, tasty, tasty-quickcheck, zip, zlib + }: + mkDerivation { + pname = "ztar"; + version = "0.1.0"; + sha256 = "12jndqj9ls67wdx840c25zrvms2s3prbb59scc9dgi93zb6s0k9d"; + libraryHaskellDepends = [ + base bytestring directory filepath path tar zip zlib + ]; + testHaskellDepends = [ + base extra path path-io QuickCheck tasty tasty-quickcheck + ]; + description = "Creating and extracting arbitrary archives"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zuramaru" = callPackage ({ mkDerivation, base, cmdargs, containers, distributive, doctest , either, extensible, extra, lens, megaparsec, mono-traversable diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix new file mode 100644 index 000000000000..de00ebdf2cb0 --- /dev/null +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -0,0 +1,10 @@ +{ mkDerivation, fetchurl }: + +mkDerivation rec { + version = "21.0"; + sha256 = "0khprgawmbdpn9b8jw2kksmvs6b45mibpjralsc0ggxym1397vm8"; + + prePatch = '' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + ''; +} diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 59394d3ccc88..73b979e9ca4f 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -7,10 +7,8 @@ rec { version = "2.0.5"; isStable = true; sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; - } // { - # 64-bit ARM isn't supported upstream - meta = meta // { - platforms = lib.filter (p: p != "aarch64-linux") meta.platforms; + meta = genericMeta // { + platforms = lib.filter (p: p != "aarch64-linux") genericMeta.platforms; }; }; @@ -20,13 +18,12 @@ rec { sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"; }; - - meta = with stdenv.lib; { + genericMeta = with stdenv.lib; { description = "High-performance JIT compiler for Lua 5.1"; homepage = http://luajit.org; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers ; [ thoughtpolice smironov vcunat andir ]; + maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ]; }; generic = @@ -37,6 +34,7 @@ rec { url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; inherit sha256; }) + , meta ? genericMeta }: stdenv.mkDerivation rec { diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index a669d71036a8..3032b5e4c2a1 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -348,12 +348,12 @@ in { }; php71 = generic { - version = "7.1.18"; - sha256 = "13mz8baknpydswjgqzfqqqjv426x4pnc04rfv2k33s7d2makf3jq"; + version = "7.1.19"; + sha256 = "1wvhsxzmb78pcr36ginz93iv7rcrxp3p01rb34zxa2h4wdxkxi0k"; }; php72 = generic { - version = "7.2.6"; - sha256 = "1hzj1z6v1ij4f4zjl1giix9qinf20wyn9gf8s29x5fc0va53wpdf"; + version = "7.2.7"; + sha256 = "18ymjqy8vpmwlzzfrxvaz2nsn8n66rmg40pwiy6x2kdgjrd6g0fc"; }; } diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 6f7f2df96bff..e2b64fd4e028 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { homepage = https://picolisp.com/; license = licenses.mit; platforms = platforms.all; + broken = stdenv.isDarwin; # times out maintainers = with maintainers; [ raskin tohl ]; }; diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix new file mode 100644 index 000000000000..aae1041a224a --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -0,0 +1,178 @@ +{ stdenv, fetchurl, fetchpatch +, glibc +, bzip2 +, expat +, libffi +, gdbm +, lzma +, ncurses +, openssl +, readline +, sqlite +, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false +, zlib +, callPackage +, self +, CF, configd +, python-setup-hook +# For the Python package set +, pkgs, packageOverrides ? (self: super: {}) +}: + +assert x11Support -> tcl != null + && tk != null + && xproto != null + && libX11 != null; +with stdenv.lib; + +let + majorVersion = "3.7"; + minorVersion = "0"; + minorVersionSuffix = "rc1"; + pythonVersion = majorVersion; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; + sitePackages = "lib/${libPrefix}/site-packages"; + + buildInputs = filter (p: p != null) [ + zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] + ++ optionals x11Support [ tcl tk libX11 xproto ] + ++ optionals stdenv.isDarwin [ CF configd ]; + +in stdenv.mkDerivation { + name = "python3-${version}"; + pythonVersion = majorVersion; + inherit majorVersion version; + + inherit buildInputs; + + src = fetchurl { + url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; + sha256 = "1dqb1in7xlvq7959pvvxpm50nz5jk7ifxza2x4hfvqr31jvbkky9"; + }; + + NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; + + # Determinism: We fix the hashes of str, bytes and datetime objects. + PYTHONHASHSEED=0; + + prePatch = optionalString stdenv.isDarwin '' + substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' + substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' + ''; + + patches = [ + ./no-ldconfig.patch + ]; + + postPatch = '' + '' + optionalString (x11Support && (tix != null)) '' + substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + ''; + + CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"; + LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"; + LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"; + + configureFlags = [ + "--enable-shared" + "--with-threads" + "--without-ensurepip" + "--with-system-expat" + "--with-system-ffi" + ]; + + preConfigure = '' + for i in /usr /sw /opt /pkg; do # improve purity + substituteInPlace ./setup.py --replace $i /no-such-path + done + ${optionalString stdenv.isDarwin '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" + export MACOSX_DEPLOYMENT_TARGET=10.6 + ''} + ''; + + setupHook = python-setup-hook sitePackages; + + postInstall = '' + # needed for some packages, especially packages that backport functionality + # to 2.x from 3.x + for item in $out/lib/python${majorVersion}/test/*; do + if [[ "$item" != */test_support.py* + && "$item" != */test/support + && "$item" != */test/libregrtest + && "$item" != */test/regrtest.py* ]]; then + rm -rf "$item" + else + echo $item + fi + done + touch $out/lib/python${majorVersion}/test/__init__.py + + ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" + paxmark E $out/bin/python${majorVersion} + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py + + # Determinism: Windows installers were not deterministic. + # We're also not interested in building Windows installers. + find "$out" -name 'wininst*.exe' | xargs -r rm -f + + # Use Python3 as default python + ln -s "$out/bin/idle3" "$out/bin/idle" + ln -s "$out/bin/pydoc3" "$out/bin/pydoc" + ln -s "$out/bin/python3" "$out/bin/python" + ln -s "$out/bin/python3-config" "$out/bin/python-config" + ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" + + # Get rid of retained dependencies on -dev packages, and remove + # some $TMPDIR references to improve binary reproducibility. + # Note that the .pyc file of _sysconfigdata.py should be regenerated! + for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do + sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" + done + + # Determinism: rebuild all bytecode + # We exclude lib2to3 because that's Python 2 code which fails + # We rebuild three times, once for each optimization level + # Python 3.7 implements PEP 552, introducing support for deterministic bytecode. + # This is automatically used when `SOURCE_DATE_EPOCH` is set. + find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i - + ''; + + passthru = let + pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + in rec { + inherit libPrefix sitePackages x11Support; + executable = "${libPrefix}m"; + buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; + withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; + isPy3 = true; + isPy37 = true; + is_py3k = true; # deprecated + interpreter = "${self}/bin/${executable}"; + }; + + enableParallelBuilding = true; + + meta = { + homepage = http://python.org; + description = "A high-level dynamically-typed programming language"; + longDescription = '' + Python is a remarkably powerful dynamic programming language that + is used in a wide variety of application domains. Some of its key + distinguishing features include: clear, readable syntax; strong + introspection capabilities; intuitive object orientation; natural + expression of procedural code; full modularity, supporting + hierarchical packages; exception-based error handling; and very + high level dynamic data types. + ''; + license = licenses.psfl; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ fridh kragniz ]; + }; +} diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch new file mode 100644 index 000000000000..a1f9d68eb166 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch @@ -0,0 +1,100 @@ +From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk <fridh@fridh.nl> +Date: Mon, 28 Aug 2017 09:24:06 +0200 +Subject: [PATCH] Don't use ldconfig + +--- + Lib/ctypes/util.py | 70 ++---------------------------------------------------- + 1 file changed, 2 insertions(+), 68 deletions(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 5e8b31a854..7b45ce6c15 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -94,46 +94,7 @@ elif os.name == "posix": + import re, tempfile + + def _findLib_gcc(name): +- # Run GCC's linker with the -t (aka --trace) option and examine the +- # library name it prints out. The GCC command will fail because we +- # haven't supplied a proper program with main(), but that does not +- # matter. +- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) +- +- c_compiler = shutil.which('gcc') +- if not c_compiler: +- c_compiler = shutil.which('cc') +- if not c_compiler: +- # No C compiler available, give up +- return None +- +- temp = tempfile.NamedTemporaryFile() +- try: +- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] +- +- env = dict(os.environ) +- env['LC_ALL'] = 'C' +- env['LANG'] = 'C' +- try: +- proc = subprocess.Popen(args, +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT, +- env=env) +- except OSError: # E.g. bad executable +- return None +- with proc: +- trace = proc.stdout.read() +- finally: +- try: +- temp.close() +- except FileNotFoundError: +- # Raised if the file was already removed, which is the normal +- # behaviour of GCC if linking fails +- pass +- res = re.search(expr, trace) +- if not res: +- return None +- return os.fsdecode(res.group(0)) ++ return None + + + if sys.platform == "sunos5": +@@ -255,34 +216,7 @@ elif os.name == "posix": + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' +- regex = os.fsencode(regex % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def _findLib_ld(name): + # See issue #9998 for why this is needed +-- +2.15.0 + diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index f28ab55010b6..0a71186cd4c7 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}: stdenv.mkDerivation { - name = "Xaw3d-1.6.2"; + name = "Xaw3d-1.6.3"; src = fetchurl { - url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.2.tar.bz2; - sha256 = "0awplv1nf53ywv01yxphga3v6dcniwqnxgnb0cn4khb121l12kxp"; + url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2; + sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [imake gccmakedep libXpm libXp bison flex]; diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index c72572139c68..331039ec329f 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -23,6 +23,7 @@ agda.mkDerivation (self: rec { description = "A standard library for use with the Agda compiler"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; + broken = stdenv.isDarwin; maintainers = with maintainers; [ jwiegley fuuzetsu mudri ]; }; }) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index e20b2700f0e2..5e82a1a3c6be 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A game programming library"; - homepage = http://liballeg.org/; + homepage = https://liballeg.org/; license = licenses.zlib; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 12b2cbf07071..21d9ce23d319 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A game programming library"; - homepage = http://liballeg.org/; + homepage = https://liballeg.org/; license = licenses.free; # giftware maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 034e8c961be0..523d3e7ba63f 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -15,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.4.65"; + version = "1.4.70"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0266d2gar9wi0p4plapcp4bms93nn61rdvpd8ik5h6hgqvdb3fl2"; + sha256 = "09yybp1nh3w6m3cychx44vvplsy27rxjs948g5gs5qdcgdyx0yx0"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix index 02cf511a6fdf..932ebdcb463a 100644 --- a/pkgs/development/libraries/boost/1.66.nix +++ b/pkgs/development/libraries/boost/1.66.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { # SHA256 from http://www.boost.org/users/history/version_1_66_0.html sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; }; - - toolset = if stdenv.cc.isClang then "clang" else null; }) diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index 2831104410b1..8b9e7ccca7f1 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { # SHA256 from http://www.boost.org/users/history/version_1_66_0.html sha256 = "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"; }; - - toolset = if stdenv.cc.isClang then "clang" else null; }) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index efe1151359d7..00c6d279c7ac 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv , which , buildPackages, buildPlatform, hostPlatform -, toolset ? /**/ if stdenv.cc.isClang then "clang" - else if stdenv.cc.isGNU && hostPlatform != buildPlatform then "gcc-cross" +, toolset ? /**/ if stdenv.cc.isClang then "clang" else null , enableRelease ? true , enableDebug ? false @@ -58,16 +57,26 @@ let "link=${link}" "-sEXPAT_INCLUDE=${expat.dev}/include" "-sEXPAT_LIBPATH=${expat.out}/lib" + + # TODO: make this unconditional + ] ++ optionals (hostPlatform != buildPlatform) [ + "address-model=${toString hostPlatform.parsed.cpu.bits}" + "architecture=${toString hostPlatform.parsed.cpu.family}" + "binary-format=${toString hostPlatform.parsed.kernel.execFormat.name}" + "target-os=${toString hostPlatform.parsed.kernel.name}" + + # adapted from table in boost manual + # https://www.boost.org/doc/libs/1_66_0/libs/context/doc/html/context/architectures.html + "abi=${if hostPlatform.parsed.cpu.family == "arm" then "aapcs" + else if hostPlatform.isWindows then "ms" + else if hostPlatform.isMips then "o32" + else "sysv"}" ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ optional (variant == "release") "debug-symbols=off" ++ optional (toolset != null) "toolset=${toolset}" ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam" ++ optionals (hostPlatform.libc == "msvcrt") [ - "target-os=windows" "threadapi=win32" - "binary-format=pe" - "address-model=${toString hostPlatform.parsed.cpu.bits}" - "architecture=x86" ]); in diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index e5391e7100d5..badfc630a47e 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of open-source libraries for high level network programming"; - homepage = http://cpp-netlib.org; + homepage = https://cpp-netlib.org; license = licenses.boost; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index e3815165f6e3..d52f1b6a2cff 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A D-Bus API for the dLeyna services"; - homepage = http://01.org/dleyna; + homepage = https://01.org/dleyna; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 11cfa31c04b6..787030eed987 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library of utility functions that are used by the higher level dLeyna"; - homepage = http://01.org/dleyna; + homepage = https://01.org/dleyna; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index a8ea7e8bd627..99af28111a76 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to discover and manipulate Digital Media Renderers"; - homepage = http://01.org/dleyna; + homepage = https://01.org/dleyna; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index b4885145f6e4..79b0155c9132 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to discover, browse and manipulate Digital Media Servers"; - homepage = http://01.org/dleyna; + homepage = https://01.org/dleyna; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index b62d764a2c65..9f704dc6a089 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -4,7 +4,7 @@ , libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: let - version = "0.11.8.3"; + version = "0.99.1"; desktop_schemas = gnome3.gsettings_desktop_schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz"; - sha256 = "1dgkr1kr00111vsrql2ng2sw2b2j9axmay0fl6p540j952v3yimy"; + sha256 = "0f0mfmnc531pifrpkp1qv20wvbvi4la41rwyb3m8lnh1q5bmrch0"; }; patches = [ diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 2bc36d1b2b9a..7a903f00ae60 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -4,6 +4,7 @@ , meson , ninja , pkgconfig +, fixDarwinDylibNames }: stdenv.mkDerivation rec { @@ -18,6 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; outputs = [ "out" "devdoc" ]; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index cb2c3f15da82..f62883529fc9 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, m4, cxx ? true -, buildPackages +{ stdenv, fetchurl, m4, cxx ? !hostPlatform.useAndroidPrebuilt +, buildPackages, hostPlatform , withStatic ? false }: let inherit (stdenv.lib) optional optionalString; in diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index f1eed726eb2b..4f952359f711 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, fetchpatch, stdenv }: stdenv.mkDerivation rec { - name = "gsl-2.4"; + name = "gsl-2.5"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "16yfs5n444s03np1naj6yp1fsysd42kdscxzkg0k2yvfjixx0ijd"; + sha256 = "1395y9hlhqadn5g9j8q22224fds5sd92jxi9czfavjj24myasq04"; }; patches = [ diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index d098dd8fd146..81a2c8691796 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.7.6"; + version = "1.8.0"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "16rf7qwgy1gza74v2ws79zdwwb1lpvgz2abwwm8ws9j82cwysyys"; + sha256 = "18wnbq919k5h8pfm1pfy38gs1qzj1hnfr1wq989bix1n2jiii1d1"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index acd0d35a5f08..873ccc5665df 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "lasso-${version}"; - version = "2.5.1"; + version = "2.6.0"; src = fetchurl { url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz"; - sha256 = "0n10zjjw84303c9vfy9bqhyzdl01459akbwy86cbgphd826mq45y"; + sha256 = "1kqagm63a4mv5sw5qc3y0qlky7r9qg5lccq0c3cnfr0n4mxgysql"; }; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 356433b54eb5..10441b9b871e 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A LDAP-like embedded database"; - homepage = http://ldb.samba.org/; + homepage = https://ldb.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 077efe299ec3..e84df0c1aedf 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl -, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, libudev, kmod, parted +, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, libudev, kmod, parted, libyaml , cryptsetup, devicemapper, dmraid, utillinux, libbytesize, libndctl, nss, volume_key }: let - version = "2.17"; + version = "2.18"; in stdenv.mkDerivation rec { name = "libblockdev-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "14f52cj2qcnm8i2zb57qfpdk3kij2gb3xgqkbvidmf6sjicq84z2"; + sha256 = "03gbmji401nz1sff2zp61dhal80qls4blqwadj2p4ckbxdlmid4i"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize libndctl nss volume_key + glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize libndctl nss volume_key libyaml ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index e4e61c942836..4f0ba439417f 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, collectd }: with stdenv.lib; -overrideDerivation collectd (oldAttrs: { +collectd.overrideAttrs (oldAttrs: { name = "libcollectdclient-${collectd.version}"; buildInputs = [ ]; @@ -16,7 +16,6 @@ overrideDerivation collectd (oldAttrs: { postInstall = "rm -rf $out/{bin,etc,sbin,share}"; -}) // { meta = with stdenv.lib; { description = "C Library for collectd, a daemon which collects system performance statistics periodically"; homepage = http://collectd.org; @@ -24,4 +23,4 @@ overrideDerivation collectd (oldAttrs: { platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable? maintainers = [ maintainers.sheenobu maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 154128144201..da4bbcad4fb6 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, groff }: stdenv.mkDerivation rec { - name = "libedit-20170329-3.1"; + name = "libedit-20180525-3.1"; src = fetchurl { url = "http://thrysoee.dk/editline/${name}.tar.gz"; - sha256 = "1gnlgl0x8g9ky59s70nriy5gv47676d1s4ypvbv8y11apl7xkwli"; + sha256 = "05iicng4kag5hxdc7adbyj1gm3qbmvcc33m9cyx5gys0s67yl6y4"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index de657bc9c346..638dec302b77 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { # The build enables -O2 by default for everything else. hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; + # Accepted upstream, should be in next update: #42150, https://dev.gnupg.org/T4034 + patches = [ ./fix-jent-locking.patch ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libgpgerror ] @@ -49,8 +52,7 @@ stdenv.mkDerivation rec { cp src/.libs/libgcrypt.20.dylib $out/lib ''; - # TODO: reenable with next update? - doCheck = !stdenv.isDarwin; + doCheck = true; meta = with stdenv.lib; { homepage = https://www.gnu.org/software/libgcrypt/; diff --git a/pkgs/development/libraries/libgcrypt/fix-jent-locking.patch b/pkgs/development/libraries/libgcrypt/fix-jent-locking.patch new file mode 100644 index 000000000000..5394e51468e6 --- /dev/null +++ b/pkgs/development/libraries/libgcrypt/fix-jent-locking.patch @@ -0,0 +1,29 @@ +From bbe989be6ca5e093d5244413590bd80e12c2ec9b Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Sun, 17 Jun 2018 18:53:58 -0500 +Subject: [PATCH] rndjent: move locking to fix trying to obtain held lock, + hanging + +--- + random/rndjent.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/random/rndjent.c b/random/rndjent.c +index 0c5a820b..3740ddd4 100644 +--- a/random/rndjent.c ++++ b/random/rndjent.c +@@ -334,9 +334,10 @@ _gcry_rndjent_get_version (int *r_active) + { + if (r_active) + { +- lock_rng (); + /* Make sure the RNG is initialized. */ + _gcry_rndjent_poll (NULL, 0, 0); ++ ++ lock_rng (); + /* To ease debugging we store 2 for a clock_gettime based + * implementation and 1 for a rdtsc based code. */ + *r_active = jent_rng_collector? is_rng_available () : 0; +-- +2.18.0-rc2 + diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix deleted file mode 100644 index e29b3ed89dea..000000000000 --- a/pkgs/development/libraries/libgsystem/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection -, glib, attr, systemd -}: - -stdenv.mkDerivation { - name = "libgsystem-2015.1"; - - meta = with stdenv.lib; { - description = "GIO-based library with Unix/Linux specific API"; - homepage = "https://wiki.gnome.org/Projects/LibGSystem"; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - }; - - src = fetchFromGitHub { - owner = "GNOME"; - repo = "libgsystem"; - rev = "v2015.1"; - sha256 = "0j5dqn1pnspfxifklw4wkikqlbxr4faib07550n5gi58m89gg68n"; - }; - - nativeBuildInputs = [ - autoreconfHook pkgconfig gtk-doc gobjectIntrospection - ]; - - propagatedBuildInputs = [ glib attr systemd ]; - - preAutoreconf = '' - mkdir m4 - ''; -} diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index b6f08a9206ee..66ae352525ff 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libiconv }: stdenv.mkDerivation rec { - name = "libidn-1.34"; + name = "libidn-1.35"; src = fetchurl { url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; + sha256 = "07pyy0afqikfq51z5kbzbj9ldbd12mri0zvx0mfv3ds6bc0g26pi"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 6773b7c1b1f1..3b4e3233d554 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.10.3"; + version = "1.11.0"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0002xk9cqzpqrlhgav1wp8nimsbp9d2w8rd8mgygczq2hjar0lhd"; + sha256 = "04mwl1v51b785h7q3v23hahr0qzr48qq1jzj7d3msjvgh97nr8v4"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix index 888fe423b47c..78304246f12b 100644 --- a/pkgs/development/libraries/libndp/default.nix +++ b/pkgs/development/libraries/libndp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libndp-1.6"; + name = "libndp-1.7"; src = fetchurl { url = "http://libndp.org/files/${name}.tar.gz"; - sha256 = "03mczwrxqbp54msafxzzyhaazkvjdwm2kipjkrb5xg8kw22glz8c"; + sha256 = "1dlinhl39va00v55qygjc9ap77yqf7xvn4rwmvdr49xhzzxhlj1c"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 6570d1eb3c0e..0d4d6504142a 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.1.1"; name = "libnftnl-${version}"; src = fetchurl { url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "0v4gywcjvv2vg4zk632al1zv3ad0lx87nshynv110l8n3fhsq3pc"; + sha256 = "1wmgjfcb35mscb2srzia5931srygywrs1aznxmg67v177x0nasjx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index a74d838e2eb6..593bb567df7d 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.9.0"; + version = "4.10.0"; name = "libpfm-${version}"; src = fetchurl { url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz"; - sha256 = "1qp4g4n6dw42p2w5rkwzdb7ynk8h7g5vg01ybpmvxncgwa7bw3yv"; + sha256 = "0bldxhcrpav04hi256fmf907gxhyck24j1p998v48zbhm6aykw94"; }; installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; maintainers = [ maintainers.pierron ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 5dfb61f172ff..a29257af4c3c 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -34,18 +34,13 @@ let in { - libressl_2_5 = generic { - version = "2.5.5"; - sha256 = "1i77viqy1afvbr392npk9v54k9zhr9zq2vhv6pliza22b0ymwzz5"; - }; - libressl_2_6 = generic { - version = "2.6.4"; - sha256 = "07yi37a2ghsgj2b4w30q1s4d2inqnix7ika1m21y57p9z71212k3"; + version = "2.6.5"; + sha256 = "0anx9nlgixdjn811zclim85jm5yxmxwycj71ix27rlhr233xz7l5"; }; libressl_2_7 = generic { - version = "2.7.3"; - sha256 = "1597kj9jy3jyw52ys19sd4blg2gkam5q0rqdxbnrnvnyw67hviqn"; + version = "2.7.4"; + sha256 = "19kxa5i97q7p6rrps9qm0nd8zqhdjvzx02j72400c73cl2nryfhy"; }; } diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index e6d2612fe626..5be9a2de94e5 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://rime.im/; + homepage = https://rime.im/; description = "Rime Input Method Engine, the core library"; license = licenses.bsd3; maintainers = with maintainers; [ sifmelcara ]; diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 9d4b62eb97ab..bad5e7c59622 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - version = "1.7.3"; + version = "1.8.1"; name = "libsixel-${version}"; src = fetchFromGitHub { repo = "libsixel"; rev = "v${version}"; owner = "saitoha"; - sha256 = "1hzmypzzigmxl07vgc52wp4dgxkhya3gfk4yzaaxc8s630r6ixs8"; + sha256 = "0cbhvd1yk0q08nxva5bga7bpp8yxjfdfnqicvip4l6k28mzz7pmf"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 2d5fa20c7cf8..9db56aa3a9ec 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }: +{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { rev = "0.6.34"; @@ -11,9 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1knr48dilg8kscbmpjvd7m2krvgcdq0f9vpbqcgmxxa969mzrcy7"; }; - cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true"; + cmakeFlags = [ + "-DENABLE_COMPLEX_DEPS=true" + "-DENABLE_RPMMD=true" + "-DENABLE_RPMDB=true" + "-DENABLE_PUBKEY=true" + "-DENABLE_RPMDB_BYRPMHEADER=true" + ]; - buildInputs = [ cmake zlib expat rpm db ]; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ zlib expat rpm db ]; meta = with stdenv.lib; { description = "A free package dependency solver"; diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index e30f699f103d..d6915fe4cd3f 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.libtom.net/LibTomCrypt/; + homepage = https://www.libtom.net/LibTomCrypt/; description = "A fairly comprehensive, modular and portable cryptographic toolkit"; license = with licenses; [ publicDomain wtfpl ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index cd13eef156d0..8c88dd97ec41 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.libtom.net/LibTomMath/; + homepage = https://www.libtom.net/LibTomMath/; description = "A library for integer-based number-theoretic applications"; license = with licenses; [ publicDomain wtfpl ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 335400b80efc..d0b2d79e9fab 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,19 +1,33 @@ -{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf, zlib +, boost, openssl, libtool, python, libiconv, geoip }: -stdenv.mkDerivation rec { - name = "libtorrent-rasterbar-${version}"; +let version = "1.1.7"; + formattedVersion = lib.replaceChars ["."] ["_"] version; +in stdenv.mkDerivation { + name = "libtorrent-rasterbar-${version}"; - src = - let formattedVersion = lib.replaceChars ["."] ["_"] version; - in fetchurl { - url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz"; - sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc"; - }; + src = fetchFromGitHub { + owner = "arvidn"; + repo = "libtorrent"; + rev = "libtorrent-${formattedVersion}"; + sha256 = "073nb7yca5jg1i8z5h76qrmddl2hdy8fc1pnchkg574087an31r3"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch"; + sha256 = "1bdv0icqzbg1il60sckcly4y22lkdbkkwdjadwdzxv7cdj586bzd"; + }) + (fetchpatch { + url = "https://github.com/arvidn/libtorrent/commit/9cd0ae67e74a507c1b9ff9c057ee97dda38ccb81.patch"; + sha256 = "1cscqpc6fq9iwspww930dsxf0yb01bgrghzf5hdhl09a87r6q2zg"; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ boost openssl zlib python libiconv geoip ]; - preConfigure = "./autotool.sh"; configureFlags = [ @@ -25,12 +39,8 @@ stdenv.mkDerivation rec { "--with-libiconv=yes" ]; - enableParallelBuilding = true; - - doCheck = false; # fails to link - meta = with stdenv.lib; { - homepage = http://www.rasterbar.com/products/libtorrent/; + homepage = "https://libtorrent.org/"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 356462e8a4af..24da3a8e2c7d 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libunistring-${version}"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { url = "mirror://gnu/libunistring/${name}.tar.gz"; - sha256 = "0jm8pr469y7ybb90ll8k1585rciqm8ckzif0laipqhp5z440rsgm"; + sha256 = "02v17za10mxnj095x4pvm80jxyqwk93kailfc2j8xa1r6crmnbm8"; }; outputs = [ "out" "dev" "info" "doc" ]; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index ed4397c88f0d..4dc601745a42 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.20.2"; + version = "1.20.3"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "14zlf59fr03v684ryapc57r9nfrznyk5xvcd59q04rb435ibib48"; + sha256 = "1a8a679wni560z7x6w5i431vh2g0f34cznflcn52klx1vwcggrg7"; }; postPatch = let diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index cb81aa262e92..49c1b054b77a 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -6,6 +6,7 @@ , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode , enableXen ? false, xen ? null +, enableIscsi ? false, openiscsi }: with stdenv.lib; @@ -42,6 +43,8 @@ in stdenv.mkDerivation rec { libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen + ] ++ optionals enableIscsi [ + openiscsi ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; @@ -49,7 +52,7 @@ in stdenv.mkDerivation rec { preConfigure = '' ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" } - PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ])}:$PATH + PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations @@ -79,6 +82,8 @@ in stdenv.mkDerivation rec { "--with-storage-disk" ] ++ optionals (stdenv.isLinux && zfs != null) [ "--with-storage-zfs" + ] ++ optionals enableIscsi [ + "--with-storage-iscsi" ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" ]; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 2f9bca5ed95f..5457b1075a3e 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x"; name = "CVE-2017-14160"; }) + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaa.diff"; + sha256 = "1k77y3q36npy8mkkz40f6cb46l2ldrwyrd191m29s8rnbhnafdf7"; + name = "CVE-2018-10392.patch"; + }) ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index be2f83cb498e..8a3d7abdfa57 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -3,6 +3,7 @@ , buildPlatform, hostPlatform , pythonSupport ? buildPlatform == hostPlatform , icuSupport ? false, icu ? null +, enableStatic ? false }: let @@ -18,7 +19,8 @@ in stdenv.mkDerivation rec { }; outputs = [ "bin" "dev" "out" "man" "doc" ] - ++ lib.optional pythonSupport "py"; + ++ lib.optional pythonSupport "py" + ++ lib.optional enableStatic "static"; propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; buildInputs = lib.optional pythonSupport python @@ -32,7 +34,8 @@ in stdenv.mkDerivation rec { configureFlags = lib.optional pythonSupport "--with-python=${python}" ++ lib.optional icuSupport "--with-icu" - ++ [ "--exec_prefix=$dev" ]; + ++ [ "--exec_prefix=$dev" ] + ++ lib.optional enableStatic "--enable-static"; enableParallelBuilding = true; @@ -57,6 +60,8 @@ in stdenv.mkDerivation rec { moveToOutput bin/xml2-config "$dev" moveToOutput lib/xml2Conf.sh "$dev" moveToOutput share/man/man1 "$bin" + '' + lib.optionalString enableStatic '' + moveToOutput lib/libxml2.a "$static" ''; passthru = { inherit version; pythonSupport = pythonSupport; }; diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index fa4758d0877a..6779268dbdc1 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small XML library"; - homepage = http://www.minixml.org; + homepage = https://www.msweet.org/mxml/; license = licenses.lgpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index d75d9d6b9d90..afb44dd80f91 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.mpfr.org/; + homepage = https://www.mpfr.org/; description = "Library for multiple-precision floating-point arithmetic"; longDescription = '' diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 07bd4e7e9fbe..f50b64fca3ed 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description= "Socket library that provides several common communication patterns"; - homepage = http://nanomsg.org/; + homepage = https://nanomsg.org/; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index d880d41c7084..9a27901c862d 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { Pango forms the core of text and font handling for GTK+-2.x. ''; - homepage = http://www.pango.org/; + homepage = https://www.pango.org/; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index b5ec5198975e..93c2501a6203 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; - homepage = http://www.pango.org/; + homepage = https://www.pango.org/; license = with licenses; [ lgpl2 lgpl21 ]; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix index 8154fca29e84..2d6b678f6570 100644 --- a/pkgs/development/libraries/pangox-compat/default.nix +++ b/pkgs/development/libraries/pangox-compat/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A compatibility library for pango>1.30.*"; - homepage = http://www.pango.org/; + homepage = https://www.pango.org/; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 0c5d5e22e696..3e69bbde75a2 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pkcs11-helper-${version}"; - version = "1.23"; + version = "1.24"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${name}"; - sha256 = "1m3fp3v6c903cs36bvvg0h65p1sdamsmzy13ww0zyvplcycarz0n"; + sha256 = "07ij6i76abf6bdhczsq1wkln3q0y0wkfbsi882vj3gl2wvxh0d1i"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index 0c0332f13662..38b77781867d 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.3"; + version = "1.2.4"; name = "brial-${version}"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg"; + sha256 = "08skgmwz190mvpkh0ddx92ilva6bxidxwh1qg16ipi768x92193s"; }; # FIXME package boost-test and enable checks diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index a0b1220b217d..031dd8f4f9c8 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "sqlite-analyzer-${version}"; - version = "3.23.1"; + version = "3.24.0"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d"; + sha256 = "19ck2sg13i6ga5vapxak42jn6050vpfid0zrmah7jh32mksh58vj"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 03f2f5c7199e..ed25fcb5b801 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { name = "sqlite-${version}"; - version = "3.23.1"; + version = "3.24.0"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j"; + sha256 = "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 272967fcb996..810420fe6b76 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -1,14 +1,14 @@ { stdenv, python, fetchurl, openssl, boost }: stdenv.mkDerivation rec { name = "swiften-${version}"; - version = "4.0"; + version = "4.0.2"; buildInputs = [ python ]; propagatedBuildInputs = [ openssl boost ]; src = fetchurl { url = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; - sha256 = "06bk45hxqmny8z7x78ycrfrazq6xdzv5c28i8x0lgc85j03b5dsh"; + sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; }; buildPhase = '' diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index b9fba467457e..a7b7f5243fb0 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -2,13 +2,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "tbb-${version}"; - version = "2018_U4"; + version = "2018_U5"; src = fetchFromGitHub { owner = "01org"; repo = "tbb"; rev = version; - sha256 = "00y7b4x0blkn0cymnrbh6fw7kp4xcdp4bi14rj33sl1lypawa1j6"; + sha256 = "080df8h2whnly6n9pslpg07dc9vr0p45gqgy9qijpjvxkjwfkdkp"; }; makeFlags = concatStringsSep " " ( diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index bec6f2d0f4bc..46eac0fb88bb 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "C++ URI library"; - homepage = http://cpp-netlib.org; + homepage = https://cpp-netlib.org; license = stdenv.lib.licenses.boost; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 32ce856eddd3..e17ac6d15075 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -2,14 +2,14 @@ , openssl, nss, makeWrapper }: let - version = "1.2.25"; + version = "1.2.26"; in stdenv.mkDerivation rec { name = "xmlsec-${version}"; src = fetchurl { url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "1lpwj8dxwhha54sby0v5axjk79h56jnhjjiwiasbbk15vwzahz4n"; + sha256 = "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index 9541d62e1601..5c42f7bc3289 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -23,7 +23,7 @@ let "armv7a-unknown-linux-androideabi" = { arch = "arm"; triple = "arm-linux-androideabi"; - gccVer = "4.8"; + gccVer = "4.9"; }; "aarch64-unknown-linux-android" = { arch = "arm64"; diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 6a647192e091..150d8d758699 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, ncurses5, p7zip, lib, makeWrapper +{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which , platformTools, python3, libcxx, version, sha256 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { phases = "buildPhase"; - nativeBuildInputs = [ p7zip makeWrapper file ]; + nativeBuildInputs = [ unzip makeWrapper file ]; buildCommand = let bin_path = "$out/bin"; @@ -32,11 +32,8 @@ stdenv.mkDerivation rec { ]) + ":${platformTools}/platform-tools"; in '' mkdir -pv $out/libexec - mkdir -pv $out/lib64 - ln -s ${ncurses5.out}/lib/libncursesw.so.5 $out/lib64/libtinfo.so.5 - ln -s ${ncurses5.out}/lib/libncurses.so.5 $out/lib64/libncurses.so.5 cd $out/libexec - 7z x $src + unzip -qq $src patchShebangs ${pkg_path} @@ -58,11 +55,16 @@ stdenv.mkDerivation rec { } cd ${pkg_path} - find $out \( \ + # Steps to reduce output size + rm -rf docs sources tests + # We only support cross compiling with gcc for now + rm -rf toolchains/*-clang* toolchains/llvm* + + find ${pkg_path}/toolchains \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ - --set-rpath $out/lib64:${stdenv.lib.makeLibraryPath [ libcxx.out zlib.out ncurses5 ]} {} \; + --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \; # fix ineffective PROGDIR / MYNDKDIR determination for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"} do diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 3b5da19da9e1..44fa961b992f 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -49,7 +49,12 @@ stdenv.mkDerivation rec { -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch } cd ${pkg_path} - find $out \( \ + # Steps to reduce output size + rm -rf docs sources tests + # We only support cross compiling with gcc for now + rm -rf toolchains/*-clang* toolchains/llvm-* + + find ${pkg_path}/toolchains \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 699af16cf041..a90c9f8476e3 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper +{ stdenv, stdenv_32bit, fetchurl, fetchzip, unzip, makeWrapper , platformTools, buildTools, support, supportRepository, platforms, sysimages, addons, sources , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, libGLU_combined, alsaLib , freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus @@ -8,7 +8,15 @@ { platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false , useGooglePlayServices ? false, useInstantApps ? false }: -let inherit (stdenv.lib) makeLibraryPath; in +let inherit (stdenv.lib) makeLibraryPath; + + googleRepository = let version = "gms_v9_rc41_wear_2_0_rc6"; + in fetchzip rec { + url = "https://dl-ssl.google.com/android/repository/google_m2repository_${version}.zip"; + sha256 = "0k99xmynv0k62d301zx5jnjkddflr51i5lb02l9incg7m5cn8kzx"; + }; + +in stdenv.mkDerivation rec { name = "android-sdk-${version}"; @@ -168,6 +176,8 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString useInstantApps "ln -s ${addons.instant_apps}/whsdk instantapps"} + ln -s ${googleRepository} m2repository + cd ../.. # Symlink required sources diff --git a/pkgs/development/mobile/androidenv/build-gradle-app.nix b/pkgs/development/mobile/androidenv/build-gradle-app.nix new file mode 100644 index 000000000000..1ca51fae1c29 --- /dev/null +++ b/pkgs/development/mobile/androidenv/build-gradle-app.nix @@ -0,0 +1,104 @@ +{ stdenv, androidsdk, jdk, androidndk, gnumake, gawk, file +, which, gradle, fetchurl, buildEnv, runCommand }: + +args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false + , useExtraSupportLibs ? false, useGooglePlayServices ? false + , release ? false, keyStore ? null, keyAlias ? null + , keyStorePassword ? null, keyAliasPassword ? null + , useNDK ? false, buildInputs ? [], mavenDeps, gradleTask + , buildDirectory ? "./.", acceptAndroidSdkLicenses ? false }: + +assert release -> keyStore != null; +assert release -> keyAlias != null; +assert release -> keyStorePassword != null; +assert release -> keyAliasPassword != null; +assert acceptAndroidSdkLicenses; + +let + inherit (stdenv.lib) optionalString; + + m2install = { repo, version, artifactId, groupId + , jarSha256, pomSha256, aarSha256, suffix ? "" }: + let m2Name = "${artifactId}-${version}"; + m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}"; + in runCommand m2Name {} ('' + mkdir -p $out/m2/${m2Path} + '' + optionalString (jarSha256 != null) '' + install -D ${fetchurl { + url = "${repo}${m2Path}/${m2Name}${suffix}.jar"; + sha256 = jarSha256; + }} $out/m2/${m2Path}/${m2Name}${suffix}.jar + '' + optionalString (pomSha256 != null) '' + install -D ${fetchurl { + url = "${repo}${m2Path}/${m2Name}${suffix}.pom"; + sha256 = pomSha256; + }} $out/m2/${m2Path}/${m2Name}${suffix}.pom + '' + optionalString (aarSha256 != null) '' + install -D ${fetchurl { + url = "${repo}${m2Path}/${m2Name}${suffix}.aar"; + sha256 = aarSha256; + }} $out/m2/${m2Path}/${m2Name}${suffix}.aar + ''); + + androidsdkComposition = androidsdk { + inherit platformVersions useGoogleAPIs + useExtraSupportLibs useGooglePlayServices; + abiVersions = [ "armeabi-v7a" ]; + }; +in +stdenv.mkDerivation ({ + name = stdenv.lib.replaceChars [" "] [""] name; + + ANDROID_HOME = "${androidsdkComposition}/libexec"; + ANDROID_NDK_HOME = "${androidndk}/libexec/${androidndk.name}"; + + buildInputs = [ jdk gradle ] ++ + stdenv.lib.optional useNDK [ androidndk gnumake gawk file which ] ++ + buildInputs; + + DEPENDENCIES = buildEnv { name = "${name}-maven-deps"; + paths = map m2install mavenDeps; + }; + + buildPhase = '' + ${optionalString release '' + # Provide key signing attributes + ( echo "RELEASE_STORE_FILE=${keyStore}" + echo "RELEASE_KEY_ALIAS=${keyAlias}" + echo "RELEASE_STORE_PASSWORD=${keyStorePassword}" + echo "RELEASE_KEY_PASSWORD=${keyAliasPassword}" + ) >> gradle.properties + ''} + buildDir=`pwd` + cp -r $ANDROID_HOME $buildDir/local_sdk + chmod -R 755 local_sdk + export ANDROID_HOME=$buildDir/local_sdk + # Key files cannot be stored in the user's home directory. This + # overrides it. + export ANDROID_SDK_HOME=`pwd` + + mkdir -p "$ANDROID_HOME/licenses" + echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" + echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" + + export APP_HOME=`pwd` + + mkdir -p .m2/repository + if [ -d "$DEPENDENCIES/m2" ] ; then + cp -RL "$DEPENDENCIES"/m2/* .m2/repository/ + fi + chmod -R 755 .m2 + mkdir -p .m2/repository/com/android/support + cp -RL local_sdk/extras/android/m2repository/com/android/support/* .m2/repository/com/android/support/ + cp -RL local_sdk/extras/google/m2repository/* .m2/repository/ + gradle ${gradleTask} --offline --no-daemon -g ./tmp -Dmaven.repo.local=`pwd`/.m2/repository + ''; + + installPhase = '' + mkdir -p $out + mv ${buildDirectory}/build/outputs/apk/*.apk $out + + mkdir -p $out/nix-support + echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products + ''; +} // builtins.removeAttrs args ["name" "mavenDeps"]) diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 5846e4fb6de0..7c050698391b 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -2,6 +2,8 @@ , includeSources ? true }: +# TODO: use callPackage instead of import to avoid so many inherits + rec { platformTools = import ./platform-tools.nix { inherit buildPackages pkgs; @@ -46,11 +48,16 @@ rec { }; androidsdk = import ./androidsdk.nix { - inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk libGLU_combined file alsaLib jdk coreutils libpulseaudio dbus; - inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig; + inherit (pkgs) stdenv fetchurl unzip makeWrapper zlib + glxinfo freetype fontconfig glib gtk2 atk + libGLU_combined file alsaLib jdk coreutils + libpulseaudio dbus fetchzip; + inherit (pkgs.xorg) libX11 libXext libXrender + libxcb libXau libXdmcp libXtst xkeyboardconfig; - inherit platformTools buildTools support supportRepository platforms sysimages addons sources includeSources; + inherit platformTools buildTools support + supportRepository platforms sysimages + addons sources includeSources; stdenv_32bit = pkgs_i686.stdenv; }; @@ -215,9 +222,11 @@ rec { useInstantApps = true; }; + androidsdk_latest = androidsdk_8_0; + androidndk_10e = import ./androidndk.nix { inherit (buildPackages) - p7zip makeWrapper; + unzip makeWrapper; inherit (pkgs) stdenv fetchurl zlib ncurses5 lib python3 libcxx coreutils file findutils gawk gnugrep gnused jdk which; @@ -228,7 +237,7 @@ rec { androidndk_16b = import ./androidndk.nix { inherit (buildPackages) - p7zip makeWrapper; + unzip makeWrapper; inherit (pkgs) stdenv fetchurl zlib ncurses5 lib python3 libcxx coreutils file findutils gawk gnugrep gnused jdk which; @@ -237,9 +246,9 @@ rec { sha256 = "00frcnvpcsngv00p6l2vxj4cwi2mwcm9lnjvm3zv4wrp6pss9pmw"; }; - androidndk = import ./androidndk.nix { + androidndk_17 = import ./androidndk.nix { inherit (buildPackages) - p7zip makeWrapper; + unzip makeWrapper; inherit (pkgs) stdenv fetchurl zlib ncurses5 lib python3 libcxx coreutils file findutils gawk gnugrep gnused jdk which; @@ -247,6 +256,7 @@ rec { version = "17"; sha256 = "1jj3zy958zsidywqd5nwdyrnr72rf9zhippkl8rbqxfy8wxq2gds"; }; + androidndk = androidndk_17; androidndk_r8e = import ./androidndk_r8e.nix { inherit (buildPackages) @@ -267,7 +277,7 @@ rec { inherit androidsdk; }; - androidndkPkgs = import ./androidndk-pkgs.nix { + androidndkPkgs_17 = import ./androidndk-pkgs.nix { inherit (buildPackages) makeWrapper; inherit (pkgs) @@ -277,10 +287,11 @@ rec { # but for splicing messing up on infinite recursion for the variants we # *dont't* use. Using this workaround, but also making a test to ensure # these two really are the same. - buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk; - inherit androidndk; - targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs; + buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17; + androidndk = androidndk_17; + targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_17; }; + androidndkPkgs = androidndkPkgs_17; androidndkPkgs_10e = import ./androidndk-pkgs.nix { inherit (buildPackages) @@ -296,4 +307,10 @@ rec { androidndk = androidndk_10e; targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_10e; }; + + buildGradleApp = import ./build-gradle-app.nix { + inherit (pkgs) stdenv jdk gnumake gawk file runCommand + which gradle fetchurl buildEnv; + inherit androidsdk androidndk; + }; } diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 33dbc22123a6..c1c181a3d390 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -54,12 +54,13 @@ , "js-yaml" , "karma" , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" } +, "lcov-result-merger" +, "leetcode-cli" , "lerna" , "less" , "less-plugin-clean-css" -, "lcov-result-merger" -, "livedown" , "live-server" +, "livedown" , "meat" , "meguca" , "mocha" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index c49638910a4e..d2f1a5b965ff 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -76,13 +76,13 @@ let sha512 = "3g9wzm6hszqh30x6hmwc9l4vw51c6a224cp2y9qzlj98vzbwbc4s7lfafi67v8401qagjsdxrndnnannzz6i71krmn8svxwk3lfkwbc"; }; }; - "@nodelib/fs.stat-1.0.2" = { + "@nodelib/fs.stat-1.1.0" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz"; - sha512 = "37szl49qa9zv4jp9axp95i84m3iiqlip6lnkjc30rd7m8yzvcnlxkl7n1hqkwaq2nx8w560ldb01xhdz8cys7gmbqkdlwa3jbpmyamw"; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz"; + sha512 = "3l59qf6ykjzpr0n8wfqdzng342fg9pbrq7620if8m82cgsh8ki50yg790wl389dfs9wc97x82p2nrnfl8xxij660izj4zcghdvka11c"; }; }; "@sindresorhus/is-0.7.0" = { @@ -130,31 +130,31 @@ let sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; }; }; - "@types/node-10.1.1" = { + "@types/node-10.3.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.1.1"; + version = "10.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.1.1.tgz"; - sha512 = "35nbbgd4qp35g3nfbrsc9ndmigc9gl31xdjhx0fakfms35c6jqxpdx7m9c3pi0h3b062p31al5vas36facjhs1nmxf3bdpnrb5k3g4z"; + url = "https://registry.npmjs.org/@types/node/-/node-10.3.1.tgz"; + sha512 = "0xqz0wlddb3vi0mmlncn1ypd7sa2zv3fcq58jk7nr0xdsrwwzn9ncdq784lvg8d2k7lzq1p2kjyak5nghq0imbdj8hrmk6365lgvi92"; }; }; - "@types/node-8.10.16" = { + "@types/node-8.10.18" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.16"; + version = "8.10.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.16.tgz"; - sha512 = "2plzhji5iq482aa7kscxvsxrwscvrlrg9mxkx02nbslq31q178qki4ghi27z2lagmmzcvgm9r7ligx20bky617zx828yjap4ribnlia"; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.18.tgz"; + sha512 = "22aca7kyrl75xvc3mpqj0ws9b5aql4ikllk56r062f49ii57l096mkxpks2iq03np6chgb0c5xifnivkjpa1f9s0qwma9mh7x5sk1ss"; }; }; - "@types/node-9.6.17" = { + "@types/node-9.6.20" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "9.6.17"; + version = "9.6.20"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.6.17.tgz"; - sha512 = "3czvpaxsivpv403rqgf4865q4nv81x0y1030r3xj697ik1hp65xdrqqpxvaafbwbf29gszsi2zxag68pblgi22mc1cmbg6yjm14xyib"; + url = "https://registry.npmjs.org/@types/node/-/node-9.6.20.tgz"; + sha512 = "03zcm94d4k4hmyilhw27w8ixxm2bkkr2my3d344viq4dzadjmzc9vyabyfs085j6a3qdv1ns0bbw5m72511bwq885064cpnn58ig0wq"; }; }; "@types/request-2.47.0" = { @@ -184,139 +184,175 @@ let sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; }; }; - "@webassemblyjs/ast-1.4.3" = { + "@webassemblyjs/ast-1.5.10" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; - version = "1.4.3"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.4.3.tgz"; - sha512 = "3spjwi3cp2y297lils8dyh4277ijwg40ak6033w18yb8rffrhwm81h1ikcq407pl83kymmwb348298bpnkb1rfrggc70k6w2difkaab"; + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.10.tgz"; + sha512 = "29rz7dwz37xly94s2qgvrs86i2nsgpiqp1zmlp6bm7bzrkhggjbkh59yc1b23sdpcbx3kzlv04si91jg8x7skryfz50jy2zljw9n4z0"; }; }; - "@webassemblyjs/floating-point-hex-parser-1.4.3" = { + "@webassemblyjs/floating-point-hex-parser-1.5.10" = { name = "_at_webassemblyjs_slash_floating-point-hex-parser"; packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.4.3"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.3.tgz"; - sha512 = "13vsay3gcir9hbx3kznsymnw558as2mrvy8gfymy5wq4k76qwzrkfclxgk5wim8p4f56acyjj61pbin9vzr1wvr6j7r7h9hbd4f8d6z"; + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.10.tgz"; + sha512 = "09bsb6jvhfcnyyrqp0h6m063k4knang2iwf3n6rv05i87wdcdgjvq1dqrsz50hnijj54sb0hym4rp1bikpg1k8rnqxpjkl19vzqgkly"; }; }; - "@webassemblyjs/helper-buffer-1.4.3" = { + "@webassemblyjs/helper-api-error-1.5.10" = { + name = "_at_webassemblyjs_slash_helper-api-error"; + packageName = "@webassemblyjs/helper-api-error"; + version = "1.5.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.10.tgz"; + sha512 = "1fdzg33vfzsbbfmscl1bmhkwjfn2jsfihypdfgbvw3449aw9ksqvlf77dsghnvx30862zdqa9rawpz65md1kz6swhh8pqqya83s7r9r"; + }; + }; + "@webassemblyjs/helper-buffer-1.5.10" = { name = "_at_webassemblyjs_slash_helper-buffer"; packageName = "@webassemblyjs/helper-buffer"; - version = "1.4.3"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.3.tgz"; - sha512 = "29i4iwxw7bdqp5jpdvq7x2yvsiihzvhxngq7dcx8h29n3qxbpx5gb7bnpkfrf1wdipnyn3786r5ghfnjgdlc4psa865yibyg1j8mkvv"; + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.10.tgz"; + sha512 = "3670gasr1syqrkikxaq2qb84zhzn5ll9cmdzm7ynhwn05xd2537jzy93qm5hp82w5iakm4l11dcnz3vclsxbmgcjw1pifz4h0yj125j"; }; }; - "@webassemblyjs/helper-code-frame-1.4.3" = { + "@webassemblyjs/helper-code-frame-1.5.10" = { name = "_at_webassemblyjs_slash_helper-code-frame"; packageName = "@webassemblyjs/helper-code-frame"; - version = "1.4.3"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.3.tgz"; - sha512 = "3rlq4pj6pnf5j1xhdpd2i6b8ajsgdv5hkmlzahr45yv4p6f6rlsi04ns0kcq3qprlmsim99qkisa660xk4bd0mi58d0crbcsc90fn7l"; + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.10.tgz"; + sha512 = "1jns41f077g54hga6qf9sycn4savzrz8ww6vpzffkyhf5m0kzrb1lm76ja7736xsb3aws1xr01l55lhp7hfslfazabc8c38cys5wqyn"; }; }; - "@webassemblyjs/helper-fsm-1.4.3" = { + "@webassemblyjs/helper-fsm-1.5.10" = { name = "_at_webassemblyjs_slash_helper-fsm"; packageName = "@webassemblyjs/helper-fsm"; - version = "1.4.3"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.3.tgz"; - sha512 = "04nq8mpmb966xss2qhg9rzp046awfhx20kp8p6qp27fnhv65krbay68sfs5j7gp3r4ry7xd153znkdp1vlkxppy8n44vvrylppmi0r4"; + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.10.tgz"; + sha512 = "0zz5va8i8ba6izqash183izgahn7sq56kvv5x8bw6fny5dznnhwc8b8139r5c6x8ikpny4dp84sq8zlfl38lswqrpjrlf47x65achks"; }; }; - "@webassemblyjs/helper-wasm-bytecode-1.4.3" = { + "@webassemblyjs/helper-module-context-1.5.10" = { + name = "_at_webassemblyjs_slash_helper-module-context"; + packageName = "@webassemblyjs/helper-module-context"; + version = "1.5.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.10.tgz"; + sha512 = "3z3cmlj3vblcrhh3n0774jfgs3c16pkambkfrgl15ckkqa6rpw4mvxa55gpx7rar4bb7nriig0hlqhww3k5y3lk4phj2j75c16qmvbi"; + }; + }; + "@webassemblyjs/helper-wasm-bytecode-1.5.10" = { name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.4.3"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.3.tgz"; - sha512 = "1wm9mkc0qy5srk9q78842pl0vkn9nvwlh6bci2615vbyw625dnrry390i60w4h53fkbdfp9jj550ggvdw9algcg48xsvl4ffvwd5di3"; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.10.tgz"; + sha512 = "1l0wq3agvx1b0msmb2ibpyxip633x8mymgsr0ydgri082mdvigwi559zjfqrpanffalbj28zk016lqjgsgklp6s3ipld4g4j0qihynj"; }; }; - "@webassemblyjs/helper-wasm-section-1.4.3" = { + "@webassemblyjs/helper-wasm-section-1.5.10" = { name = "_at_webassemblyjs_slash_helper-wasm-section"; packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.4.3"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.3.tgz"; - sha512 = "34nmg0qsq0wn6m9r9zjh3jpb0qwr4g7a234x0ws78q4n9dvv1q5ynp2c3ygqnmc1gixy99g6w87l92xf5zjbrr87zsbvnp1xxw9wk57"; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.10.tgz"; + sha512 = "39jg659fxagbr6n82qncd7bkpf0fp17aqhg7wm5ga22kxd9q6b1g40si8m9dg2jjxnc1qn3kzj06xcs0nrkfznkzqc2dy3hpxpglwdd"; }; }; - "@webassemblyjs/leb128-1.4.3" = { + "@webassemblyjs/ieee754-1.5.10" = { + name = "_at_webassemblyjs_slash_ieee754"; + packageName = "@webassemblyjs/ieee754"; + version = "1.5.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.10.tgz"; + sha512 = "2rn339x1rz3hy3x988ikha64ry6f4lhxbj8khy3bafpmcprs6wxpg9wqjc6bbp778j7cz811za487knm0mjcc1ya677lxwhmgk4wsar"; + }; + }; + "@webassemblyjs/leb128-1.5.10" = { name = "_at_webassemblyjs_slash_leb128"; packageName = "@webassemblyjs/leb128"; - version = "1.4.3"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.4.3.tgz"; - sha512 = "0lzzzxr5rk3qqg3ik3hm7yw0lgcvx334g75aphf2l3rsf8pxwycak36v5xsqkavvb4acmh5lddgx2c5sg5al7bwb11y9klgnhj0pvg2"; + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.10.tgz"; + sha512 = "28s1rxcix7qw6hz2cb3lnfhpyhz61byynyrmd72ddfm5ka8lpizqb2g916ijxz25kjfxcqnls9n88z7spyv1br2lkkircci5r7xdq3g"; }; }; - "@webassemblyjs/validation-1.4.3" = { - name = "_at_webassemblyjs_slash_validation"; - packageName = "@webassemblyjs/validation"; - version = "1.4.3"; + "@webassemblyjs/utf8-1.5.10" = { + name = "_at_webassemblyjs_slash_utf8"; + packageName = "@webassemblyjs/utf8"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.4.3.tgz"; - sha512 = "02y4zsfg7y963d4i63g51xackih6zvs8szy2qlki5xmkfq2ywl97dwbds4wycw6pjwhwivzd4ilmlq37larmxmqsamdjxz1lwqd3sj7"; + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.10.tgz"; + sha512 = "16yad2ja1si9dx2rk2ix4ph5fq2hp3diyyqrcgz7s06i2rhh4h339q6a3r0xqmfn9m38nwsi11rb9xrz28093s3p8qkml2xjvi380ri"; }; }; - "@webassemblyjs/wasm-edit-1.4.3" = { + "@webassemblyjs/wasm-edit-1.5.10" = { name = "_at_webassemblyjs_slash_wasm-edit"; packageName = "@webassemblyjs/wasm-edit"; - version = "1.4.3"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.3.tgz"; - sha512 = "2knsyvscajz7vi6pm96i1azjxc3d574hwbninxgr5w6lyw3pslnxv41piv565kjdn5g6qqyh0jk6jjbvi2sm9dqzixgbm7vgr9b0fxb"; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.10.tgz"; + sha512 = "3xbz8wabffmhmwjvhqdfj2z716q5mhsyq05bfpdfpx49jmjrwgfqc4gqjdfpkh36wlpxm1w7rx8ji3ppwxbpan8wy09xyilj31ikcws"; }; }; - "@webassemblyjs/wasm-gen-1.4.3" = { + "@webassemblyjs/wasm-gen-1.5.10" = { name = "_at_webassemblyjs_slash_wasm-gen"; packageName = "@webassemblyjs/wasm-gen"; - version = "1.4.3"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.3.tgz"; - sha512 = "1lxp49ldr0dwh3ksan4vadvdrsx9sx92wz63h8qpg096x7k3hp777kk33cbzsg6258rgp7saabz2aqmd6ggvm4y5klrf78x7zhzs7br"; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.10.tgz"; + sha512 = "2wh97zw4q7alpxmswln7z2vykyhnk9i12pfhpl0ccb7lylz3fmdbg708fq9wys8qyf9q3bfxg8v53rsp8b18xk8afk12sgk1rk2hxii"; }; }; - "@webassemblyjs/wasm-opt-1.4.3" = { + "@webassemblyjs/wasm-opt-1.5.10" = { name = "_at_webassemblyjs_slash_wasm-opt"; packageName = "@webassemblyjs/wasm-opt"; - version = "1.4.3"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.3.tgz"; - sha512 = "0mpd5ig3h708hb5ixdnjlwikbr71va6awfp1gfmff33g7a1g35avv6b4s0ibhl9qdbq32pi8s02ngazg1mcdx82p21sif11qyg7wspc"; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.10.tgz"; + sha512 = "1yscbqqp4nxz9vyyysqxh8kgzpncf1lfybxjz1kh9ihv0pm17xi4a1pi5njn82aar4si1y20ymxpfl2a7m6c5b118iihldmyra6n3fl"; }; }; - "@webassemblyjs/wasm-parser-1.4.3" = { + "@webassemblyjs/wasm-parser-1.5.10" = { name = "_at_webassemblyjs_slash_wasm-parser"; packageName = "@webassemblyjs/wasm-parser"; - version = "1.4.3"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.3.tgz"; - sha512 = "130bg13n9f63ihivbad61yw96k908g12ykw7mr8dhxswsck6rp1rbk9rr2dmgarxqd3v0jw605r4pqqpmq5iwhzj5p1bp00bjv66w19"; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.10.tgz"; + sha512 = "1slv08znc50va1mn5z425g8x9i2hlgyqbgrhf12wz4zz044wm2yl1yk17j2gp36qb15wirv3j3jlgygq4whjglxln64nz56spna4r2m"; }; }; - "@webassemblyjs/wast-parser-1.4.3" = { + "@webassemblyjs/wast-parser-1.5.10" = { name = "_at_webassemblyjs_slash_wast-parser"; packageName = "@webassemblyjs/wast-parser"; - version = "1.4.3"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz"; - sha512 = "3an2lfdbzn0y8c87qzdfwny0q5di5sr36pkxisp6jq3qdb9bbcbd91nqyqyadz8gxv3zrky8qsl4a8fs0ycjn2429n2ml4m791sq422"; + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.10.tgz"; + sha512 = "1zd2pvwqbrydpp00dxnzjwxrv9nbi91j13bpr1an5jlsj3jy2h0x96frgjmv61bqf4l5vaxwdzbf58qhnhwx189ldh433iaim7mgr24"; }; }; - "@webassemblyjs/wast-printer-1.4.3" = { + "@webassemblyjs/wast-printer-1.5.10" = { name = "_at_webassemblyjs_slash_wast-printer"; packageName = "@webassemblyjs/wast-printer"; - version = "1.4.3"; + version = "1.5.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.10.tgz"; + sha512 = "3qwkz89g5fgn3hwbm7fb4v0zdgq2vr8nb98cg4w0r5za21xry06m8yzwka5j6h9qxz2qqxy019mfxxga03c0g8v8lw5fkf4d4kdk34z"; + }; + }; + "@zeit/schemas-1.2.0" = { + name = "_at_zeit_slash_schemas"; + packageName = "@zeit/schemas"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.4.3.tgz"; - sha512 = "2v460znblyp8svk9nm0k52kvhmgsk2cr6yw0cjgh9r22db3id8dd0inn2xgkbxvcrpi0hn4zbcz75nb58zshv4jp6k35wnzm7hy818j"; + url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-1.2.0.tgz"; + sha512 = "1jdi566pj9g0pyq79li3lzzbschnib5ilxka7rkji83v7smba5p0r37pmm0z1dma0bjgijfki8b3bd3mp2qzh23al03h5ikdr189iw9"; }; }; "CSSselect-0.4.1" = { @@ -364,13 +400,13 @@ let sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd"; }; }; - "JSONStream-1.3.2" = { + "JSONStream-1.3.3" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz"; - sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.3.tgz"; + sha512 = "0r6wmwsqyg9ig629f43sjxca6wvsjcbgcmq1db77nnwn0vg3ipz71y0lwg6an49jbkrfpxsf2g56jhwjs8ims1hkmz7k5bzjrcplanx"; }; }; "JSV-4.0.2" = { @@ -382,6 +418,15 @@ let sha1 = "d077f6825571f82132f9dffaed587b4029feff57"; }; }; + "abab-1.0.4" = { + name = "abab"; + packageName = "abab"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz"; + sha1 = "5faad9c2c07f60dd76770f71cf025b62a63cfd4e"; + }; + }; "abbrev-1.0.9" = { name = "abbrev"; packageName = "abbrev"; @@ -499,13 +544,13 @@ let sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; }; }; - "acorn-5.5.3" = { + "acorn-5.6.2" = { name = "acorn"; packageName = "acorn"; - version = "5.5.3"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz"; - sha512 = "0wmwifv9mm9gqcir9zbz5y1gl1rgwwprqh1f3csjydj8kf3byca7img3rh5b54kbnw3ik34bc6ynbnzsd01zmxrsfdvjv95hn84rpld"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz"; + sha512 = "2xy044ibkfyb71si1az16c4bbfbikr65l8z8jsg89xg2rhdbyk1fmiy9zrxr3p0qky41jvnqsa8rp5nww3pldpgycr628sx9vafhk6d"; }; }; "acorn-dynamic-import-3.0.0" = { @@ -562,15 +607,6 @@ let sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a"; }; }; - "adal-node-0.1.21" = { - name = "adal-node"; - packageName = "adal-node"; - version = "0.1.21"; - src = fetchurl { - url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.21.tgz"; - sha1 = "11c58e427b7e83d9ef2d77c9c3a2a60fbb0b6cc8"; - }; - }; "adal-node-0.1.28" = { name = "adal-node"; packageName = "adal-node"; @@ -616,13 +652,13 @@ let sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; }; }; - "addons-linter-0.41.0" = { + "addons-linter-1.0.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "0.41.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.41.0.tgz"; - sha512 = "1cdq1s3zaz5547yn12h23434f3g6jjchrjdwv7x0qbg38zilaix5x04ajy87pw94rs1mk6kkawa517whzjn0jd7kpx6nac75qw7rcwf"; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.0.0.tgz"; + sha512 = "2g3j1vw3qp8b66kqkgg256aqsbdr1m65g9y2hcaxp1rl38zqdc0ph7x6ckxl1sm0dnrkl39q7pz3y4m6n05g4yf2dhcbg7lqwjv9h79"; }; }; "addr-to-ip-port-1.4.3" = { @@ -634,15 +670,6 @@ let sha512 = "0cjsq4lq001pd9nr0j7lc41vxyrf0x9qpaq8d8989n1grjzzbv8vjdq9l607ab8pgfh1qkx0vhgva4wsnfndkb2c955f04jq8dx78gq"; }; }; - "address-1.0.3" = { - name = "address"; - packageName = "address"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz"; - sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng"; - }; - }; "addressparser-0.3.2" = { name = "addressparser"; packageName = "addressparser"; @@ -778,15 +805,6 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.3.0" = { - name = "ajv"; - packageName = "ajv"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.3.0.tgz"; - sha1 = "1650a41114ef00574cac10b8032d8f4c14812da7"; - }; - }; "ajv-6.5.0" = { name = "ajv"; packageName = "ajv"; @@ -1039,6 +1057,15 @@ let sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; }; }; + "ansi-styles-3.2.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; + sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; + }; + }; "ansi-styles-3.2.1" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -1147,13 +1174,13 @@ let sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a"; }; }; - "append-tree-2.4.1" = { + "append-tree-2.4.4" = { name = "append-tree"; packageName = "append-tree"; - version = "2.4.1"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.1.tgz"; - sha512 = "2zb14nlfxs726ng8jhfpf6n9b9kw32smg2krcl0vj90dfrkcc20fm36j2zgdd49b2ln1z4jz2wvvy4qgss14zzfr3rps719h6vlyjg7"; + url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.4.tgz"; + sha512 = "0gfvfdnxy8zznb198pbzshiqg8vnn2icjbc49dmy158qqb33w2ifh86migd8xighgbjl66lhqlb9cvqv2ghviri1k7kh9kw8hr19wxc"; }; }; "appendable-cli-menu-2.0.0" = { @@ -1219,13 +1246,22 @@ let sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; }; }; - "are-we-there-yet-1.1.4" = { + "are-we-there-yet-1.1.5" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; - version = "1.1.4"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6"; + }; + }; + "arg-2.0.0" = { + name = "arg"; + packageName = "arg"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz"; - sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; + url = "https://registry.npmjs.org/arg/-/arg-2.0.0.tgz"; + sha512 = "3iwdcvp3762nzympp65j1rpz06a18vjrdnzdr14ap4baqnyzfa52wzwwjdjl3x93akzs70vmkvl7yahjy6p0j3n5cnmgkx7699m64sz"; }; }; "argparse-0.1.15" = { @@ -1264,15 +1300,6 @@ let sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; }; }; - "args-4.0.0" = { - name = "args"; - packageName = "args"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/args/-/args-4.0.0.tgz"; - sha512 = "2xd628jhziygi9jr16ckq557189nw5lracgzcpv8ddvymc3mjxvqzffgp68wmgknw6ps7nliwwyismriv6z4snvn0xmm7kwbrafbgp1"; - }; - }; "arr-diff-1.1.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -1660,13 +1687,13 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "ast-types-0.11.3" = { + "ast-types-0.11.5" = { name = "ast-types"; packageName = "ast-types"; - version = "0.11.3"; + version = "0.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.3.tgz"; - sha512 = "2lga5vgh6bz1vii6kfdy2k1g99arw9cikxx8705p9v92rqn7ksdvbzjvhgfdf4s21nbfafrxjh3hrr5jz2yq43dr4hw7hqdvgjnh3jw"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.5.tgz"; + sha512 = "0rp4wq8vmdvsklw32gsxgpv0b41cc92gpkd2nyw6x88ah30c5vhxdqwic9jm16d490mgp8bmrnjjpcm382z4jjhv0fg3zmvjzxyi650"; }; }; "ast-types-0.9.6" = { @@ -1804,6 +1831,15 @@ let sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4"; }; }; + "async-2.6.1" = { + name = "async"; + packageName = "async"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz"; + sha512 = "2aqgkis9ac37q6jv6zspfpj3rikh2vr9fdch7wajrvqihq5sxyd1gh5zv65hy0y3r22l720qkidwh6img8dngqcjj0dwrl0dwpj5lbw"; + }; + }; "async-each-1.0.1" = { name = "async-each"; packageName = "async-each"; @@ -1867,13 +1903,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.241.1" = { + "aws-sdk-2.252.1" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.241.1"; + version = "2.252.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.241.1.tgz"; - sha1 = "ae4e1ba772cc17284df00c03b58dcf914d5c72f9"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.252.1.tgz"; + sha1 = "4ce45b16dc408883e20a564bd86270c67f25bb60"; }; }; "aws-sign-0.2.0" = { @@ -1939,31 +1975,31 @@ let sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; - "azure-arm-batch-0.3.0" = { + "azure-arm-batch-3.1.0" = { name = "azure-arm-batch"; packageName = "azure-arm-batch"; - version = "0.3.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-0.3.0.tgz"; - sha1 = "78b000b10a16b97dcf273729b4dba919efbfdaf7"; + url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-3.1.0.tgz"; + sha512 = "282vyr654axav0gvwn1xalga7dlx9fh3ddk7qbkppvi2mwcv6zsin39aim0bzgif5rp4d18qhmaydhm4x5raayyvhkmzvzqgwx72103"; }; }; - "azure-arm-cdn-1.0.3" = { + "azure-arm-cdn-4.0.1" = { name = "azure-arm-cdn"; packageName = "azure-arm-cdn"; - version = "1.0.3"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.3.tgz"; - sha1 = "39db281679dcdd33cb6ce032383b192430476412"; + url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-4.0.1.tgz"; + sha512 = "11r3v8l2q4w8jl8a83j13kjx4fi1casnyw9nwsxfsgn8aams01gyqx66447bzpamry61f17wlalmadbmf1kv9v713hl5ifpdxqgjmcr"; }; }; - "azure-arm-commerce-0.2.0" = { + "azure-arm-commerce-2.0.0" = { name = "azure-arm-commerce"; packageName = "azure-arm-commerce"; - version = "0.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.2.0.tgz"; - sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd"; + url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-2.0.0.tgz"; + sha512 = "0jkmkc889jyfb5513z5xffpwnk5hcr89apxnhh9i20adw0kanri6ifncrf33d36xkw5mjrnwy7hizv10hmgjcfsbvrpcrg7ind83hmi"; }; }; "azure-arm-compute-3.0.0-preview" = { @@ -1993,22 +2029,22 @@ let sha1 = "c8b7c113016c92703a84dc28d29ba518e8c64763"; }; }; - "azure-arm-devtestlabs-0.1.0" = { + "azure-arm-devtestlabs-2.1.1" = { name = "azure-arm-devtestlabs"; packageName = "azure-arm-devtestlabs"; - version = "0.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-devtestlabs/-/azure-arm-devtestlabs-0.1.0.tgz"; - sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40"; + url = "https://registry.npmjs.org/azure-arm-devtestlabs/-/azure-arm-devtestlabs-2.1.1.tgz"; + sha512 = "1dw30m5r07pla1gba31w8d37ijqsca267qwrxlip5q24fsw429r5w4zd4qmvpd31v9wi6zrxcb0nz5m23rgbgff4n0vza1b6dhl55sb"; }; }; - "azure-arm-dns-2.0.0-preview" = { + "azure-arm-dns-2.1.0" = { name = "azure-arm-dns"; packageName = "azure-arm-dns"; - version = "2.0.0-preview"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-2.0.0-preview.tgz"; - sha1 = "3dd0645c7f1767fe150e00a8ac33b4b55bce9b8c"; + url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-2.1.0.tgz"; + sha512 = "3lxdjr1mn9sfvqsjwdy1plyb7qkg6379j9xkg47gabr5g9rpqhmfljpii9ln2azz0rizr4bbxy348b28m9g6xx0cb7jhdkarww2sbgz"; }; }; "azure-arm-hdinsight-0.2.2" = { @@ -2047,22 +2083,22 @@ let sha1 = "f63a6dad0355633d9347fb403f417fb195fe3b91"; }; }; - "azure-arm-network-5.1.0" = { + "azure-arm-network-5.3.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "5.1.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.1.0.tgz"; - sha1 = "b2be4bfc27173b1cb7fc54425cbee27824f65b52"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.3.0.tgz"; + sha512 = "25c3hgi59w01ysjhk9hdzvx2viv7v3cknkbz9iwfhnnj6gz4rrzxhair0s8r5nfmcfxgz5y7qy6lvld1qgjq9j7z9cz0z582p2avs4f"; }; }; - "azure-arm-powerbiembedded-0.1.0" = { + "azure-arm-powerbiembedded-0.1.1" = { name = "azure-arm-powerbiembedded"; packageName = "azure-arm-powerbiembedded"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-powerbiembedded/-/azure-arm-powerbiembedded-0.1.0.tgz"; - sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970"; + url = "https://registry.npmjs.org/azure-arm-powerbiembedded/-/azure-arm-powerbiembedded-0.1.1.tgz"; + sha1 = "7103c94e06b3ddf628293f60e02fd0ba8f9c3ca9"; }; }; "azure-arm-rediscache-0.2.3" = { @@ -2083,22 +2119,22 @@ let sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6"; }; }; - "azure-arm-servermanagement-0.1.2" = { + "azure-arm-servermanagement-1.1.0" = { name = "azure-arm-servermanagement"; packageName = "azure-arm-servermanagement"; - version = "0.1.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-servermanagement/-/azure-arm-servermanagement-0.1.2.tgz"; - sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; + url = "https://registry.npmjs.org/azure-arm-servermanagement/-/azure-arm-servermanagement-1.1.0.tgz"; + sha512 = "1wfj1vg7q2f8s20x8lssxsjqkj52in2rbrz2lhh1cx360l9xhr3z6pkyxha44km23xhfqamqm2xdvpz08kx3y0v8cx6b9sl7qydflqs"; }; }; - "azure-arm-storage-0.15.0-preview" = { + "azure-arm-storage-5.0.0" = { name = "azure-arm-storage"; packageName = "azure-arm-storage"; - version = "0.15.0-preview"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.15.0-preview.tgz"; - sha1 = "e25c13a1e716656caa019a7bc9fabe05c5062b7e"; + url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-5.0.0.tgz"; + sha512 = "24p38zb5jpf1bgm831ciqh70yp1qdvaw2vqxx3krj9lqn1d4vn0yw60whwzfj73ysliz3ysmwg6xskjypza3i497w8x13zk0r2278xj"; }; }; "azure-arm-trafficmanager-1.1.0-preview" = { @@ -2110,13 +2146,13 @@ let sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50"; }; }; - "azure-arm-website-0.11.4" = { + "azure-arm-website-0.11.5" = { name = "azure-arm-website"; packageName = "azure-arm-website"; - version = "0.11.4"; + version = "0.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.4.tgz"; - sha1 = "6972dd9844a0d12376d74014b541c49247caa37d"; + url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.5.tgz"; + sha1 = "51942423e1238ec19e551926353a8e9f73bc534a"; }; }; "azure-asm-compute-0.18.0" = { @@ -2200,31 +2236,31 @@ let sha1 = "91e2e63d73869090613cd42ee38a3823e55f4447"; }; }; - "azure-asm-website-0.10.4" = { + "azure-asm-website-0.10.6" = { name = "azure-asm-website"; packageName = "azure-asm-website"; - version = "0.10.4"; + version = "0.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.4.tgz"; - sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; + url = "https://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.6.tgz"; + sha1 = "822f920f22b8572a014714a403e6aa009ed59295"; }; }; - "azure-batch-0.5.2" = { + "azure-batch-3.2.1" = { name = "azure-batch"; packageName = "azure-batch"; - version = "0.5.2"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.2.tgz"; - sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb"; + url = "https://registry.npmjs.org/azure-batch/-/azure-batch-3.2.1.tgz"; + sha512 = "3lfnm1rnai975asy9hxk4rvp5rkmhp0ky4p40ips8a7gg5sjkygwy31mb7aqf794zqw27zrp6cn5ncirmc3xhaglzkrginillni64gx"; }; }; - "azure-common-0.9.18" = { + "azure-common-0.9.20" = { name = "azure-common"; packageName = "azure-common"; - version = "0.9.18"; + version = "0.9.20"; src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.18.tgz"; - sha1 = "38b960f4ddadd44d34f52e8b85d5d1e0226440fd"; + url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.20.tgz"; + sha512 = "1yph9maam38j6pjydv947ndixp1kc22cjq7q1l03mgn0ywqpp0rm0sflnszplmsyjl88z8sj40ljgz32j02vnpajcd9mnkmnlw4a36j"; }; }; "azure-gallery-2.0.0-pre.18" = { @@ -2236,31 +2272,31 @@ let sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6"; }; }; - "azure-graph-2.1.0-preview" = { + "azure-graph-2.2.0" = { name = "azure-graph"; packageName = "azure-graph"; - version = "2.1.0-preview"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-graph/-/azure-graph-2.1.0-preview.tgz"; - sha1 = "2005abb76d9193cbfb90f25ee92823cde87d4f5f"; + url = "https://registry.npmjs.org/azure-graph/-/azure-graph-2.2.0.tgz"; + sha512 = "0gj2pmkj5qshdxgk3hzrrp9r03x42h69zcnak979ij1gc6q3bx4bn0b5ksdqjxppj4wjcfqwhc76a6rn6n1fyp5kc59gpjhrsa0pgb9"; }; }; - "azure-keyvault-0.11.0" = { + "azure-keyvault-1.0.0" = { name = "azure-keyvault"; packageName = "azure-keyvault"; - version = "0.11.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.11.0.tgz"; - sha1 = "379e6c2ed4155de86caff63243923c7330d34802"; + url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-1.0.0.tgz"; + sha1 = "d630f98032aadbb5e72fb04d2da49b368e441c9e"; }; }; - "azure-monitoring-0.10.2" = { + "azure-monitoring-0.10.5" = { name = "azure-monitoring"; packageName = "azure-monitoring"; - version = "0.10.2"; + version = "0.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.2.tgz"; - sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57"; + url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.5.tgz"; + sha1 = "b7d21e2cc76f94a5f72cf3ccb03ac9355d858d81"; }; }; "azure-servicefabric-0.1.5" = { @@ -2272,13 +2308,13 @@ let sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6"; }; }; - "azure-storage-2.1.0" = { + "azure-storage-2.8.3" = { name = "azure-storage"; packageName = "azure-storage"; - version = "2.1.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz"; - sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.8.3.tgz"; + sha512 = "0ddx9n5y0pzsgc8287f73fss5gnhdzvsmxhbszfh2qdld2d05h1knm76i3dwkbq2j5q6yx0r06x2sn58380y69mpv4jnbidim8xvil1"; }; }; "babel-code-frame-6.26.0" = { @@ -3145,13 +3181,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.28" = { + "big-integer-1.6.30" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.28"; + version = "1.6.30"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.28.tgz"; - sha512 = "3b56jaa0yvrl9p90c0phnhyh02sv9hxssl8y0nghv91ra8akrcdpxm55c1gf5w1is9991wm2g0wqcr4hm5ri9lmzwd8gc9d72pzg51q"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.30.tgz"; + sha512 = "0mpq1fin33p53fjgylmnrc0g51raqmprdpkm51vkl2na7mar5a778mlnwv6wrj98fjcx30wijf0zms9l88ibprn36z39jpw9zpcaq1c"; }; }; "big.js-3.2.0" = { @@ -3298,13 +3334,13 @@ let sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; - "bittorrent-dht-8.3.0" = { + "bittorrent-dht-8.4.0" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.3.0.tgz"; - sha512 = "2p2fxhvwin4xnjdmbhrlwivx4a8pjzfn6mc5qxnxzl1q40xxp56wd6xrcxfq9viqjkvpc7g0j3dvgmvcywhgw41nvjyxi8pgm5v43kp"; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.4.0.tgz"; + sha512 = "18j3r8acrygcy5pdk684mlij31n25z9lqdadxsj8q8y04wpnqxql5j1v18rsfmadlafihzz2q7nwicnkis0bzl6xnpzfy01qvwby5qm"; }; }; "bittorrent-peerid-1.2.0" = { @@ -3919,13 +3955,13 @@ let sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; }; }; - "browserslist-3.2.7" = { + "browserslist-3.2.8" = { name = "browserslist"; packageName = "browserslist"; - version = "3.2.7"; + version = "3.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-3.2.7.tgz"; - sha512 = "0qzgn4n32d6hjm129k06ry17ppzywr77kwpxh2rj1i26j9x43rwx6lpjqf6nlrkf9b9mwcqidgq5gv4xl94120k69p7z9baap24p1d1"; + url = "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz"; + sha512 = "00i65frm5jkbv8pzc13i02fzd39q0ahh653zzjzhq35pz6p0idajfjqg1b7mnnlvxymihcpmd1cfhwaj51hnqjmh4alrg8sjrq6hxaq"; }; }; "bson-0.1.8" = { @@ -3964,31 +4000,22 @@ let sha512 = "1ipkzdnq03rnxyl50wmzigdbd96lh0mgzffcab80yxl38x7k316kzs3h0w0bxdjj7vqh6dw3wgb7y3rsqab0ar4ky9rbh0r1f1i2hk2"; }; }; - "buffer-alloc-1.1.0" = { + "buffer-alloc-1.2.0" = { name = "buffer-alloc"; packageName = "buffer-alloc"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz"; - sha1 = "05514d33bf1656d3540c684f65b1202e90eca303"; - }; - }; - "buffer-alloc-unsafe-0.1.1" = { - name = "buffer-alloc-unsafe"; - packageName = "buffer-alloc-unsafe"; - version = "0.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz"; - sha1 = "ffe1f67551dd055737de253337bfe853dfab1a6a"; + url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; + sha512 = "2isng7g5ld0a4ih1d38bcdqpw8jpqajmcn6vfkrqpahmhim4cfw51c1sikz5s5hnmfychcbzcxvwydn8qi6zq6mhl15anzd1110fnq8"; }; }; - "buffer-alloc-unsafe-1.0.0" = { + "buffer-alloc-unsafe-1.1.0" = { name = "buffer-alloc-unsafe"; packageName = "buffer-alloc-unsafe"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; - sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; + sha512 = "01b27ck9qpkjb3s14q703k5vi00m7lpl0zkyi91z4kxjww4b6q09frq68lm6m9hvhb5m4w0arwybncm5hia3j9kr9vd4h84qa43chsc"; }; }; "buffer-crc32-0.1.1" = { @@ -4054,13 +4081,13 @@ let sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; }; }; - "buffer-fill-0.1.1" = { + "buffer-fill-1.0.0" = { name = "buffer-fill"; packageName = "buffer-fill"; - version = "0.1.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.1.tgz"; - sha512 = "3nny0zbpnaxp1544gp7lc53jvs1jgzpmp92cy939dik36bi8lvhrsh4g082lxdplwsma22cgg9q93dw5dnbn1ljqkh4fb2i6w3lq032"; + url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz"; + sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c"; }; }; "buffer-from-0.1.2" = { @@ -4072,13 +4099,13 @@ let sha512 = "2z3dp7smyppzg5yc63hvyfxgrw5d14splmxbknz4v8g6bnncca1acr4xd6l3z13lpp4vj4120pyvk87040ajbx7v24cj9mcgdx8h9a6"; }; }; - "buffer-from-1.0.0" = { + "buffer-from-1.1.0" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz"; - sha512 = "3252laq8prm41lgzlhmc7rdj99gwcvpf7cn6j686g4qmspnl3haid5khv9pc9cfjja9wb64nwfvgdwi2kpdf125xfg48aqapwssjxpk"; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz"; + sha512 = "0ch7mwp2p7iz81hlj769cki9vapg34rp3368mbxffjync131zz3cig7vkjv4n1lfyfnaapj9axq5d6sg92a8ri6fnvggz481fb936bk"; }; }; "buffer-indexof-1.1.1" = { @@ -4522,15 +4549,6 @@ let sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; }; }; - "camelcase-5.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz"; - sha512 = "2q57983k3n95gzbhqhc0cv6krvq7nd37h837xg6favqywdda14ha7k2xbdaryni3xzzm55pvi0adrl1fbgxypaxz1kvrifnm5kb1akx"; - }; - }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -4549,13 +4567,13 @@ let sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; - "caniuse-lite-1.0.30000842" = { + "caniuse-lite-1.0.30000850" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30000842"; + version = "1.0.30000850"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000842.tgz"; - sha512 = "16dhvprw63c1dcvcn58bgf667cqldqkmmzda661xrwi0yadfmlpab913a980h6kwfk1yl0r13z4qap9g9rxqd23nhlihhghf902kswf"; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000850.tgz"; + sha512 = "109fg3d4qqzsnn1jmrjih7nhddicpkxsyhq60dhx3s6g2rgcfjas5n56h4xfncqq0j3vrbn3w0x35dhlq2cxh4khsfpq8kz8kqvhwl8"; }; }; "capture-stack-trace-1.0.0" = { @@ -4711,15 +4729,6 @@ let sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d"; }; }; - "chalk-2.3.2" = { - name = "chalk"; - packageName = "chalk"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz"; - sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4"; - }; - }; "chalk-2.4.0" = { name = "chalk"; packageName = "chalk"; @@ -4801,6 +4810,15 @@ let sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; }; }; + "chardet-0.5.0" = { + name = "chardet"; + packageName = "chardet"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz"; + sha512 = "3931r17a9qqilrj8ymqwiqrayvwaz6d7hvhscrh8s4a7cksmw0saq1bg2xk7r20mcnzbcpn4c05bii36axilkfrpj2j0gcy2shdm57m"; + }; + }; "charenc-0.0.2" = { name = "charenc"; packageName = "charenc"; @@ -4828,6 +4846,15 @@ let sha1 = "fa5ae42cc60121133d296d0b46d983215f7268ea"; }; }; + "cheerio-0.20.0" = { + name = "cheerio"; + packageName = "cheerio"; + version = "0.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cheerio/-/cheerio-0.20.0.tgz"; + sha1 = "5c710f2bab95653272842ba01c6ea61b3545ec35"; + }; + }; "cheerio-0.22.0" = { name = "cheerio"; packageName = "cheerio"; @@ -5593,13 +5620,13 @@ let sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; - "colors-1.2.5" = { + "colors-1.3.0" = { name = "colors"; packageName = "colors"; - version = "1.2.5"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz"; - sha512 = "2k2a7k096qcm5fghgcmybg96y3x5bpqb62j0zdlnxq7za4asb6vsy9i69nkg9wqfhkcbh6qzm8zzvq7q516p54awxpp2qrzm8nm3cvs"; + url = "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz"; + sha512 = "03rrn3n1k9lcwlg5xdx0cj727blwc1a0r6rnq1r8nynwni4bwqlbzlb9qp02x09pfnrfj0ihb28wsimqxiivm5k0f2wa77hmvfmffhh"; }; }; "colour-0.7.1" = { @@ -5890,13 +5917,13 @@ let sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; - "compressible-2.0.13" = { + "compressible-2.0.14" = { name = "compressible"; packageName = "compressible"; - version = "2.0.13"; + version = "2.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz"; - sha1 = "0d1020ab924b2fdb4d6279875c7d6daba6baa7a9"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz"; + sha1 = "326c5f507fbb055f54116782b969a81b67a29da7"; }; }; "compression-1.5.2" = { @@ -5944,15 +5971,6 @@ let sha1 = "708978624d856af41a5a741defdd261da752c266"; }; }; - "concat-stream-1.6.0" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz"; - sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; - }; - }; "concat-stream-1.6.2" = { name = "concat-stream"; packageName = "concat-stream"; @@ -6575,13 +6593,13 @@ let sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; }; }; - "cookiejar-2.1.1" = { + "cookiejar-2.1.2" = { name = "cookiejar"; packageName = "cookiejar"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; - sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz"; + sha512 = "302w4kd3x9k0jy5iva1k5inp3r25avz8ddpkdb20icvrizicvas253kfp6ynmrcwpxv1lafcnagggxfs5dmmd4gg07ifgzkqxsrl3rk"; }; }; "cookies-0.7.1" = { @@ -6620,13 +6638,13 @@ let sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f"; }; }; - "cordova-common-2.2.1" = { + "cordova-common-2.2.3" = { name = "cordova-common"; packageName = "cordova-common"; - version = "2.2.1"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.1.tgz"; - sha1 = "7009bc591729caa7285a588cfd6a7b54cd834f0c"; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.3.tgz"; + sha512 = "109gw0072hyc4z9lavjgbl998xq5mk2ajzz2nmiab3yz2bgmpkqllanny4np7cc5q0awf8knjymna948s34mqg9h7yjfk9g93lvmwm0"; }; }; "cordova-create-1.1.2" = { @@ -6692,13 +6710,13 @@ let sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636"; }; }; - "core-js-2.5.6" = { + "core-js-2.5.7" = { name = "core-js"; packageName = "core-js"; - version = "2.5.6"; + version = "2.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz"; - sha512 = "14myrl8hdl6z51ziv7l8326pyxfr51pil9s2glynqcj9vfpr37b9jkz9pshpb1jk7qg2wwg59hfxxqjr6x8wwhsvfqvhs5l11yia1cm"; + url = "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz"; + sha512 = "1rw87wykvh29zd2dfrylxhr1kk5lz0k9wb4ykmy6nka6slwbhsirccfy8c2br3b8d085rkly33rf55kh6z5rm9mpgxg7z301h4ckk26"; }; }; "core-util-is-1.0.2" = { @@ -7115,6 +7133,24 @@ let sha512 = "0rxlhy2ha4xjnw27ha5q8crvpqwydnhb4xnnsj2ba8i1r09n864ygl76lcjgnpnqp1qj5930qz8gnq76pwy6sr6hrb2gcfrzla67ljs"; }; }; + "cssom-0.3.2" = { + name = "cssom"; + packageName = "cssom"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz"; + sha1 = "b8036170c79f07a90ff2f16e22284027a243848b"; + }; + }; + "cssstyle-0.2.37" = { + name = "cssstyle"; + packageName = "cssstyle"; + version = "0.2.37"; + src = fetchurl { + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz"; + sha1 = "541097234cb2513c83ceed3acddc27ff27987d54"; + }; + }; "csurf-1.8.3" = { name = "csurf"; packageName = "csurf"; @@ -7205,13 +7241,13 @@ let sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425"; }; }; - "cvss-1.0.2" = { + "cvss-1.0.3" = { name = "cvss"; packageName = "cvss"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cvss/-/cvss-1.0.2.tgz"; - sha1 = "df67e92bf12a796f49e928799c8db3ba74b9fcd6"; + url = "https://registry.npmjs.org/cvss/-/cvss-1.0.3.tgz"; + sha512 = "2s5cl4bn952afccm1fqvg12k0rr7q3v8yfw78gvfclqpkdwcgxsd0r319jrmgxsz19cd2f94xg97qq8m2z14s86gszf0zam862csmyl"; }; }; "cycle-1.0.3" = { @@ -7367,13 +7403,13 @@ let sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; }; }; - "dat-node-3.5.8" = { + "dat-node-3.5.9" = { name = "dat-node"; packageName = "dat-node"; - version = "3.5.8"; + version = "3.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.8.tgz"; - sha512 = "3j28p80dwmic3g00asmcpgiv3sh3s8023x1023g7bm534h1ai8i2zryivx95gc22is64k9mynmqr2g0ny25xp1f7h1cbc25klizg8dc"; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.9.tgz"; + sha512 = "104lk78v9z8z1p5dkkn5w6ciimn7gbh83yvfcpl6vcd6fahdghak9kp95wmmfjlbas1959a156552i8a891qjbfa32q1wcanyv4yri4"; }; }; "dat-registry-4.0.0" = { @@ -7610,13 +7646,13 @@ let sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; }; }; - "decimal.js-10.0.0" = { + "decimal.js-10.0.1" = { name = "decimal.js"; packageName = "decimal.js"; - version = "10.0.0"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.0.0.tgz"; - sha512 = "1zfwp3adsdq838zcpkpm59x7kdqny1lcdk04r7fw28zy3va4jpjkrkpyyz7ifnzazpks9ky9mjb2xdrkx07nzrh909nzasps0aplcm1"; + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.0.1.tgz"; + sha512 = "0pvhjhp6gb1n7717047gvr4pnrpjw1a8kysff39v9qp665kwkf9b0zbj4y2i6gx1qh755dan7zz82wq2kdkmnhrvwv3w2mqj03mcjdy"; }; }; "decode-uri-component-0.2.0" = { @@ -7754,13 +7790,13 @@ let sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; }; }; - "deep-extend-0.5.1" = { + "deep-extend-0.6.0" = { name = "deep-extend"; packageName = "deep-extend"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz"; - sha512 = "3bzqm7nqgh7m8xjhl0q8jc0ccm9riymsfmy0144x6n2qy9v1gin2ww8s9wjlayk0xyzq9cz9pyar02yiv30mhqsj7rmw35ywrsc3jrp"; + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c"; }; }; "deep-is-0.1.3" = { @@ -8060,15 +8096,6 @@ let sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; }; }; - "detect-port-1.2.2" = { - name = "detect-port"; - packageName = "detect-port"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-port/-/detect-port-1.2.2.tgz"; - sha512 = "2q44vf4c9rqz21wc7a1pj1xz6pa2s7sp2fz9zxksmz679xh8sbfzyzhgkkbyznsgbnif013n0a6387dppcs370gdkc0dhh2jgsgv8fk"; - }; - }; "detective-4.7.1" = { name = "detective"; packageName = "detective"; @@ -8213,13 +8240,22 @@ let sha1 = "5d3160a46019e50e874195765df7d601ee55a813"; }; }; - "dispensary-0.16.0" = { + "discovery-swarm-5.1.1" = { + name = "discovery-swarm"; + packageName = "discovery-swarm"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.1.tgz"; + sha512 = "1sa0sciklf04fnha64gb01s3wqddxkzf9n1q0zyjcr3cdhn49xyql60cbxby922bqq0wd7k57b6qjk50vn4hjsk08pggzcggbvkszxg"; + }; + }; + "dispensary-0.18.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.16.0"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.16.0.tgz"; - sha1 = "7173f2828380135e3c8eb9f61719fa038c0cd133"; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.18.0.tgz"; + sha512 = "0vn5s1km4ilb4kqba3rqh0wjrfwjvskp0k58qjywkvla2zmn5df46flvzs200kxmg6fbr8rn6c22mjp0y3sj8zql1g8k3qw52772ica"; }; }; "diveSync-0.3.0" = { @@ -8600,13 +8636,13 @@ let sha1 = "0b078d5517937d873101452d9146737557b75e51"; }; }; - "dtrace-provider-0.8.6" = { + "dtrace-provider-0.8.7" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.8.6"; + version = "0.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.6.tgz"; - sha1 = "428a223afe03425d2cd6d6347fdf40c66903563d"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.7.tgz"; + sha1 = "dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04"; }; }; "duplexer-0.1.1" = { @@ -8771,13 +8807,13 @@ let sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a"; }; }; - "electron-to-chromium-1.3.47" = { + "electron-to-chromium-1.3.48" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.47"; + version = "1.3.48"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.47.tgz"; - sha1 = "764e887ca9104d01a0ac8eabee7dfc0e2ce14104"; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz"; + sha1 = "d3b0d8593814044e092ece2108fc3ac9aea4b900"; }; }; "elegant-spinner-1.0.1" = { @@ -8816,13 +8852,13 @@ let sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; }; }; - "email-validator-2.0.3" = { + "email-validator-2.0.4" = { name = "email-validator"; packageName = "email-validator"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/email-validator/-/email-validator-2.0.3.tgz"; - sha1 = "33e50d66f526b97cd72c17205aefaec79c8a2a1e"; + url = "https://registry.npmjs.org/email-validator/-/email-validator-2.0.4.tgz"; + sha512 = "2fphwmaifh5r33d0qxsw8zjgkhqjcr146jzy8lyqib0dsaqk5sz09k58flnwbx62s4hkwakfqrb8945zabjskr61z42vr91p6iv1041"; }; }; "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { @@ -9159,13 +9195,13 @@ let sha1 = "eaba64ca5d542a311ac945f582defc336165d9f4"; }; }; - "es-abstract-1.11.0" = { + "es-abstract-1.12.0" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz"; - sha512 = "2aaq6ivy5raj1a99db6gvw7qn2vs27h0pqvgpf2fqfm9avwqsirr8gs86yx7n36qysjw1vabz6mlc8dfpi6fmz9yqvk8kapz49jnx36"; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz"; + sha512 = "2jdql8kh7rhb0wrblg2c4a809hrmgyc2c31qrww9q4r3mwa1l17nss7my5k0xrb7q78gywnv8vbkl9z7pq183l37r45x6f593zp3h8b"; }; }; "es-to-primitive-1.1.1" = { @@ -9177,13 +9213,13 @@ let sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; }; }; - "es5-ext-0.10.42" = { + "es5-ext-0.10.45" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.42"; + version = "0.10.45"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz"; - sha512 = "1412ssfrx1kvraz8kp4x9lc1jzcdh2952vbmlimrfalmbjv44rh504ihb4fg5mjwx8ix1f1wii0a0qngwrfk4gl271mcywgp7b4x700"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz"; + sha512 = "04p6qjhmiaqlqqgi0690lz7zzcdg1n80pxiywkkk6qalpxd8b85kv4403ckchsv8jlx9rhz4chgh819ahzcgwanibnnqzkibklwqiqn"; }; }; "es5-ext-0.8.2" = { @@ -9393,15 +9429,6 @@ let sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; }; }; - "eslint-4.19.0" = { - name = "eslint"; - packageName = "eslint"; - version = "4.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.19.0.tgz"; - sha512 = "29dc1z24n3c60hfac5afy7rk3mqdch8hnn07fnb9314dbyk5ih2l1284vl3nsgsm5ja5w144nsgmipbycva47gwpl1qfsma5gjcpkdg"; - }; - }; "eslint-4.19.1" = { name = "eslint"; packageName = "eslint"; @@ -9681,13 +9708,13 @@ let sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; }; }; - "events-2.0.0" = { + "events-2.1.0" = { name = "events"; packageName = "events"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-2.0.0.tgz"; - sha512 = "1r878as79mx3xg56nvjxxbryqa8lqn8xmiqi1xqfx2vjygnfaf15h5l658a9ikfr1bhc6ygxny8jr8ddjxpzlh6y443rxv08di3kwxg"; + url = "https://registry.npmjs.org/events/-/events-2.1.0.tgz"; + sha512 = "059cw923gab3r2d2nk9nafd3h9skxvimn2k4qhnhss6j5vwwgvqaac3668299zdc634q9r8by6vidhjnkf052ir1vyw6xx7nyhs56fx"; }; }; "events.node-0.4.9" = { @@ -10059,6 +10086,15 @@ let sha512 = "3sf897ajmkcp0j6rgd0jy6k95s9ck3j305yrr00kmckl8qdhswhbdd5g4m2fai03x8phs1vw2ahf9v7ym5ji4zfxydxyamiy61glabd"; }; }; + "external-editor-3.0.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.0.tgz"; + sha512 = "28h4s6rjdakrr2danff6n7mwwf1n2syyba9q93ac1wpic535lk0xvwh4bpnzhmw3gkjblvbvfsd4zp57hwy7d70hk41lxs4867iz6cs"; + }; + }; "extglob-0.3.2" = { name = "extglob"; packageName = "extglob"; @@ -10095,13 +10131,13 @@ let sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"; }; }; - "extract-zip-1.6.6" = { + "extract-zip-1.6.7" = { name = "extract-zip"; packageName = "extract-zip"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz"; - sha1 = "1290ede8d20d0872b429fd3f351ca128ec5ef85c"; + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz"; + sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9"; }; }; "extsprintf-1.0.0" = { @@ -10266,6 +10302,15 @@ let sha512 = "2bhxs6r2hxpjfxj7ycbs3blbwbmq9nmwar4swzvhbiwcbmn721l8wk0ndyw9n3i1508rlhhm70a8fn9bpy8mx8f0ncqhqhh5pz175j0"; }; }; + "fast-url-parser-1.1.3" = { + name = "fast-url-parser"; + packageName = "fast-url-parser"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz"; + sha1 = "f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"; + }; + }; "faye-websocket-0.10.0" = { name = "faye-websocket"; packageName = "faye-websocket"; @@ -10311,6 +10356,15 @@ let sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; }; }; + "fd-slicer-1.1.0" = { + name = "fd-slicer"; + packageName = "fd-slicer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + }; + }; "feedparser-2.2.9" = { name = "feedparser"; packageName = "feedparser"; @@ -10437,15 +10491,6 @@ let sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695"; }; }; - "filesize-3.6.1" = { - name = "filesize"; - packageName = "filesize"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz"; - sha512 = "1rfby2136b86m318244b42lrcx9hc28vz71cv9i84cd5z7dd3cwvj1gx8mykbjh937yyi1h4q5kk3vhjcldc8pkd2f7iapszgbd3a7c"; - }; - }; "filestream-4.1.3" = { name = "filestream"; packageName = "filestream"; @@ -10725,13 +10770,13 @@ let sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; }; }; - "flatstr-1.0.5" = { + "flatstr-1.0.8" = { name = "flatstr"; packageName = "flatstr"; - version = "1.0.5"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.5.tgz"; - sha1 = "5b451b08cbd48e2eac54a2bbe0bf46165aa14be3"; + url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.8.tgz"; + sha512 = "2myjl431vaakbfrr72hywwmrlin44zm9s7y32c4zw9ckk9giykx33qlzkxfr13jlslr15fsnj9smyl4fnlrqbamapp5qwzgzxpfaxk1"; }; }; "flatten-0.0.1" = { @@ -10761,13 +10806,13 @@ let sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74"; }; }; - "fluent-syntax-0.6.6" = { + "fluent-syntax-0.7.0" = { name = "fluent-syntax"; packageName = "fluent-syntax"; - version = "0.6.6"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.6.6.tgz"; - sha512 = "18dv619kjzc3fdahfc242r7lb27a3pjxx5xd8shascb9xb8c1zncsrbnj0an8qjsg1pwf0az7h7gv5v0g50b3pixznr7wk7d8yqfazj"; + url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.7.0.tgz"; + sha512 = "031cxan5lg9gnxfk0ig3np5v4zvb61jraigawngdc2waq6yf1dsck5zixvfmhbm5sx5dn073f72716cl3i61qx0vpn3mlmq21zalj2g"; }; }; "flush-write-stream-1.0.3" = { @@ -10806,13 +10851,22 @@ let sha512 = "2z7ai3f3g9j48z90kds4070nb8v2q02n7131c2zjplb0zfjxjrd1m2fm8ykg7psj8fiwc4iidn2g9rr2w09qijbssddr0p8acyiw5mv"; }; }; - "for-each-0.3.2" = { + "follow-redirects-1.5.0" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz"; + sha512 = "0h5jsslx4wxfjvwhfjhims4m3nnkjdzmm1g1ch7wvd0pq8y2bpndfa8zrbga7sy1xa90zm85cjay3laz7fnzvq858xa9xmzppiyvnkx"; + }; + }; + "for-each-0.3.3" = { name = "for-each"; packageName = "for-each"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz"; - sha1 = "2c40450b9348e97f281322593ba96704b9abd4d4"; + url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"; + sha512 = "2dikmdxwassw4w48vv82swjv4v1zx2sivsgcnxi3zi0imzw165ba8vaxgawz0wz4fgf138hvvc3xc5znr2wmz07r74dp8z6kqp1z9lf"; }; }; "for-in-0.1.8" = { @@ -11319,13 +11373,13 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "fx-runner-1.0.8" = { + "fx-runner-1.0.9" = { name = "fx-runner"; packageName = "fx-runner"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.8.tgz"; - sha1 = "5ced3b04a8d51d634de20d1480f0dc5dd8325dec"; + url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.9.tgz"; + sha1 = "7b23f3773dc76aacc42f11d9aff2769675cb63f0"; }; }; "galaxy-0.1.12" = { @@ -11526,13 +11580,13 @@ let sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "getmac-1.4.1" = { + "getmac-1.4.3" = { name = "getmac"; packageName = "getmac"; - version = "1.4.1"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-1.4.1.tgz"; - sha512 = "0r7zqgvfiv3r6zy8fms9gdcf3a1r46kpf8pm5x7vwrc27vgv69ra244s89k73hb9rna6r3s9v20yzbwjmz2c13gh3s0bbd07zq7w2lr"; + url = "https://registry.npmjs.org/getmac/-/getmac-1.4.3.tgz"; + sha512 = "30r4q3b0d0j7i6lcwwbihxgp08bjp2x9yiff9nwww0krdnr9h9mjscfl0my891245nswcg8i3xmdxi4cmxqr54j9c1dgmzyhmy5mrkc"; }; }; "getpass-0.1.7" = { @@ -11733,6 +11787,24 @@ let sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; + "glob-slash-1.0.0" = { + name = "glob-slash"; + packageName = "glob-slash"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-slash/-/glob-slash-1.0.0.tgz"; + sha1 = "fe52efa433233f74a2fe64c7abb9bc848202ab95"; + }; + }; + "glob-slasher-1.0.1" = { + name = "glob-slasher"; + packageName = "glob-slasher"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-slasher/-/glob-slasher-1.0.1.tgz"; + sha1 = "747a0e5bb222642ee10d3e05443e109493cb0f8e"; + }; + }; "glob-stream-3.1.18" = { name = "glob-stream"; packageName = "glob-stream"; @@ -11742,15 +11814,6 @@ let sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; }; }; - "glob-stream-5.3.5" = { - name = "glob-stream"; - packageName = "glob-stream"; - version = "5.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"; - sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22"; - }; - }; "glob-stream-6.1.0" = { name = "glob-stream"; packageName = "glob-stream"; @@ -12049,13 +12112,13 @@ let sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"; }; }; - "growl-1.10.3" = { + "growl-1.10.5" = { name = "growl"; packageName = "growl"; - version = "1.10.3"; + version = "1.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz"; - sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; + url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz"; + sha512 = "146i7if4fjml1p6xw1ybb7vm22k6i8yc7r8wcw8yia7qy385w1s6j18ip91g5mv47zvv5fw5m8kpzlaayjs183fkpg174hbw4xgh6m8"; }; }; "growly-1.3.0" = { @@ -12121,15 +12184,6 @@ let sha512 = "01v6g5dvnsxvzcwrw2m6kx3ghrpxmbwz4gwljm7qv9rhxhssssvy54llpib7b5i3iyjkb7mvy4a3lgcld7pxx9580wms9v380rlyrqa"; }; }; - "gulp-sourcemaps-1.6.0" = { - name = "gulp-sourcemaps"; - packageName = "gulp-sourcemaps"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz"; - sha1 = "b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"; - }; - }; "gulp-sourcemaps-2.6.4" = { name = "gulp-sourcemaps"; packageName = "gulp-sourcemaps"; @@ -12238,13 +12292,13 @@ let sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; }; }; - "has-1.0.1" = { + "has-1.0.3" = { name = "has"; packageName = "has"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; - sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz"; }; }; "has-ansi-0.1.0" = { @@ -12832,13 +12886,13 @@ let sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; }; }; - "http-parser-js-0.4.12" = { + "http-parser-js-0.4.13" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.4.12"; + version = "0.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.12.tgz"; - sha1 = "b9cfbf4a2cf26f0fc34b10ca1489a27771e3474f"; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz"; + sha1 = "3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"; }; }; "http-proxy-1.0.2" = { @@ -13021,13 +13075,13 @@ let sha512 = "3bml62y8rmpga8wbcxfqm6izvc9xxlblx0vc08r778qa42jgw6fjif4i7f9bj2y98bz4xyimg5vfgch92j6i2l7zcwiq5za8l34cziw"; }; }; - "hypercore-6.14.0" = { + "hypercore-6.15.0" = { name = "hypercore"; packageName = "hypercore"; - version = "6.14.0"; + version = "6.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.14.0.tgz"; - sha512 = "3liw77yhvn3nlrczf9s30vvn4bxrn3glh65a2psy1va9pvcnjwx6wfh52v5l9qbd7zyp4q4nb7qrq0n3am7jwmz3dkb5fzvdnlwikkh"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.15.0.tgz"; + sha512 = "2qd2nd34xmr8fvagbifn72ffcr6hw9byas8rccy1wx252kj2qza8yy9g0ck9nf7np794267ry4jih7j1ryrjrbs8r8q2hbvgcyv5w0z"; }; }; "hypercore-protocol-6.6.4" = { @@ -13039,13 +13093,13 @@ let sha512 = "0rxj8d4lp45q7v3wwwv23m7qi84vw3wvyafqiy9x5f9lqkynq8v8yajpq9bcnc935927qjnxajn8n0cyhg0fqjnpywlfyxgxczkndgm"; }; }; - "hyperdrive-9.12.3" = { + "hyperdrive-9.13.0" = { name = "hyperdrive"; packageName = "hyperdrive"; - version = "9.12.3"; + version = "9.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.3.tgz"; - sha512 = "3w0ia766bacphqzgyjhiwbppgdja61vlz2xp6x710dk4pn6570gag3w5xa8rfivh2lvig8v2ics3bkdlm9cmq9kpzjgwzm19a089fb3"; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.13.0.tgz"; + sha512 = "1ncs5n26spkycvrfi5j0dy62bw3d9l0cmpaagc54nb6rfh33zyh228b3n99yajvzhyym0d6g0hphpwjyz8s7pngv13ql8f41x05zq40"; }; }; "hyperdrive-http-4.2.2" = { @@ -13480,6 +13534,15 @@ let sha512 = "18q95zmyca97iylvzibh193n81dp71yawcb56ib17inhq7g0nixmbx62j56bdv3d7lxsgwj8zw9zcmmhzjivx3wlb3b6a60jsf6dl0k"; }; }; + "inquirer-6.0.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.0.0.tgz"; + sha512 = "0k09hsg3dfdz7vp482v56hvhqa9g4qbm8jpmig9p0phdzsaspajxk9d4z575dd8rc70pmipg7pxxpgdqwa3x1z4rwmhhw1d3icr115l"; + }; + }; "insert-module-globals-7.1.0" = { name = "insert-module-globals"; packageName = "insert-module-globals"; @@ -14110,6 +14173,15 @@ let sha512 = "34m1wg28c9l1v9bqz2klwl4ybhyqkhk80d95664jmcbq1jjpg471nv96mqgqy4838xpa8wm7mbpynmq4294pq6iw163s0ar1b3a4f1r"; }; }; + "is-options-1.0.1" = { + name = "is-options"; + packageName = "is-options"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-options/-/is-options-1.0.1.tgz"; + sha512 = "339gkkcm39mcw2c8wwl37y02rq3ga7309fgrvp2garlavgh93aydxpfx8wg9j9xs6k9h3ha11c4z9bkcqihd7w5d8fb03ik1nqgqy6r"; + }; + }; "is-path-cwd-1.0.0" = { name = "is-path-cwd"; packageName = "is-path-cwd"; @@ -14389,15 +14461,6 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; - "is-valid-glob-0.3.0" = { - name = "is-valid-glob"; - packageName = "is-valid-glob"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz"; - sha1 = "d4b55c69f51886f9b65c70d6c2622d37e29f48fe"; - }; - }; "is-valid-glob-1.0.0" = { name = "is-valid-glob"; packageName = "is-valid-glob"; @@ -14479,15 +14542,6 @@ let sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621"; }; }; - "isemail-1.2.0" = { - name = "isemail"; - packageName = "isemail"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz"; - sha1 = "be03df8cc3e29de4d2c5df6501263f1fa4595e9a"; - }; - }; "isexe-1.1.2" = { name = "isexe"; packageName = "isexe"; @@ -14641,15 +14695,6 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joi-6.10.1" = { - name = "joi"; - packageName = "joi"; - version = "6.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz"; - sha1 = "4d50c318079122000fe5f16af1ff8e1917b77e06"; - }; - }; "jquery-3.3.1" = { name = "jquery"; packageName = "jquery"; @@ -14659,13 +14704,13 @@ let sha512 = "0d5v4s4626l13llvp6hq5wlghysf7lmfxpp0x0ymvcrvikz2xmyrag81wxndb9fy48mx61gcdlbmdwln78s43givdwpmrk9dir5vfai"; }; }; - "jquery-ui-1.12.1" = { - name = "jquery-ui"; - packageName = "jquery-ui"; + "jquery-ui-bundle-1.12.1" = { + name = "jquery-ui-bundle"; + packageName = "jquery-ui-bundle"; version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz"; - sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; + url = "https://registry.npmjs.org/jquery-ui-bundle/-/jquery-ui-bundle-1.12.1.tgz"; + sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4"; }; }; "js-select-0.6.0" = { @@ -14731,6 +14776,15 @@ let sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi"; }; }; + "js-yaml-3.12.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; + sha512 = "3f8k2gvi3gnj9gpr3dnm5n5vpy2w68pshqk4hajlsmkb37ky30cnqza82l8sq153zx1nk67gizcm1ngmvlajw53hkwg4g96gir7d2rw"; + }; + }; "js2xmlparser-1.0.0" = { name = "js2xmlparser"; packageName = "js2xmlparser"; @@ -14758,6 +14812,15 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; + "jsdom-7.2.2" = { + name = "jsdom"; + packageName = "jsdom"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz"; + sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; + }; + }; "jsesc-0.5.0" = { name = "jsesc"; packageName = "jsesc"; @@ -14956,13 +15019,13 @@ let sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; }; }; - "jsonata-1.5.3" = { + "jsonata-1.5.4" = { name = "jsonata"; packageName = "jsonata"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.5.3.tgz"; - sha512 = "0lgmcfyrax8g07h2lhdlzw3i5dp28mdhg3azf2h7c1ig3nf3xv0dkrpdfsr155zhmbx2cyjr3w90hvkxc0vv2s4nj0zxdw15j6ywibn"; + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.5.4.tgz"; + sha512 = "27541bw7vmi7jjvk8s2qka188hdsqqrh961xcfyk5zwlwxdcmkvh53bpqz5kvclyljdm3kk82dgap4f4ggz713l1yj7yllq8pcpvyhp"; }; }; "jsonfile-1.0.1" = { @@ -15064,13 +15127,13 @@ let sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; }; }; - "jsonwebtoken-7.1.9" = { + "jsonwebtoken-8.2.1" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; - version = "7.1.9"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz"; - sha1 = "847804e5258bec5a9499a8dc4a5e7a3bae08d58a"; + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.2.1.tgz"; + sha512 = "0dwgmjxfm3hp813x0ixpflz3bm5j5r6mn714b4y9gqcyaw28yw2ylz6kn2a6wg9m5crnxfnpdds5cbvxrm68gyg7lq8da8zpl3d9jlp"; }; }; "jspm-config-0.3.4" = { @@ -15668,15 +15731,6 @@ let sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3"; }; }; - "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"; - }; - }; "levn-0.3.0" = { name = "levn"; packageName = "levn"; @@ -16073,6 +16127,15 @@ let sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c"; }; }; + "lodash._objecttypes-2.4.1" = { + name = "lodash._objecttypes"; + packageName = "lodash._objecttypes"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"; + sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11"; + }; + }; "lodash._reescape-3.0.0" = { name = "lodash._reescape"; packageName = "lodash._reescape"; @@ -16280,6 +16343,15 @@ let sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; }; }; + "lodash.includes-4.3.0" = { + name = "lodash.includes"; + packageName = "lodash.includes"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"; + sha1 = "60bb98a87cb923c68ca1e51325483314849f553f"; + }; + }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -16298,6 +16370,15 @@ let sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; }; }; + "lodash.isboolean-3.0.3" = { + name = "lodash.isboolean"; + packageName = "lodash.isboolean"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; + sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6"; + }; + }; "lodash.isequal-4.5.0" = { name = "lodash.isequal"; packageName = "lodash.isequal"; @@ -16307,6 +16388,33 @@ let sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; }; + "lodash.isinteger-4.0.4" = { + name = "lodash.isinteger"; + packageName = "lodash.isinteger"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; + sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343"; + }; + }; + "lodash.isnumber-3.0.3" = { + name = "lodash.isnumber"; + packageName = "lodash.isnumber"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz"; + sha1 = "3ce76810c5928d03352301ac287317f11c0b1ffc"; + }; + }; + "lodash.isobject-2.4.1" = { + name = "lodash.isobject"; + packageName = "lodash.isobject"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"; + sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"; + }; + }; "lodash.isplainobject-4.0.6" = { name = "lodash.isplainobject"; packageName = "lodash.isplainobject"; @@ -16568,13 +16676,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log4js-2.6.1" = { + "log4js-2.8.0" = { name = "log4js"; packageName = "log4js"; - version = "2.6.1"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-2.6.1.tgz"; - sha512 = "254l8in0izc772xvl9krch7nll86c1a3b1i9j1yb3sl1rialgynw6q2slza1vmmh49b375a3qfj4ir9pkzgsas48rbrzi10px71dsh4"; + url = "https://registry.npmjs.org/log4js/-/log4js-2.8.0.tgz"; + sha512 = "0c5w5kb3vbh6ff5l7srizxhnkjlnx4ip7zwrll04xm5i8k0mq0kcsgvz88dzlzkb002x7wzizaw5ynq3y0xg633inv4fjr5h49ilfry"; }; }; "loggly-1.1.1" = { @@ -16955,6 +17063,15 @@ let sha512 = "2dhd467iqwi8rmdzm8m0921z2mmixbdbpp9hvk02f5z6k1k2324k5l971x6j46mlq8nbixf21znq376dj431jnfajxllm123mgaw657"; }; }; + "mamacro-0.0.3" = { + name = "mamacro"; + packageName = "mamacro"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz"; + sha512 = "1670fzjdl58zpljl3vblrzfz0805w0d99kdhf9rz4cgr1f2g01ibb5s5b1n7w7dqfv8lyig9zcqw2f0gsjlzxxwj4zc939fwn3k1hd8"; + }; + }; "map-cache-0.2.2" = { name = "map-cache"; packageName = "map-cache"; @@ -17108,13 +17225,13 @@ let sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; }; }; - "mdn-data-1.1.3" = { + "mdn-data-1.1.4" = { name = "mdn-data"; packageName = "mdn-data"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.3.tgz"; - sha512 = "0ly3w028pxhm83a538dms6xm5rw84xy7pq16354kfpbd72ng0rykvbnfcs1c3ijdcr7xfxzva4pp10wqf6nxysj375vinqbki1zmgl7"; + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz"; + sha512 = "144x251sdslml324vr6hp0lzc54g6d90n3cc1drs8lyqixw798p42ar2a0s2id939pajpa185givxb2mdg35psfvjikqakjg6kin9hm"; }; }; "mdns-js-0.5.0" = { @@ -17315,15 +17432,6 @@ let sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; }; }; - "merge-stream-1.0.1" = { - name = "merge-stream"; - packageName = "merge-stream"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz"; - sha1 = "4041202d508a342ba00174008df0c251b8c135e1"; - }; - }; "merge2-1.2.2" = { name = "merge2"; packageName = "merge2"; @@ -17405,24 +17513,6 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; - "micro-9.1.4" = { - name = "micro"; - packageName = "micro"; - version = "9.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/micro/-/micro-9.1.4.tgz"; - sha512 = "0zajgsz4m4z0cbibs2vz4brzp6ihq647id9zq67lrcy6nkc9fzjc8fx4g1bsf6nnbjha22fi5sz7lmfq46qixcz807v1p5pjd13kr6r"; - }; - }; - "micro-compress-1.0.0" = { - name = "micro-compress"; - packageName = "micro-compress"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/micro-compress/-/micro-compress-1.0.0.tgz"; - sha1 = "53f5a80b4ad0320ca165a559b6e3df145d4f704f"; - }; - }; "microee-0.0.6" = { name = "microee"; packageName = "microee"; @@ -17540,6 +17630,15 @@ let sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; }; }; + "mime-db-1.34.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.34.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.34.0.tgz"; + sha1 = "452d0ecff5c30346a6dc1e64b1eaee0d3719ff9a"; + }; + }; "mime-types-2.0.14" = { name = "mime-types"; packageName = "mime-types"; @@ -17720,13 +17819,13 @@ let sha512 = "1slngp5z9rczjirv9lpdwiv1ap4xmp28jxl4r0i5hpds1khlm89qp70ziz8k5h2vwjph6srjqi3gb2yrwwsnnwli6p8yxvlyx7nn80p"; }; }; - "minipass-2.3.0" = { + "minipass-2.3.3" = { name = "minipass"; packageName = "minipass"; - version = "2.3.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz"; - sha512 = "1p0pbj1iwnzb7kkqbh5h0vd6byh1l6na1yx69qmbb0wbmwm0qc5g4hn4z6lr8wkzb4kybvd1hjm4hxd93nrdr8ydbqqd9wd1w9bcq4d"; + url = "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz"; + sha512 = "1ii40xdjvsqw9k2pyavlv1h4wh5pc3fz4kn91gxpy404kilgp6p9q7q6zba7wa9i7xh9iijnz2pmr8h0wc4yh14lwkqhps4zgvjfc7y"; }; }; "minizlib-1.1.0" = { @@ -17738,13 +17837,13 @@ let sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; }; }; - "mirror-folder-2.2.0" = { + "mirror-folder-3.0.0" = { name = "mirror-folder"; packageName = "mirror-folder"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.2.0.tgz"; - sha512 = "3js8pwgmj4lzzi6nzl0wp021rhsnz31jpkkzdf35xzwm1l65m6ygjf4hz77vvy3dk2h5jb2d32nvzy26n3d5hswg3nb8s0rylvv510r"; + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.0.tgz"; + sha512 = "3vdfga0d1l6kpkk3bvkzw6jx6x6n4dn1z1q6rxgnsj0wqhs68v0fgdik67f3r9vll25kdmvwhn67v6p5xqiwkxncc55m90jfw6v07ky"; }; }; "mississippi-2.0.0" = { @@ -17909,31 +18008,31 @@ let sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; }; }; - "moment-2.20.1" = { + "moment-2.18.1" = { name = "moment"; packageName = "moment"; - version = "2.20.1"; + version = "2.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz"; - sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2"; + url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; + sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; }; }; - "moment-2.22.1" = { + "moment-2.20.1" = { name = "moment"; packageName = "moment"; - version = "2.22.1"; + version = "2.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz"; - sha512 = "1hzs2jf69lrw76a4diywsl4451qpm3iavk8f324hgb6x3njb64bd77375kwv4ydllzc5cy1v1mabgciln7yhfd9avn7nvcy6i2n84mj"; + url = "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz"; + sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2"; }; }; - "moment-2.6.0" = { + "moment-2.22.2" = { name = "moment"; packageName = "moment"; - version = "2.6.0"; + version = "2.22.2"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.6.0.tgz"; - sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; + url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz"; + sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66"; }; }; "moment-2.7.0" = { @@ -18044,13 +18143,13 @@ let sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8"; }; }; - "mqtt-2.17.0" = { + "mqtt-2.18.0" = { name = "mqtt"; packageName = "mqtt"; - version = "2.17.0"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-2.17.0.tgz"; - sha512 = "1mqfnz7s0gnga7gdh29qj4lfybm3fzsc6w3x610sr50h9dhbi3m5isfri63d87rdlyp5dspy11gpdah2h1ikaq3zi7wfhf6dzj8m1vr"; + url = "https://registry.npmjs.org/mqtt/-/mqtt-2.18.0.tgz"; + sha512 = "2f3n5f227fdi44ms963ga3w15b5hgljy6xhr5s9i2x4jcg0vjfb9ib7sqv7n0c00kk1f67n9r5xdqgjc4syab54ip6d5slk71dmg23p"; }; }; "mqtt-packet-5.6.0" = { @@ -18062,15 +18161,6 @@ let sha512 = "1gvb90a13pd8xx7mkx6nxfs8cc2ysf58vwccvm1jh5myhwjyvsamj5f9fi398vgk9haxmg25l00lwbs4cdnvs638r5iswga5gd9wh20"; }; }; - "mri-1.1.0" = { - name = "mri"; - packageName = "mri"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mri/-/mri-1.1.0.tgz"; - sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a"; - }; - }; "mri-1.1.1" = { name = "mri"; packageName = "mri"; @@ -18305,13 +18395,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multistream-2.1.0" = { + "multistream-2.1.1" = { name = "multistream"; packageName = "multistream"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/multistream/-/multistream-2.1.0.tgz"; - sha1 = "625c267d5c44424ad6294788b5bb4da3dcb32f1d"; + url = "https://registry.npmjs.org/multistream/-/multistream-2.1.1.tgz"; + sha512 = "0ssriqcskcwvja0aw04frfy7fymv2nwl0dqh3fp03d2cd78yf45r6jlvv1pn87w1b2yzp7iy8mznj7cybxr9dscfkspmsk5m3pjzay5"; }; }; "muri-0.3.1" = { @@ -18503,13 +18593,13 @@ let sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86"; }; }; - "nanoid-1.0.2" = { + "nanoid-1.0.3" = { name = "nanoid"; packageName = "nanoid"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.2.tgz"; - sha512 = "2bzl500sgpk3i3ird4iviglsj0gj9a0qhmj4hnky3xmxbl4ahamjhi96rslr8k65j77glmw771m3jm7r5sr5akw6ip5glmxvqkg095h"; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.3.tgz"; + sha512 = "04vmzrfmvwj2jz8k4qw7hm3sbin33m5a12ayz1anmx8frrl1ppc4ij1p6zlmb65216kqyclljx72wwyrpjxx3ih6g9s0ssrgj6xd4wp"; }; }; "nanolru-1.0.0" = { @@ -18597,13 +18687,13 @@ let sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; - "natives-1.1.3" = { + "natives-1.1.4" = { name = "natives"; packageName = "natives"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.3.tgz"; - sha512 = "3pbpfnk3183j5mwxprr19bzahf7lxarcka2bad0mhcywnjlj63i55phbxyk0pn4l4v7nj3wv4gjrzdk7xfxxfrjl5rvqf0qbrhr5485"; + url = "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz"; + sha512 = "0967ggrqp33pwjsmsa03yx5mbz26h54ldxylqb6aq9svgxyckqa6kg6lw0ia93mz2shkm0qdmhfzw9klc3lqr2p5lhsq52s1xx74vs3"; }; }; "natural-compare-1.4.0" = { @@ -19048,13 +19138,13 @@ let sha512 = "06is8ig0mlp85dl5hjp86gp7hwahssfls65gbwcql3awygilv9zlgxngm4yrl54vmkyjk2dk5gbf78r6bm4jgm3qf07xdbwvcgjvqz7"; }; }; - "node-red-node-twitter-0.1.13" = { + "node-red-node-twitter-0.1.15" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; - version = "0.1.13"; + version = "0.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.13.tgz"; - sha512 = "0wfkdalwxzyyivqxiwiba5j8pyis83lhipiwck2xrbks3w0x1ldf12fgnzx61kq64sdmzpczqwb7588ggh5drj64ymj88vwdbca0bd9"; + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.15.tgz"; + sha512 = "07v6lmlyb0hdg9l86gvlipvs3ahi64fgswkadz1frczpi293hydlbdsy7rb917nf7z0kpcsrnch9d92xwirf4p6yzfhkmdsanrb9ha0"; }; }; "node-ssdp-2.9.1" = { @@ -19093,15 +19183,6 @@ let sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; }; }; - "node-uuid-1.4.7" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; - }; - }; "node-uuid-1.4.8" = { name = "node-uuid"; packageName = "node-uuid"; @@ -19111,15 +19192,6 @@ let sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; }; }; - "node-version-1.1.3" = { - name = "node-version"; - packageName = "node-version"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-version/-/node-version-1.1.3.tgz"; - sha512 = "0zdxwcfi3gca8d1jdg3m1gh6b3xxsc7sxpdrnvabc5j5fdgmhcdqaxv3q28rl95ibb7qjcvw7c7k5wzhrvhayb9vn6lr7snabkh8k5c"; - }; - }; "node-wsfederation-0.1.1" = { name = "node-wsfederation"; packageName = "node-wsfederation"; @@ -19381,13 +19453,13 @@ let sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; - "npm-6.0.1" = { + "npm-6.1.0" = { name = "npm"; packageName = "npm"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.0.1.tgz"; - sha512 = "03x8626d7ngp160j0lx7vmzpjglvlqbz4gf9kmdndaxna9h81zr8rjhad3jcdkr9j1nnlc1rsr7acsdny5ykl3dwilq0p486zr9cyrp"; + url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz"; + sha512 = "3bhkx1ynzp39m6w5mnwfimc25arlpxgs9vgk0w7ai8zw0q6kxyljj4xjvkyxg7wv1f8jbj3k31ifgvy0kff4p3sbp5li53ls851qzvv"; }; }; "npm-bundled-1.0.3" = { @@ -19570,6 +19642,15 @@ let sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f"; }; }; + "nwmatcher-1.4.4" = { + name = "nwmatcher"; + packageName = "nwmatcher"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz"; + sha512 = "24xrin7f593d6m3l1461j05p8lx8vw8fcii55q1zf04cgslah3qwcnqs7473kg56dlw5ncmbb2y0sklh1xmdkja14lh71jxvvh9hayy"; + }; + }; "oauth-0.9.14" = { name = "oauth"; packageName = "oauth"; @@ -19922,22 +20003,13 @@ let sha1 = "707375e59ab9f73025899727679b20328171c9aa"; }; }; - "openssl-self-signed-certificate-1.1.6" = { - name = "openssl-self-signed-certificate"; - packageName = "openssl-self-signed-certificate"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz"; - sha1 = "9d3a4776b1a57e9847350392114ad2f915a83dd4"; - }; - }; - "openssl-wrapper-0.2.1" = { + "openssl-wrapper-0.3.4" = { name = "openssl-wrapper"; packageName = "openssl-wrapper"; - version = "0.2.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.2.1.tgz"; - sha1 = "ff2d6552c83bb14437edc0371784704c75289473"; + url = "https://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.3.4.tgz"; + sha1 = "c01ec98e4dcd2b5dfe0b693f31827200e3b81b07"; }; }; "opentracing-0.13.0" = { @@ -20075,15 +20147,6 @@ let sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; }; }; - "ordered-read-streams-0.3.0" = { - name = "ordered-read-streams"; - packageName = "ordered-read-streams"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz"; - sha1 = "7137e69b3298bb342247a1bbee3881c80e2fd78b"; - }; - }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -20246,13 +20309,13 @@ let sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; }; }; - "p-limit-1.2.0" = { + "p-limit-1.3.0" = { name = "p-limit"; packageName = "p-limit"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz"; - sha512 = "2g0r6r6bbcdp6lrxbj2zbcihr1byd55kycm1ijz80l2zvmcvhqsbd7rhmfqylp004d61fibvmwzk4ig89dbyk4azpwgll7dllhsvwv3"; + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; + sha512 = "3sh18calqxbww99pxc84hldflmj0i915g8npihlmazw8wjqabihi9475v0ll3fhx44sxn35j014j1k5d2xr73q3mpwkmx09n2q1gxxy"; }; }; "p-locate-2.0.0" = { @@ -20489,6 +20552,15 @@ let sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; }; }; + "parse-numeric-range-0.0.2" = { + name = "parse-numeric-range"; + packageName = "parse-numeric-range"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-0.0.2.tgz"; + sha1 = "b4f09d413c7adbcd987f6e9233c7b4b210c938e4"; + }; + }; "parse-passwd-1.0.0" = { name = "parse-passwd"; packageName = "parse-passwd"; @@ -20516,13 +20588,13 @@ let sha512 = "31lm2ifw06p00gc0qvxinqvy8afhq0lrg3fpf5rrhb6dqx3avd3ykps8sjv2nj91wf06k62yvn9cvf1f243yzl9xpzy9255556x8bnb"; }; }; - "parse-torrent-6.0.0" = { + "parse-torrent-6.0.1" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-6.0.0.tgz"; - sha512 = "1yr12djspi83lybgycwsaz5wbikbsazwhk2w4xf3niri1lx0p3965br1xbsjw1m0xrzc71q6mw5xz44w0hd3ic5wmb2v62abl7kld16"; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-6.0.1.tgz"; + sha512 = "0mgzmnc5qrvp4lzd8cnpnlbz8pjc9s6vcx5q7mbpgv5pamn2cs1lmd3yircfkrdz1f24ss7xsfz0zan5xhxi5gwj9y4b5k8y3fb7f5n"; }; }; "parse-torrent-file-2.1.4" = { @@ -20534,6 +20606,15 @@ let sha1 = "32d4b6afde631420e5f415919a222b774b575707"; }; }; + "parse5-1.5.1" = { + name = "parse5"; + packageName = "parse5"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz"; + sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"; + }; + }; "parse5-3.0.3" = { name = "parse5"; packageName = "parse5"; @@ -20894,6 +20975,15 @@ let sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; }; }; + "path-to-regexp-2.2.1" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz"; + sha512 = "0cndhcd7swpnjv1gwkjb1lqcjcd09is4c4ryjycs39jil9ngklsk7n0l6b09qapj68ni9r924albq2lyghrlg5mmq3brrfslh7mpvw2"; + }; + }; "path-type-1.1.0" = { name = "path-type"; packageName = "path-type"; @@ -21102,22 +21192,22 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-4.14.0" = { + "pino-4.16.1" = { name = "pino"; packageName = "pino"; - version = "4.14.0"; + version = "4.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-4.14.0.tgz"; - sha512 = "1x3dsg8pg321khfaf3dd91ykkwhdn60wk169l3b2kp8wkbw242ld99qiv7cmbn76ccba75wdydv8mb2v4fg58lrfnn7jf5pvk2x7qwy"; + url = "https://registry.npmjs.org/pino/-/pino-4.16.1.tgz"; + sha512 = "35gg7lc0k4ry5wq0a786amc4n7lkbwjf57y7qywv4xy5wn4zfwf756gxgp6bybgqzria04ay7hn2gn3qfiap1xzck7amjjcjh5whgs9"; }; }; - "pino-std-serializers-1.2.0" = { + "pino-std-serializers-2.1.0" = { name = "pino-std-serializers"; packageName = "pino-std-serializers"; - version = "1.2.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-1.2.0.tgz"; - sha512 = "0h8xndhy3qwgkycbmypfp7a2dvk875prgnfg46zj9vz14i24xqqdw1xp748hkv2xl2phwhyaa82yr1ym6jn6r61527kz5f7f8qird78"; + url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.1.0.tgz"; + sha512 = "2jpbixd78yd4pglp7x635pxj872kw9j08dcjqw0g8rmdpnwcacm9ah83ydqzxqxkhx3m10ia753rn7xw8f39qi6ycxrc6pz02nsz99n"; }; }; "pkg-dir-2.0.0" = { @@ -21624,15 +21714,6 @@ let sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; }; }; - "promise-timeout-1.3.0" = { - name = "promise-timeout"; - packageName = "promise-timeout"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-timeout/-/promise-timeout-1.3.0.tgz"; - sha512 = "2m6ixvg01qqcrywfm8jv1phv3irv63qbk901nq6wg3vhvs4wg5c8qz45fs8rzw8yr1h0p6f7dyb0ndll2irpcpkz1z2x6id9m60s877"; - }; - }; "promised-temp-0.1.0" = { name = "promised-temp"; packageName = "promised-temp"; @@ -21849,6 +21930,15 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; + "psl-1.1.27" = { + name = "psl"; + packageName = "psl"; + version = "1.1.27"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.1.27.tgz"; + sha512 = "0q5srdkdq8sz6gm0w48vvvj0azp2w2f41vxw4ypz9vkbyj9fsmxaf5aq3hlckx36mk84lvfhga9b7iik86xpj04nmylly20kdglkjr7"; + }; + }; "pstree.remy-1.1.0" = { name = "pstree.remy"; packageName = "pstree.remy"; @@ -22101,22 +22191,13 @@ let sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; - "punycode-2.1.0" = { + "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz"; - sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d"; - }; - }; - "q-0.9.7" = { - name = "q"; - packageName = "q"; - version = "0.9.7"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz"; - sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx"; }; }; "q-1.0.1" = { @@ -22398,6 +22479,15 @@ let sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; }; }; + "random-access-memory-3.0.0" = { + name = "random-access-memory"; + packageName = "random-access-memory"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.0.0.tgz"; + sha512 = "160skc30mby806rmlwilb56h0r5bcc3sf2dr980k4a93c3bhnlnjcfiqbx1k5sjljqiygs6sn014gpgilzhhx9c1vdcyfhkz45pkxrv"; + }; + }; "random-access-storage-1.2.0" = { name = "random-access-storage"; packageName = "random-access-storage"; @@ -22488,13 +22578,13 @@ let sha1 = "01ba954276052b783900e63d6118d8fcf3875d7f"; }; }; - "raven-2.4.2" = { + "raven-2.6.2" = { name = "raven"; packageName = "raven"; - version = "2.4.2"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-2.4.2.tgz"; - sha1 = "0129e2adc30788646fd530b67d08a8ce25d4f6dc"; + url = "https://registry.npmjs.org/raven/-/raven-2.6.2.tgz"; + sha1 = "c92f30890e2dfcd15258d184e43e39326e58032e"; }; }; "raw-body-0.0.3" = { @@ -22551,13 +22641,13 @@ let sha512 = "27ygzjzpajjmz2bl1f7y1bla7wdw65w912r4i29x9p1r0pa5jivip658vwlkqq77n1nc619w1p52818mvihxhks4dlbc1pmbc925szm"; }; }; - "raw-socket-1.6.0" = { + "raw-socket-1.6.1" = { name = "raw-socket"; packageName = "raw-socket"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.0.tgz"; - sha512 = "2268lfw8q4mz0v988by3y0hbad848sx7kmmqm3rk7nbj7xc3sy045adcdbnh3c8vrhk57ljk61wshphgr69y8pw3987f1if369ny7pr"; + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.1.tgz"; + sha512 = "0fhy1r7pyl4v2zmjz1fmvqbdmjscib47pbc5di3cn965j7zj3y5h2bs8x0r131i4s7xj47c36na1cgpppp71kvdc1qs78y4bf7fpa45"; }; }; "rc-0.4.0" = { @@ -22569,13 +22659,13 @@ let sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; }; }; - "rc-1.2.7" = { + "rc-1.2.8" = { name = "rc"; packageName = "rc"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz"; - sha512 = "30b4pqzhk8f4ppzyk5diwxac7xpf4hd3rysyin012l59da9v5iaai4wd6yzlz3rjspfvvy191q6qcsw47mwlw9y07n35kzq23rw7lid"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb"; }; }; "rc-config-loader-2.0.1" = { @@ -22803,13 +22893,13 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "record-cache-1.0.2" = { + "record-cache-1.1.0" = { name = "record-cache"; packageName = "record-cache"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/record-cache/-/record-cache-1.0.2.tgz"; - sha512 = "2iykkjgwmmcma3306cjzsq34dg6rxfvwr4r11fyq56dfsybp9qwnvhc4fbi3l854zfj71fbw887bgab78ykr6b3m9gdw2lpf5sa53c0"; + url = "https://registry.npmjs.org/record-cache/-/record-cache-1.1.0.tgz"; + sha512 = "3shd2b83m3bh5bcli5zl99k652hv5b06ldcnjv48gwarfxh02smyy2vr1z3z2zi9p9zgp41bhsgql042a66azy9d78v2mq9n6sdpjmv"; }; }; "recursive-readdir-2.2.2" = { @@ -23253,6 +23343,15 @@ let sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; + "request-2.83.0" = { + name = "request"; + packageName = "request"; + version = "2.83.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; + sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; + }; + }; "request-2.85.0" = { name = "request"; packageName = "request"; @@ -23262,13 +23361,13 @@ let sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph"; }; }; - "request-2.86.0" = { + "request-2.87.0" = { name = "request"; packageName = "request"; - version = "2.86.0"; + version = "2.87.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.86.0.tgz"; - sha512 = "37xa5i4dk3fkcl9gxrzxkjjy6vcqn6bcc61bwq6kjpqrg5i01yc6xn0iq3zy68vqqav93k1kgr2xdabp22p0bfynfcbzxp8ms3n41h5"; + url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; + sha512 = "0vnsbflzj7gxa33r47bzsiaf7jc00b9iqkqdz8l7n9x5dgdgbq1qpcqqslds1arazipz8pjr4m5rf4ikg4d59d49gn9dky0ds921jkx"; }; }; "request-2.9.203" = { @@ -23757,13 +23856,22 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "rxjs-5.5.10" = { + "rxjs-5.5.11" = { name = "rxjs"; packageName = "rxjs"; - version = "5.5.10"; + version = "5.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz"; - sha512 = "3lc28jznaclc3qcipvf29dnfa11m4xdzyr4gkas29pgp0s4c44f8cyzsxyfwkqzqa8k06q7j7hl5wwyy671d8gdkwl9j76lh2cf4629"; + url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz"; + sha512 = "029r8qw66ax8g757mxnmvzr302rv7b2lw33sqv7b81qnbkms9qz0biijvpm2bv3fd3zpydal11iygnf061w2rmray10sz0n9knwxf6x"; + }; + }; + "rxjs-6.2.0" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.0.tgz"; + sha512 = "01sy4p9dqb8xiv59c5dn2lwza4jm6dv1hsy9v4ifj60kwh1l8iqar17lvgxmhjpqjaqgqkrx6kx0kv7l121704v16if4y5sxgkdy758"; }; }; "safe-buffer-5.0.1" = { @@ -23802,13 +23910,13 @@ let sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"; }; }; - "safe-json-stringify-1.1.0" = { + "safe-json-stringify-1.2.0" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.1.0.tgz"; - sha512 = "30fqwpa7qn9rsk4va9ih61jqhm0x59s3wa2n5kff1ygdwpi9hxmpig24y1vhdv1di2pfd6gy0iwkryix6lc5gff7pcb3xa7l58nsc0k"; + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz"; + sha512 = "2z2n4cbf392dw9gbghn8paj8jsqkijbkpb6gf8z2nm4kdkzqwjjb7szpadczbcxbd5i035g2dha2yy6vgmv9wm47g8d7ffrd63iwzw0"; }; }; "safe-regex-1.1.0" = { @@ -24189,6 +24297,15 @@ let sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; + "serve-handler-3.1.0" = { + name = "serve-handler"; + packageName = "serve-handler"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.1.0.tgz"; + sha512 = "2aha60igym9agandgfm7r4wy0g4ql85bs904k1556hdw098s3akj72c8mwb3ws5ldsy3ac5iw79f0ryjk3cac0fg2n3n9jhjy11mnh9"; + }; + }; "serve-index-1.7.3" = { name = "serve-index"; packageName = "serve-index"; @@ -24423,6 +24540,15 @@ let sha512 = "0c12wlk7s62rnm6d8cc4frddll01p5f117v2ss075y9zxxfpl5qr322bw7qdksgl7ljfc04rv2wyn6qyjv1m5953ywmgk39srif43v0"; }; }; + "shelljs-0.8.2" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.2.tgz"; + sha512 = "1nj08kpx8435xrk1w1jk0g6mlcfd3jim2px55dmpg97rnjd2md5fzhrqw0wpk54ipfaclrhkly2z51dg6xbq8fwi9yngnc0n0vdw5d5"; + }; + }; "shellwords-0.1.1" = { name = "shellwords"; packageName = "shellwords"; @@ -24450,13 +24576,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-0.3.0" = { + "sign-addon-0.3.1" = { name = "sign-addon"; packageName = "sign-addon"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.3.0.tgz"; - sha512 = "2czjlarf0pa0svlhbdb9i6hrk429za0gsialmxbmgwgbhyjx7mxkgf5mww4rkmsbncdi2va8p64rxjxf7gv8b0jd2a87cvm7rw5pky5"; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.3.1.tgz"; + sha512 = "3a5wipkwz1q19jlw99bsrjinimlb6a21c4sihrk1aqx0pdkclskjmayby3j1xwx1l0ngba0asar542d2pgi33i99gypl8dwpwdsirkx"; }; }; "signal-exit-3.0.2" = { @@ -24522,13 +24648,13 @@ let sha512 = "021na7dsxyawdzbif9l56dzgvzdd5s4kwm09rb8hg3abvr94i05arvn0z6q5vmpi24bmnnp2i677rf7964fza0frx3zx406a82x6kbm"; }; }; - "simple-git-1.92.0" = { + "simple-git-1.95.1" = { name = "simple-git"; packageName = "simple-git"; - version = "1.92.0"; + version = "1.95.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.92.0.tgz"; - sha1 = "6061468eb7d19f0141078fc742e62457e910f547"; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.95.1.tgz"; + sha512 = "3ssfxzdgj6ycrklss1hxrmwcfsncx9bccnsxrkdknw68p2g9is3j3dc2kk748jn0kky9q7ajdjqvv6k18n6qbj9llaiy5kh9k1i7mbj"; }; }; "simple-lru-cache-0.0.2" = { @@ -24549,13 +24675,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.1.1" = { + "simple-peer-9.1.2" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.1.1"; + version = "9.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.1.1.tgz"; - sha512 = "27d9j7ah5ync1cndpinw966zb81lc9z6pc38y8dkc1l5rxdkv3fmf5ilhf0jq94m3qvb2ipldjmvbs1sza5ccvazwlr4pjgfr07ym23"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.1.2.tgz"; + sha512 = "3csdx7k87pxpga7kmqdwl6fxyrj0q2kfv4174qcp5nkiyr19458p45jmvr3rss656ldas23p8jd1hyp22bf51x3934cprb8isg9ci9i"; }; }; "simple-plist-0.2.1" = { @@ -24648,13 +24774,13 @@ let sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9"; }; }; - "siphash24-1.1.0" = { + "siphash24-1.1.1" = { name = "siphash24"; packageName = "siphash24"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.0.tgz"; - sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w"; + url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.1.tgz"; + sha512 = "1ach37ibirvd6yxa42ffkn1dwfcar70pjbnj9alrf713n1bdzb4y44nbrm5bi3swpvqrr7f8sbbcyj586wn049hxmyawf8kia6b18kl"; }; }; "skin-tone-1.0.0" = { @@ -24855,13 +24981,13 @@ let sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "snyk-1.80.1" = { + "snyk-1.82.1" = { name = "snyk"; packageName = "snyk"; - version = "1.80.1"; + version = "1.82.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.80.1.tgz"; - sha1 = "f92d1fea82833a39a607598f847e2699f033be5c"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.82.1.tgz"; + sha1 = "df0abf9d398507b512e2749790da67e56c3a853e"; }; }; "snyk-config-2.1.0" = { @@ -24873,13 +24999,13 @@ let sha512 = "0r81kdx8az7nfiv0r36ggarzdw5rzai06qivv1r48xdfax2gdz9axxjhnwyzhf3mpz6245fz2ilc8l349h85s01yh05rxjsjvbg6m8g"; }; }; - "snyk-go-plugin-1.5.0" = { + "snyk-go-plugin-1.5.1" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.5.0.tgz"; - sha512 = "20i967dg1n1pir2j0ivpd72i5j3y9xa3826jvl8jspmg9wfnpfq6x0isp3irw42zrcvflshi0nhk3sckcj3lqgjaw82g14wda28g80z"; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.5.1.tgz"; + sha512 = "1zmpzigws5iqn3zfv0800m0hnlxf43vbwgi3220mafnij8g8narf0dlaywdbacvhbv1l0mmaj78l3pwkdg5slpiwl5zarrr7lwwkqzh"; }; }; "snyk-gradle-plugin-1.3.0" = { @@ -24936,13 +25062,13 @@ let sha512 = "3pmnx9hjrlz0gpxy6b2gia65h1rpdalc1g68s759p0ik0xq5rgi8hm3cqnvicg24cgqm8qwdsf5v7bcfxcj3m6yi7rc2wgkf0vahj08"; }; }; - "snyk-python-plugin-1.6.0" = { + "snyk-python-plugin-1.6.1" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.6.0.tgz"; - sha512 = "06n8zx8az0afp7b2gnav664hzmjxg5dp96a5vmy5a58dhr278x6fl7pgsd332ykxanphrm59dsm0hyka2s8wibam2v8wjbgm4xxrlzz"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.6.1.tgz"; + sha512 = "3z8rghcn45p0mmj39ivns6arnnqshmxrqbcrmdccawnffkw9jrnrsk6w64jqk524c1iw770hj5fd8zrcfbncccl67qgd9vp026gjfpb"; }; }; "snyk-resolve-1.0.1" = { @@ -25026,13 +25152,13 @@ let sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; }; }; - "socket.io-2.1.0" = { + "socket.io-2.1.1" = { name = "socket.io"; packageName = "socket.io"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.0.tgz"; - sha512 = "2wkm6yqxvn8wk51rbakza3zxg3rknzfgmwqrbzvnlacf1yylplsr61i67m01sg8x7589ymj6x3z266ngvqd6qyyakdx4dlnsl4bfbr9"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz"; + sha512 = "343q0n5zxyjzzcmyq7dr3naqbrpl3x469y1ff8zxxr104np1l5l9w1d0vl7nncbaxhxymwplbzfy9sbipjrbp5d001nvv9ysymnmr5c"; }; }; "socket.io-adapter-0.2.0" = { @@ -25098,13 +25224,13 @@ let sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e"; }; }; - "socket.io-client-2.1.0" = { + "socket.io-client-2.1.1" = { name = "socket.io-client"; packageName = "socket.io-client"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.0.tgz"; - sha512 = "1xkd66603gshd7s080j107ms405z18mljc7gbmnkllph1zfg82sz5mgvsyhi1zs3bbv5lgvv29gxfn624gpv46v5mwy610wpnj8zwjf"; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz"; + sha512 = "0cz212gqzp9irm3pk6inzssq4skpihd5i0xszrwv1j27igvqdwvnrimk8ah6px53j77yjhhw5q96fl74pj7c852iqgic5rf235ca6cg"; }; }; "socket.io-parser-2.1.2" = { @@ -25251,13 +25377,13 @@ let sha1 = "0df42a679d7ae4aed9c30ba2f55807d979910fcc"; }; }; - "sorted-array-functions-1.1.0" = { + "sorted-array-functions-1.2.0" = { name = "sorted-array-functions"; packageName = "sorted-array-functions"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.1.0.tgz"; - sha512 = "209rl01n6lwbsxl40lmh1v38sad3d94s0mjb4mz6r3wwwhzcahibr8m2fhlqgsjgzf3dja9wyhz7qjkw39gxlwpapyid2whs4nrzbnf"; + url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.2.0.tgz"; + sha512 = "1759vgxawg63w16nnrklz5azzj9kklrlz5sdd643y8jp8qz7hiwdn5ydlnwx2ns4j761x4rqllh6fvlzjqgi3dixy7dl9hr28z66smi"; }; }; "sorted-indexof-1.0.0" = { @@ -25395,13 +25521,13 @@ let sha512 = "3xy2ylp2qm8jwglcsf2fjwvn5w56im64w7yjghyv9ilw2fc5qj65w8h38lpls27m3b5prv8x9cnfmrhkfk7rlb52hmf810ycs0i7abq"; }; }; - "source-map-support-0.5.4" = { + "source-map-support-0.5.6" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.4"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz"; - sha512 = "1vfdnbvldylljhm89hfxwsr3pd108my5z1l9gx8ld1j2v2bfpranqc7kc8i9mj24lbq6c4xxs181anrsa5ypbfd3r08v3c1dqyd4i1w"; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz"; + sha512 = "3x2mxqlzmqrwgf52cfc1pspxkzfwzasapfbrgcl50akjzpn8xva5nwm6xp8z1l3f2acnr5rsp7hhm6nfn8vvxk6gy7slw737q9rg0ip"; }; }; "source-map-url-0.4.0" = { @@ -25593,6 +25719,15 @@ let sha1 = "04e6926f662895354f3dd015203633b857297e2c"; }; }; + "sprintf-js-1.1.1" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz"; + sha1 = "36be78320afe5801f6cea3ee78b6e5aab940ea0c"; + }; + }; "srcset-1.0.0" = { name = "srcset"; packageName = "srcset"; @@ -25629,13 +25764,13 @@ let sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; }; }; - "sshpk-1.14.1" = { + "sshpk-1.14.2" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; - sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; + sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; }; }; "sshpk-1.7.1" = { @@ -25683,15 +25818,6 @@ let sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; - "stack-trace-0.0.9" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; - }; - }; "stat-mode-0.2.2" = { name = "stat-mode"; packageName = "stat-mode"; @@ -25845,13 +25971,13 @@ let sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; }; }; - "stream-http-2.8.2" = { + "stream-http-2.8.3" = { name = "stream-http"; packageName = "stream-http"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.2.tgz"; - sha512 = "2acp8k8lfjmh87zlzmx7ah9wwxsbjdff6mmms6c24kkrjqvgh0iv6mzbaakmspnx8kc9ysw3ba378xkjc95nfiyfg7m05va32n5yna2"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz"; + sha512 = "19y2xbs1xzzpjwfdczl21d0d76ahd7013cr3mhfa6a8nbwwv9jpncng8idf0g8hnmnq2mcl3xh912rjlasl06wsz44qw3j7hdya8d7r"; }; }; "stream-parser-0.3.1" = { @@ -26241,15 +26367,6 @@ let sha1 = "1cb45aaf57530f4caf86c7f75179d2c9a51dd572"; }; }; - "strip-bom-stream-1.0.0" = { - name = "strip-bom-stream"; - packageName = "strip-bom-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz"; - sha1 = "e7144398577d51a6bed0fa1994fa05f43fd988ee"; - }; - }; "strip-bom-stream-2.0.0" = { name = "strip-bom-stream"; packageName = "strip-bom-stream"; @@ -26349,13 +26466,13 @@ let sha512 = "31a8vlzg4gwak3cx7n0lask77xyqpf5mz4ckphc10ykmb9r2lais7v4w8a8xij9lv2115xjnl7avkwp2l7cw3kbc3lpjsghl72757lk"; }; }; - "strong-data-uri-1.0.5" = { + "strong-data-uri-1.0.6" = { name = "strong-data-uri"; packageName = "strong-data-uri"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.5.tgz"; - sha512 = "2mwdm0k873sdi2bramixwg6fafqyi2313scq32fsnq2qa5hqbpdln34rc9a67wd15mi05v3c6bfiw6r4h7dy4aac1q3ac8b2ig6j96n"; + url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.6.tgz"; + sha512 = "37yd0qnzaq13fz3972b3fckz0hcpq2xxhjbz769vl8fb35sd3ycr5qs181d5in9cq08qlf59c9xl5sylyvplm5i4bv19fplxdjw276f"; }; }; "strong-log-transformer-1.0.6" = { @@ -26466,13 +26583,13 @@ let sha512 = "158ng0v99ac7csif7v6153bp63nxmlz2a613z8y09sk8jsj2rpalscgg0lfzdlpfdd5612jqsnkvrz0137inka2qjcmcjrmy2xhrkaf"; }; }; - "supports-color-4.4.0" = { + "supports-color-5.1.0" = { name = "supports-color"; packageName = "supports-color"; - version = "4.4.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; - sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz"; + sha512 = "04q31rfgx0r6jgs2r1k6kmzab1vw3qrikiv8wsl86rxll77vdalrag7r4ypww3qp6v8k3avsjc0jxd3ga45fb5f51akm30a9b100ba7"; }; }; "supports-color-5.4.0" = { @@ -26493,6 +26610,15 @@ let sha1 = "8340fc4702c3122df5d22288f88283f513d3fdd4"; }; }; + "symbol-tree-3.2.2" = { + name = "symbol-tree"; + packageName = "symbol-tree"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz"; + sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"; + }; + }; "sync-request-3.0.0" = { name = "sync-request"; packageName = "sync-request"; @@ -26620,13 +26746,13 @@ let sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5"; }; }; - "tar-4.4.2" = { + "tar-4.4.4" = { name = "tar"; packageName = "tar"; - version = "4.4.2"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz"; - sha512 = "25ypdsz6l4xmg1f89pjy8s773j3lzx855iiakbdknz115vxyg4p4z1j0i84iyjpzwgfjfs2l2njpd0y2hlr5sh4n01nh6124zs09y85"; + url = "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz"; + sha512 = "3iy3r78nycp0ly9nldcygkklrc7jas93k4bis6ypiw5fqlsygqyylgwl1378qf61r1yh2lsd11vrjr8hwfzw4j25d95yd0zhv265bws"; }; }; "tar-fs-1.16.2" = { @@ -27061,15 +27187,6 @@ let sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; }; }; - "to-absolute-glob-0.1.1" = { - name = "to-absolute-glob"; - packageName = "to-absolute-glob"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz"; - sha1 = "1cdfa472a9ef50c239ee66999b662ca0eb39937f"; - }; - }; "to-absolute-glob-2.0.2" = { name = "to-absolute-glob"; packageName = "to-absolute-glob"; @@ -27196,15 +27313,6 @@ let sha512 = "16a6xk2s4y4llqya2gjgwzlvb0512sw8ahxfd4b225j2sd9i52zca1w65d69wd7frzhcz2ak3gf3r3y9ws727b5gnp1n7wh2j3gkciv"; }; }; - "topo-1.1.0" = { - name = "topo"; - packageName = "topo"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz"; - sha1 = "e9d751615d1bb87dc865db182fa1ca0a5ef536d5"; - }; - }; "torrent-discovery-5.4.0" = { name = "torrent-discovery"; packageName = "torrent-discovery"; @@ -27295,6 +27403,15 @@ let sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; }; }; + "tough-cookie-2.4.2" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.2.tgz"; + sha512 = "3misq0zgh4jfhiq1yy0zasmg3zrjk1g3a4hjh7ixj9wcfyjqfw1x2h2265s9013ah2az6mx60wp8np5677pkqkwip55yj95gzwnda5x"; + }; + }; "township-client-1.3.2" = { name = "township-client"; packageName = "township-client"; @@ -27304,6 +27421,24 @@ let sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78"; }; }; + "toxic-1.0.0" = { + name = "toxic"; + packageName = "toxic"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toxic/-/toxic-1.0.0.tgz"; + sha1 = "f1154d8b6ac21875ac943a9f7408df2dfe164ea2"; + }; + }; + "tr46-0.0.3" = { + name = "tr46"; + packageName = "tr46"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; + sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + }; + }; "tr46-1.0.1" = { name = "tr46"; packageName = "tr46"; @@ -27439,13 +27574,13 @@ let sha1 = "dd1a6d15630515663d8475f6f24edf2f800ebb1b"; }; }; - "tslib-1.9.1" = { + "tslib-1.9.2" = { name = "tslib"; packageName = "tslib"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.9.1.tgz"; - sha512 = "115mr4g9y5y6k797nyyxwca0rhx5ax7bqdf3i3kw14dh5n64h27f3v3pnc0asccwllfdyq7azc2lhnq3ibplf3afg5n5607dx5wzxva"; + url = "https://registry.npmjs.org/tslib/-/tslib-1.9.2.tgz"; + sha512 = "0ms6i864mv97lfwlmnzpbf6f539kqcsnj8qbyj12h46r0zszxpk8gsfchs5s7spfwpnapfmbaakx8xiqg0v4rxqmz22nnkpi5ggjlq1"; }; }; "tsscmp-1.0.5" = { @@ -27646,6 +27781,15 @@ let sha512 = "2vwhgmdrdw42wwaqbmrnz7zy197hrxl6smkmhrb3n93vsjmqg24a4r10czdralib6qpj82bx2gw97r3gxlspj7y54jswigs2vj3bf1b"; }; }; + "typescript-2.9.1" = { + name = "typescript"; + packageName = "typescript"; + version = "2.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz"; + sha512 = "1066hcxz9xdrz1mnyz6kl6ms4szdjxvlz6j37mdp6jlf6vnhmdxx8qyikbzgy7yzvx6i7hvxhg51kc6isw9wpar2r1ch3f6zzclral7"; + }; + }; "typewise-1.0.3" = { name = "typewise"; packageName = "typewise"; @@ -27754,22 +27898,31 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.3.24" = { + "uglify-js-3.3.25" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.24"; + version = "3.3.25"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.24.tgz"; - sha512 = "05g7wl6mnfcv2f8qhfh82m743qd8p5hvd99ky9gifcx5zblrbiqcp0qp1jlcayijzr8l9rkf4rfc309kcf2k76097ban8ma716gwbl5"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.25.tgz"; + sha512 = "1qcjjk817lmd65xc8h3axwdnx4h7xkn3k9lf7dy65bm564jhrqvq5v11va9jiamdva9q0nk589i3vm2pn7dvjmjavx5s3d3pj1fi1l6"; }; }; - "uglify-js-3.3.25" = { + "uglify-js-3.3.28" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.25"; + version = "3.3.28"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.25.tgz"; - sha512 = "1qcjjk817lmd65xc8h3axwdnx4h7xkn3k9lf7dy65bm564jhrqvq5v11va9jiamdva9q0nk589i3vm2pn7dvjmjavx5s3d3pj1fi1l6"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.28.tgz"; + sha512 = "25lqpkcyapxq7ql7s778zwxm8mn0h2ir7m3nimvfnbs7myrv1aj5c3xgvvv1nbzvxrhs340gxfmqhpmgd7sqlhfd4icqwisl3ymri7b"; + }; + }; + "uglify-js-3.4.0" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.0.tgz"; + sha512 = "0jsplc22wvbnzdbcs1adsqcdpkn65ywg5ab8lk4v4ajsh9zhiys0qwf2ylairyj8znh9ml8ppknp94vamzlca947paplpz4lffzkir5"; }; }; "uglify-to-browserify-1.0.2" = { @@ -27979,13 +28132,13 @@ let sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; }; }; - "underscore-1.9.0" = { + "underscore-1.9.1" = { name = "underscore"; packageName = "underscore"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.9.0.tgz"; - sha512 = "3w8byp6gw4jzam7sl3g72zy9k8qb67jc9h4fhlhd6xj3zn07rnnm812g9jc6ygfxqi4yv54l800ijnl9b8kizf8wc5582xi4h6pb1g0"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz"; + sha512 = "1v1j738fqadps32lirl0nxzfhif6db9kslri77cwxq3c12adksibr6ips2zxqywh672d32sxrhfcvx2gwpc4a08hcydfxx4f2v1xzp7"; }; }; "underscore-contrib-0.3.0" = { @@ -28231,13 +28384,13 @@ let sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; }; }; - "untildify-3.0.2" = { + "untildify-3.0.3" = { name = "untildify"; packageName = "untildify"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz"; - sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; + url = "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz"; + sha512 = "0l4awya87dx6bnxaywh0dn50ka8hybj603k75d98vlwj9grqfcmaib9hhjy52nsgm62f39v0nnv4yn268jpjy7n9y7wpbwzqwkkyac9"; }; }; "unyield-0.0.1" = { @@ -28267,13 +28420,13 @@ let sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; }; }; - "upath-1.0.4" = { + "upath-1.0.5" = { name = "upath"; packageName = "upath"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz"; - sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p"; + url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz"; + sha512 = "31m1lljcfngdnpyz67gpkwvb66gx6750si3jzmf1vg6kq420fq5lcd34cfgp6wz3manjpqbp9i98ax2yjl2xs7mq824chw38vvsgcm9"; }; }; "upath-1.1.0" = { @@ -28285,13 +28438,13 @@ let sha512 = "2pyjsmaajf6k6ql5qj270l0p3xkjvn25wky2qd1vndvl54ljbv8p8sbr44zsfh33mmrnj93ys4499c3h956wbgn4g82z8b1h3z4ffkg"; }; }; - "update-check-1.5.0" = { + "update-check-1.5.2" = { name = "update-check"; packageName = "update-check"; - version = "1.5.0"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/update-check/-/update-check-1.5.0.tgz"; - sha512 = "3prydk2hhjbg29waf3dvx4097qs7vx5xfp4ibl8ic8nwr01vkd2nwz5lzj1ga02hfyz6cpzcwv3h1q18fxdz6w6z542hwnkjrky2b3d"; + url = "https://registry.npmjs.org/update-check/-/update-check-1.5.2.tgz"; + sha512 = "1lq6181kzdp7xwzay0j8yjy771q89wi18b9cc1wx4l97k1z7gpyv03l3sx7ag2hrdsk6537fcgwqn3pqnvln57wl9czx3wbpdhfcfnm"; }; }; "update-notifier-0.5.0" = { @@ -28366,13 +28519,13 @@ let sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; }; }; - "uri-js-4.2.1" = { + "uri-js-4.2.2" = { name = "uri-js"; packageName = "uri-js"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.1.tgz"; - sha512 = "3s1r9yqdqw9bwiyvkq7gd4ylivchfabhk59s1w1wxq6q8gpysw82340fx3hmsmkwzm2cgf2fz48s065q08ca8711k91gc73f41q54lf"; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9"; }; }; "urix-0.1.0" = { @@ -28528,6 +28681,15 @@ let sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; }; }; + "util-0.10.4" = { + name = "util"; + packageName = "util"; + version = "0.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz"; + sha512 = "3sbbgsya51i86ih8bn3nfwi3f9556xlnwh32z4k54dwcpi0jibhfa5dpbfmpzyla63yh2zlxs9chl6wkhc8bqjmjxjyxc9p6j2vvyfh"; + }; + }; "util-0.4.9" = { name = "util"; packageName = "util"; @@ -28699,15 +28861,6 @@ let sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4"; }; }; - "vali-date-1.0.0" = { - name = "vali-date"; - packageName = "vali-date"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz"; - sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; - }; - }; "valid-identifier-0.0.1" = { name = "valid-identifier"; packageName = "valid-identifier"; @@ -28735,22 +28888,22 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; - "validator-3.22.2" = { + "validator-5.2.0" = { name = "validator"; packageName = "validator"; - version = "3.22.2"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-3.22.2.tgz"; - sha1 = "6f297ae67f7f82acc76d0afdb49f18d9a09c18c0"; + url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz"; + sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689"; }; }; - "validator-5.2.0" = { + "validator-9.4.1" = { name = "validator"; packageName = "validator"; - version = "5.2.0"; + version = "9.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz"; - sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689"; + url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz"; + sha512 = "2f2x8zxh7czpkf33h5x8fvj48rfszyhkar554x5c2hw7qlsbdqjqvv6nczzsfkw6z5rj6gqabxhcg8haip0xgz7sn4jr6fi7f7llpk1"; }; }; "value-or-function-3.0.0" = { @@ -28960,15 +29113,6 @@ let sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"; }; }; - "vinyl-fs-2.4.4" = { - name = "vinyl-fs"; - packageName = "vinyl-fs"; - version = "2.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz"; - sha1 = "be6ff3270cb55dfd7d3063640de81f25d7532239"; - }; - }; "vinyl-fs-3.0.3" = { name = "vinyl-fs"; packageName = "vinyl-fs"; @@ -29131,13 +29275,13 @@ let sha1 = "e48d79962f0b8e02de955e3f524908e2b19c0374"; }; }; - "vscode-languageserver-types-3.7.2" = { + "vscode-languageserver-types-3.8.1" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.7.2"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz"; - sha512 = "3n581a9795k5a0qvbz28rfqjp0dmyjm1rq0djpjvbqrairl7p30d24qpaj3wgfbdc3wx3gjym3b5sdcb6742jr8if12s3cg1x2gdl1g"; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.8.1.tgz"; + sha512 = "2kmqzghy2829p65vyf6q1q0ia27sdr2vmvny3krqzxqi4m2vbww8aa3yza4zwvpq81dqcncmrgs1phryq20f6dj004n19w12jph3hiv"; }; }; "vscode-uri-1.0.3" = { @@ -29149,6 +29293,15 @@ let sha1 = "631bdbf716dccab0e65291a8dc25c23232085a52"; }; }; + "vscode-uri-1.0.5" = { + name = "vscode-uri"; + packageName = "vscode-uri"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.5.tgz"; + sha1 = "3b899a8ef71c37f3054d79bdbdda31c7bf36f20d"; + }; + }; "walk-2.3.13" = { name = "walk"; packageName = "walk"; @@ -29212,13 +29365,13 @@ let sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; }; }; - "webassemblyjs-1.4.3" = { - name = "webassemblyjs"; - packageName = "webassemblyjs"; - version = "1.4.3"; + "webidl-conversions-2.0.1" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.4.3.tgz"; - sha512 = "2786k2y7kvcmjs50g35vaxik7kjr475fdhynq35yi7vayfjd7zkpn6gydh8vqhmx3g8xmr7j2ddwqgk540ij0wr7ks5r8pspga9alz2"; + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-2.0.1.tgz"; + sha1 = "3bf8258f7d318c7443c36f2e169402a1a6703506"; }; }; "webidl-conversions-4.0.2" = { @@ -29266,13 +29419,13 @@ let sha512 = "1bq9cabpvsx4b0aajmbhsgkdzh816rrixhbnsmvcr0ypcndhn5zz9fggfc8i4l2s00b6jhif65phkc9l6zvika8ngb21rip9qx4pj4m"; }; }; - "webtorrent-0.99.4" = { + "webtorrent-0.100.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.99.4"; + version = "0.100.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.99.4.tgz"; - sha512 = "1d0rpdlr8flkbipr3qhr59qknfc3mlmz8ka9w6mnkbxhdflwky2l1f3z244xzgis509c8r1qyyjskv99ccrmc10rz93l52f4bb7m0kj"; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.100.0.tgz"; + sha512 = "05cwyzkhrwrrnb5mwnv8xb2db8p0i0fb6ys01rm22iymgcmx56r6cj4b0yiy3j13k1sin6h36sbvvpmamgl6d2mwriy35mm41yn2wvg"; }; }; "whatwg-fetch-2.0.4" = { @@ -29284,13 +29437,22 @@ let sha512 = "2g4p2ymmww4wm7cf86xwpb0dndwlxk1gg3brsrj892a4z593h25hyhqv0rmv4hzz4zxv3smmaflsnhilakfpr6y8f2gf3sfd8ckbi3m"; }; }; - "whatwg-url-6.3.0" = { + "whatwg-url-6.4.1" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "6.3.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.3.0.tgz"; - sha512 = "01m395qx0wag7d63id97v2d86ifpw677f42lys2k6bipw4n9kmwngghsb7la19impgkrg3n4ihyk3j7963rhfgd7b066a4qk09s3kxc"; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz"; + sha512 = "27rkflmrkzbamg28yflyisk49jl2dnvmk4651sn7hhig2rsahxj4c5ld3ljx9mjps0f6zqv0yvwl7d37w817vkmx7qnxiqp3frs030p"; + }; + }; + "whatwg-url-compat-0.6.5" = { + name = "whatwg-url-compat"; + packageName = "whatwg-url-compat"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz"; + sha1 = "00898111af689bb097541cd5a45ca6c8798445bf"; }; }; "when-3.4.6" = { @@ -29338,13 +29500,13 @@ let sha1 = "1557f96080604e5b11b3599eb9f45b50a9efd722"; }; }; - "which-1.3.0" = { + "which-1.3.1" = { name = "which"; packageName = "which"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz"; - sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5"; + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz"; }; }; "which-module-1.0.0" = { @@ -29374,13 +29536,13 @@ let sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; }; }; - "wide-align-1.1.2" = { + "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz"; - sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0"; }; }; "widest-line-2.0.0" = { @@ -29680,13 +29842,13 @@ let sha1 = "2b64c8a33004d54b8698c76d585a77ceb61da32f"; }; }; - "write-pkg-3.1.0" = { + "write-pkg-3.2.0" = { name = "write-pkg"; packageName = "write-pkg"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz"; - sha1 = "030a9994cc9993d25b4e75a9f1a1923607291ce9"; + url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.2.0.tgz"; + sha512 = "1msk3p98r3hzidf6hvbxnljq4l0kx707g3fjd7xpnfrdmm03plhmk8amgpbqlgya3syknzlr0pcvpckixnla8sw2x743a0qkmys4zdm"; }; }; "ws-0.4.31" = { @@ -29743,13 +29905,13 @@ let sha512 = "1ldy8hddsvy7lb045cx4jrnx09962j98zp7y16f64gkw8z99ww61w91mjhrm85bqpsf3b158yhfh6yf01g1a2zrgm6v9bkx87r7ys34"; }; }; - "ws-5.1.1" = { + "ws-5.2.0" = { name = "ws"; packageName = "ws"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.1.1.tgz"; - sha512 = "01whkym8fx8qjmx8s548zzw3ba05x8canb59v5yzidbwxdm7w1kfcfqhzzrxni1r9idqgla5ll5d3kp6fmk1sdn0k7d9lwvj2zarsvc"; + url = "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz"; + sha512 = "3pmkb3asbbxiwwa4s5zajisi21girs2bba8pzl2ywwls6pjv3rzmmzckycl6705850jn68akzhm42844wxq9r2w1hfl8g5ywlqispvk"; }; }; "wtf-8-1.0.0" = { @@ -29806,13 +29968,13 @@ let sha1 = "f82d2fedee63af76687b70115ce6274dc71310e9"; }; }; - "xhr-2.4.1" = { + "xhr-2.5.0" = { name = "xhr"; packageName = "xhr"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/xhr/-/xhr-2.4.1.tgz"; - sha512 = "38f6fgl0n5syagym161b29l5vhyan3azv5zs3vmyd4s80svy9xl7ppczk3rdawjn70s1ws5qvbh5zf1wyrj2ifawnr7ix3by3k180m4"; + url = "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz"; + sha512 = "36z7hw07wb42na5hy12xmsrg9yzd3hd5ln8y3wyq88qh4xvxr2lp07bbp5la5254mf8qaimgg1plwzvvvsmvj0mcma17p1dbvzlwyg2"; }; }; "xml-1.0.0" = { @@ -29824,6 +29986,15 @@ let sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe"; }; }; + "xml-name-validator-2.0.1" = { + name = "xml-name-validator"; + packageName = "xml-name-validator"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz"; + sha1 = "4d8b8f1eccd3419aa362061becef515e1e559635"; + }; + }; "xml2js-0.1.14" = { name = "xml2js"; packageName = "xml2js"; @@ -30023,15 +30194,6 @@ let sha1 = "fcd82267e9351c13f0fb9c73307f25331d29c63a"; }; }; - "xpath.js-1.0.7" = { - name = "xpath.js"; - packageName = "xpath.js"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz"; - sha1 = "7e94627f541276cbc6a6b02b5d35e9418565b3e4"; - }; - }; "xpath.js-1.1.0" = { name = "xpath.js"; packageName = "xpath.js"; @@ -30149,6 +30311,15 @@ let sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a"; }; }; + "yargs-10.0.3" = { + name = "yargs"; + packageName = "yargs"; + version = "10.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz"; + sha512 = "1vn6jsqrhybxddyhmvkh0d43n2lk1z8081glfq80zpjfs4xgwpk0mmgdiry9zgsihmv9a2qidmp5hhyqqq8mzzkr037wla0qd1nk80f"; + }; + }; "yargs-10.1.2" = { name = "yargs"; packageName = "yargs"; @@ -30167,13 +30338,13 @@ let sha512 = "03n9lfnyx1dfj5sm811f3d96djsr6fixd5qi6cl6wj8xf0y01sgn7w3ynv5gn2vl30dwq5mz2hw5f522v8xbwc8m9h6nf8hqsa7wfj6"; }; }; - "yargs-11.1.0" = { + "yargs-12.0.0-candidate.0" = { name = "yargs"; packageName = "yargs"; - version = "11.1.0"; + version = "12.0.0-candidate.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz"; - sha512 = "3j5awbfcbh8ik0kz01mycydpi1bz9fg70xc66lk1r1qvrs5x41i2w8nvgj0aip7z9vypcsxks76z75sz4lr6z3ida9c04inkvsbl19p"; + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.0-candidate.0.tgz"; + sha512 = "37vyz2vs984q5yf8pgzrk4bpfd1xr5c24scmy2mpdqkr06vwdr2d9zkicq2pih940ji5jb8yr8frfqnha9s8x0sa1xnz78k6v8qxcyi"; }; }; "yargs-3.10.0" = { @@ -30230,6 +30401,15 @@ let sha1 = "52acc23feecac34042078ee78c0c007f5085db4c"; }; }; + "yargs-parser-10.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz"; + sha512 = "3ibmsxsbhaixclrqx83c1f4hglv4ydcry35kzs40phbri2nbb1lj7c44f89yvzvl7f6j4iqw7idrcpa7p2pzpvj60g5ckd3df6xwcgq"; + }; + }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -30293,6 +30473,15 @@ let sha1 = "a81981ea70a57946133883f029c5821a89359a7f"; }; }; + "yauzl-2.9.2" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.2.tgz"; + sha1 = "4fb1bc7ae1fc2f57037b54af6acc8fe1031c5b77"; + }; + }; "yeast-0.1.2" = { name = "yeast"; packageName = "yeast"; @@ -30320,13 +30509,13 @@ let sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236"; }; }; - "yeoman-environment-2.1.1" = { + "yeoman-environment-2.2.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.1.1.tgz"; - sha512 = "0sy09nlr3nq9mmxlglxwf3crzy5krv9hn9pbd6xfpnglg23mz3kmd9s237fnlmisb8rabkn4kycwpdqf1nn47gcc90krb69984z04i0"; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.2.0.tgz"; + sha512 = "1j1l2698kspscp1safdg4df58da6gd90dgys9b2n2lyb5kgzgi0cd6s4hnbbsr2axxm48fs4pak9a7spqlhr09iw8l5aihhdwhs23w1"; }; }; "yosay-2.0.2" = { @@ -30417,7 +30606,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."array-unique-0.3.2" - sources."async-2.6.0" + sources."async-2.6.1" sources."babel-code-frame-6.26.0" (sources."babel-core-6.26.3" // { dependencies = [ @@ -30441,11 +30630,11 @@ in sources."brace-expansion-1.1.11" sources."chalk-1.1.3" sources."chmodr-1.0.2" - sources."colors-1.2.5" + sources."colors-1.3.0" sources."commander-2.15.1" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" - sources."core-js-2.5.6" + sources."core-js-2.5.7" sources."debug-2.6.9" sources."detect-indent-4.0.0" sources."ejs-2.5.7" @@ -30515,7 +30704,7 @@ in sources."underscore-1.6.0" sources."universalify-0.1.1" sources."walk-sync-0.3.2" - sources."which-1.3.0" + sources."which-1.3.1" sources."xml2js-0.2.8" sources."xml2tss-0.0.5" sources."xmldom-0.1.27" @@ -30548,7 +30737,6 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."binary-0.3.0" - sources."boom-4.3.1" sources."brace-expansion-1.1.11" sources."buffers-0.1.1" sources."caseless-0.12.0" @@ -30559,11 +30747,6 @@ in sources."commander-2.15.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."cuint-0.2.2" sources."dashdash-1.14.1" sources."decompress-zip-0.3.0" @@ -30582,8 +30765,6 @@ in sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -30618,11 +30799,11 @@ in sources."q-1.5.1" sources."qs-6.5.2" sources."readable-stream-1.1.14" - sources."request-2.86.0" + sources."request-2.87.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" - sources."sntp-2.1.0" - sources."sshpk-1.14.1" + sources."safer-buffer-2.1.2" + sources."sshpk-1.14.2" sources."string_decoder-0.10.31" sources."tmp-0.0.28" (sources."touch-0.0.3" // { @@ -30650,60 +30831,49 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.18"; + version = "0.10.19"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.18.tgz"; - sha512 = "05k876g0s9ac53vrqqcn5h2l6s9ccawihr29gxvj8fib49qg2mhf1v52277r2wgcjxibj7vq2b3zp2jkp0vwd6d1pkv8alwf84ri6wc"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.19.tgz"; + sha512 = "34bg8wqi85ixnqxjvcz6qh1mny2v5p93dhspifymj6hhyxdxxzm83bmrzbhk8n5d9sl46167y5q8ddx7wv2jb5v00ypirwb5y3n5q7l"; }; dependencies = [ sources."@types/caseless-0.12.1" sources."@types/form-data-2.2.1" - sources."@types/node-8.10.16" + sources."@types/node-8.10.18" sources."@types/request-2.47.0" sources."@types/tough-cookie-2.3.3" sources."@types/uuid-3.4.3" sources."JSV-4.0.2" - sources."adal-node-0.1.21" + sources."adal-node-0.1.28" sources."ajv-5.5.2" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" - sources."ansi-styles-1.0.0" + sources."ansi-styles-2.2.1" sources."applicationinsights-0.16.0" sources."asap-2.0.6" sources."asn1-0.2.3" - sources."assert-plus-1.0.0" + sources."assert-plus-0.2.0" sources."async-1.4.2" sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" + sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."azure-arm-authorization-2.0.0" - (sources."azure-arm-batch-0.3.0" // { - dependencies = [ - sources."async-0.2.7" - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - ]; - }) - (sources."azure-arm-cdn-1.0.3" // { - dependencies = [ - sources."async-0.2.7" - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - ]; - }) - (sources."azure-arm-commerce-0.2.0" // { - dependencies = [ - sources."async-0.2.7" - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - ]; - }) + sources."azure-arm-batch-3.1.0" + sources."azure-arm-cdn-4.0.1" + sources."azure-arm-commerce-2.0.0" sources."azure-arm-compute-3.0.0-preview" (sources."azure-arm-datalake-analytics-1.0.2-preview" // { dependencies = [ - sources."async-0.2.7" + sources."async-2.6.1" + sources."commander-2.15.1" sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" + (sources."ms-rest-azure-1.15.7" // { + dependencies = [ + sources."async-0.2.7" + ]; + }) + sources."readable-stream-2.0.6" + sources."request-2.74.0" ]; }) (sources."azure-arm-datalake-store-1.0.2-preview" // { @@ -30711,26 +30881,22 @@ in sources."async-0.2.7" sources."ms-rest-1.15.7" sources."ms-rest-azure-1.15.7" + sources."request-2.74.0" ]; }) - (sources."azure-arm-devtestlabs-0.1.0" // { - dependencies = [ - sources."async-0.2.7" - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - ]; - }) - sources."azure-arm-dns-2.0.0-preview" + sources."azure-arm-devtestlabs-2.1.1" + sources."azure-arm-dns-2.1.0" sources."azure-arm-hdinsight-0.2.2" sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" sources."azure-arm-iothub-1.0.1-preview" - sources."azure-arm-network-5.1.0" - (sources."azure-arm-powerbiembedded-0.1.0" // { + sources."azure-arm-network-5.3.0" + (sources."azure-arm-powerbiembedded-0.1.1" // { dependencies = [ sources."async-0.2.7" sources."ms-rest-1.15.7" sources."ms-rest-azure-1.15.7" + sources."request-2.74.0" ]; }) (sources."azure-arm-rediscache-0.2.3" // { @@ -30738,6 +30904,7 @@ in sources."async-0.2.7" sources."ms-rest-1.15.7" sources."ms-rest-azure-1.15.7" + sources."request-2.74.0" ]; }) (sources."azure-arm-resource-1.6.1-preview" // { @@ -30745,28 +30912,18 @@ in sources."async-0.2.7" sources."ms-rest-1.15.7" sources."ms-rest-azure-1.15.7" + sources."request-2.74.0" ]; }) - (sources."azure-arm-servermanagement-0.1.2" // { - dependencies = [ - sources."async-0.2.7" - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - ]; - }) - (sources."azure-arm-storage-0.15.0-preview" // { - dependencies = [ - sources."async-0.2.7" - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - ]; - }) + sources."azure-arm-servermanagement-1.1.0" + sources."azure-arm-storage-5.0.0" sources."azure-arm-trafficmanager-1.1.0-preview" - (sources."azure-arm-website-0.11.4" // { + (sources."azure-arm-website-0.11.5" // { dependencies = [ sources."async-0.2.7" sources."ms-rest-1.15.7" sources."ms-rest-azure-1.15.7" + sources."request-2.74.0" ]; }) sources."azure-asm-compute-0.18.0" @@ -30778,36 +30935,37 @@ in sources."azure-asm-storage-0.12.0" sources."azure-asm-subscription-0.10.1" sources."azure-asm-trafficmanager-0.10.3" - (sources."azure-asm-website-0.10.4" // { + (sources."azure-asm-website-0.10.6" // { dependencies = [ - sources."moment-2.14.1" + sources."moment-2.18.1" + sources."underscore-1.9.1" ]; }) - (sources."azure-batch-0.5.2" // { + (sources."azure-batch-3.2.1" // { dependencies = [ - sources."async-0.2.7" - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" + sources."underscore-1.9.1" ]; }) - (sources."azure-common-0.9.18" // { + (sources."azure-common-0.9.20" // { dependencies = [ - sources."validator-3.22.2" + sources."validator-9.4.1" sources."xml2js-0.2.7" ]; }) sources."azure-gallery-2.0.0-pre.18" - sources."azure-graph-2.1.0-preview" - (sources."azure-keyvault-0.11.0" // { + sources."azure-graph-2.2.0" + (sources."azure-keyvault-1.0.0" // { dependencies = [ sources."async-0.2.7" sources."ms-rest-1.15.7" sources."ms-rest-azure-1.15.7" + sources."request-2.74.0" ]; }) - (sources."azure-monitoring-0.10.2" // { + (sources."azure-monitoring-0.10.5" // { dependencies = [ - sources."moment-2.6.0" + sources."moment-2.14.1" + sources."underscore-1.9.1" ]; }) (sources."azure-servicefabric-0.1.5" // { @@ -30815,26 +30973,29 @@ in sources."async-0.2.7" sources."ms-rest-1.15.7" sources."ms-rest-azure-1.15.7" + sources."request-2.74.0" ]; }) - (sources."azure-storage-2.1.0" // { + (sources."azure-storage-2.8.3" // { dependencies = [ + sources."extend-1.2.1" sources."readable-stream-2.0.6" - sources."validator-3.22.2" - sources."xml2js-0.2.7" + sources."underscore-1.8.3" + sources."validator-9.4.1" + sources."xml2js-0.2.8" ]; }) sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."bl-1.1.2" - sources."boom-4.3.1" + sources."boom-2.10.1" sources."brace-expansion-1.1.11" sources."browserify-mime-1.2.9" sources."buffer-equal-constant-time-1.0.1" - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."caller-id-0.1.0" - sources."caseless-0.12.0" - sources."chalk-0.4.0" + sources."caseless-0.11.0" + sources."chalk-1.1.3" sources."clone-1.0.4" sources."co-4.6.0" sources."colors-1.1.2" @@ -30843,17 +31004,12 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) + sources."cryptiles-2.0.5" sources."ctype-0.5.2" sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."date-utils-1.2.21" sources."dateformat-1.0.2-1.2.3" - sources."debug-0.7.4" sources."deep-equal-1.0.1" sources."defaults-1.0.3" sources."delayed-stream-1.0.0" @@ -30864,7 +31020,7 @@ in sources."envconf-0.0.4" sources."escape-string-regexp-1.0.5" sources."event-stream-3.1.5" - sources."extend-1.2.1" + sources."extend-3.0.1" sources."extsprintf-1.3.0" sources."eyes-0.1.8" sources."fast-deep-equal-1.1.0" @@ -30872,7 +31028,7 @@ in sources."fast-json-stable-stringify-2.0.0" sources."fibers-1.0.15" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-1.0.1" sources."from-0.1.7" sources."fs.realpath-1.0.0" sources."galaxy-0.1.12" @@ -30882,15 +31038,15 @@ in sources."github-0.1.6" sources."glob-7.1.2" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-2.0.6" sources."has-ansi-2.0.0" sources."has-color-0.1.7" sources."hash-base-3.0.4" - sources."hawk-6.0.2" - sources."hoek-4.2.1" + sources."hawk-3.1.3" + sources."hoek-2.16.3" sources."http-basic-2.5.1" sources."http-response-object-1.1.0" - sources."http-signature-1.2.0" + sources."http-signature-1.1.1" sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -30910,13 +31066,20 @@ in sources."json-stringify-safe-5.0.1" (sources."jsonlint-1.6.2" // { dependencies = [ + sources."ansi-styles-1.0.0" + sources."chalk-0.4.0" + sources."strip-ansi-0.1.1" sources."underscore-1.6.0" ]; }) sources."jsonminify-0.4.1" sources."jsonparse-1.2.0" sources."jsonpointer-4.0.1" - sources."jsprim-1.4.1" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."jsrsasign-4.8.2" sources."jwa-1.1.6" sources."jws-3.1.5" @@ -30936,36 +31099,28 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.22.1" + sources."moment-2.22.2" (sources."ms-rest-2.3.3" // { dependencies = [ - sources."extend-3.0.1" - sources."request-2.86.0" sources."through-2.3.8" sources."tunnel-0.0.5" ]; }) (sources."ms-rest-azure-2.5.5" // { dependencies = [ - sources."@types/node-9.6.17" - (sources."adal-node-0.1.28" // { - dependencies = [ - sources."@types/node-8.10.16" - ]; - }) + sources."@types/node-9.6.20" sources."async-2.6.0" - sources."xpath.js-1.1.0" ]; }) sources."mute-stream-0.0.7" sources."ncp-0.4.2" sources."node-forge-0.6.23" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."nomnom-1.8.1" sources."oauth-sign-0.8.2" sources."omelette-0.3.2" sources."once-1.4.0" - sources."openssl-wrapper-0.2.1" + sources."openssl-wrapper-0.3.4" sources."os-homedir-1.0.2" sources."path-is-absolute-1.0.1" sources."pause-stream-0.0.11" @@ -30988,43 +31143,31 @@ in ]; }) sources."punycode-1.4.1" - sources."q-0.9.7" - sources."qs-6.5.2" + sources."qs-6.2.3" sources."read-1.0.7" (sources."readable-stream-1.0.34" // { dependencies = [ sources."isarray-0.0.1" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.87.0" // { dependencies = [ - sources."ansi-styles-2.2.1" - sources."assert-plus-0.2.0" - sources."async-2.6.0" - sources."aws-sign2-0.6.0" - sources."boom-2.10.1" - sources."caseless-0.11.0" - sources."chalk-1.1.3" - sources."commander-2.15.1" - sources."cryptiles-2.0.5" - sources."extend-3.0.1" - sources."form-data-1.0.1" - sources."har-validator-2.0.6" - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" - sources."qs-6.2.3" - sources."readable-stream-2.0.6" - sources."sntp-1.0.9" - sources."strip-ansi-3.0.1" - sources."tunnel-agent-0.4.3" + sources."assert-plus-1.0.0" + sources."aws-sign2-0.7.0" + sources."caseless-0.12.0" + sources."form-data-2.3.2" + sources."har-validator-5.0.3" + sources."http-signature-1.2.0" + sources."qs-6.5.2" + sources."tunnel-agent-0.6.0" ]; }) sources."revalidator-0.1.8" sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."sax-0.5.2" - sources."sntp-2.1.0" + sources."sntp-1.0.9" sources."source-map-0.1.43" sources."split-0.2.10" (sources."ssh-key-to-pem-0.11.0" // { @@ -31032,18 +31175,21 @@ in sources."asn1-0.1.11" ]; }) - sources."sshpk-1.14.1" + (sources."sshpk-1.14.2" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."stack-trace-0.0.10" sources."stream-combiner-0.0.4" sources."streamline-0.10.17" sources."streamline-streams-0.1.5" sources."string_decoder-0.10.31" sources."stringstream-0.0.6" - sources."strip-ansi-0.1.1" + sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" (sources."sync-request-3.0.0" // { dependencies = [ - sources."caseless-0.11.0" sources."process-nextick-args-2.0.0" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" @@ -31053,7 +31199,7 @@ in sources."through-2.3.4" sources."tough-cookie-2.3.4" sources."tunnel-0.0.2" - sources."tunnel-agent-0.6.0" + sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."underscore-1.4.4" @@ -31076,7 +31222,7 @@ in sources."xml2js-0.1.14" sources."xmlbuilder-0.4.3" sources."xmldom-0.1.27" - sources."xpath.js-1.0.7" + sources."xpath.js-1.1.0" sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; @@ -31166,12 +31312,12 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.33.0" + sources."mime-db-1.34.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."natives-1.1.3" + sources."natives-1.1.4" sources."normalize-package-data-2.4.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -31233,14 +31379,19 @@ in sha512 = "3ycb2arffvn5xg0dgk03zyvpg6pizz17wix457vg1cx166h59lz0vhyr2sw3224ny8brs3lg8f1acyr2ijv196fnsjfpm1akk9i5hbw"; }; dependencies = [ - sources."JSONStream-1.3.2" + sources."JSONStream-1.3.3" sources."acorn-4.0.13" sources."acorn-node-1.3.0" sources."array-filter-0.0.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" sources."asn1.js-4.10.1" - sources."assert-1.4.1" + (sources."assert-1.4.1" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) sources."astw-2.2.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.0" @@ -31260,7 +31411,7 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."buffer-5.1.0" - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.1" @@ -31285,12 +31436,12 @@ in sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" sources."elliptic-6.4.0" - sources."events-2.0.0" + sources."events-2.1.0" sources."evp_bytestokey-1.0.3" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."glob-7.1.2" - sources."has-1.0.1" + sources."has-1.0.3" sources."hash-base-3.0.4" sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" @@ -31318,7 +31469,7 @@ in sources."mkdirp-0.5.1" (sources."module-deps-6.1.0" // { dependencies = [ - sources."acorn-5.5.3" + sources."acorn-5.6.2" sources."minimist-1.2.0" ]; }) @@ -31355,7 +31506,7 @@ in sources."source-map-0.5.7" sources."stream-browserify-2.0.1" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.2" + sources."stream-http-2.8.3" sources."stream-splicer-2.0.0" sources."string_decoder-1.1.1" (sources."subarg-1.0.0" // { @@ -31376,11 +31527,7 @@ in sources."punycode-1.3.2" ]; }) - (sources."util-0.10.3" // { - dependencies = [ - sources."inherits-2.0.1" - ]; - }) + sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."vm-browserify-1.0.1" sources."wrappy-1.0.2" @@ -31427,12 +31574,12 @@ in sources."bncode-0.5.3" sources."boom-0.3.8" sources."brace-expansion-1.1.11" - sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" - sources."buffer-fill-0.1.1" - sources."buffer-from-1.0.0" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.0" sources."bufferview-1.0.1" sources."builtin-modules-1.1.1" sources."bytebuffer-3.5.5" @@ -31786,11 +31933,11 @@ in sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.2.5" + sources."colors-1.3.0" sources."commander-2.15.1" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.4.1" + sources."follow-redirects-1.5.0" sources."has-flag-3.0.0" sources."humanize-plus-1.8.2" sources."is-buffer-1.1.6" @@ -31860,10 +32007,10 @@ in sha1 = "2e8446d9493caafd870b1090785e7f03e2ae6a43"; }; dependencies = [ - sources."JSONStream-1.3.2" + sources."JSONStream-1.3.3" sources."abbrev-1.1.1" sources."accepts-1.3.5" - sources."acorn-5.5.3" + sources."acorn-5.6.2" sources."acorn-node-1.3.0" sources."aliasify-2.1.0" sources."ansi-0.3.1" @@ -31876,7 +32023,12 @@ in sources."array-reduce-0.0.0" sources."asn1-0.2.3" sources."asn1.js-4.10.1" - sources."assert-1.4.1" + (sources."assert-1.4.1" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) sources."assert-plus-0.2.0" sources."astw-2.2.0" sources."async-1.5.2" @@ -31884,9 +32036,9 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."base64-js-0.0.8" + sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.1" - sources."big-integer-1.6.28" + sources."big-integer-1.6.30" sources."block-stream-0.0.9" sources."bn.js-4.11.8" (sources."body-parser-1.18.2" // { @@ -31918,7 +32070,7 @@ in sources."browserify-transform-tools-1.7.0" sources."browserify-zlib-0.1.4" sources."buffer-5.1.0" - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."buffer-xor-1.0.3" sources."builtin-modules-1.1.1" sources."builtin-status-codes-3.0.0" @@ -31934,7 +32086,7 @@ in sources."combine-source-map-0.8.0" sources."combined-stream-1.0.6" sources."commander-2.15.1" - sources."compressible-2.0.13" + sources."compressible-2.0.14" sources."compression-1.7.2" sources."concat-map-0.0.1" (sources."concat-stream-1.5.2" // { @@ -31952,7 +32104,7 @@ in sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."cordova-app-hello-world-3.12.0" - sources."cordova-common-2.2.1" + sources."cordova-common-2.2.3" sources."cordova-create-1.1.2" (sources."cordova-fetch-1.3.0" // { dependencies = [ @@ -31962,27 +32114,26 @@ in }) (sources."cordova-js-4.2.2" // { dependencies = [ - sources."acorn-5.5.3" + sources."acorn-5.6.2" sources."isarray-2.0.4" ]; }) (sources."cordova-lib-8.0.0" // { dependencies = [ sources."acorn-4.0.13" - sources."base64-js-1.3.0" + sources."base64-js-1.1.2" + sources."elementtree-0.1.6" sources."glob-7.1.1" sources."isarray-1.0.0" + sources."mime-db-1.34.0" sources."minimist-1.2.0" sources."nopt-4.0.1" - (sources."plist-2.0.1" // { - dependencies = [ - sources."base64-js-1.1.2" - ]; - }) + sources."plist-2.0.1" sources."process-nextick-args-2.0.0" sources."q-1.0.1" sources."qs-6.3.2" sources."safe-buffer-5.1.1" + sources."sax-0.3.5" sources."shelljs-0.3.0" sources."underscore-1.8.3" sources."uuid-3.2.1" @@ -32004,7 +32155,7 @@ in sources."dashdash-1.14.1" sources."date-now-0.1.4" sources."debug-2.6.9" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."defined-1.0.0" sources."delayed-stream-1.0.0" (sources."dep-graph-1.1.0" // { @@ -32031,7 +32182,7 @@ in sources."ecc-jsbn-0.1.1" sources."editor-1.0.0" sources."ee-first-1.1.1" - sources."elementtree-0.1.6" + sources."elementtree-0.1.7" sources."elliptic-6.4.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" @@ -32058,11 +32209,11 @@ in sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."getpass-0.1.7" - sources."glob-5.0.15" + sources."glob-7.1.2" sources."got-3.3.1" sources."graceful-fs-4.1.11" sources."har-validator-2.0.6" - sources."has-1.0.1" + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."hash-base-3.0.4" sources."hash.js-1.1.3" @@ -32191,7 +32342,7 @@ in sources."pegjs-0.10.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."plist-1.2.0" + sources."plist-3.0.1" sources."prepend-http-1.0.4" sources."process-0.11.10" sources."process-nextick-args-1.0.7" @@ -32213,7 +32364,7 @@ in sources."http-errors-1.6.2" ]; }) - sources."rc-1.2.7" + sources."rc-1.2.8" sources."read-1.0.7" sources."read-all-stream-3.1.0" sources."read-only-stream-2.0.0" @@ -32235,7 +32386,8 @@ in sources."run-async-0.1.0" sources."rx-lite-3.1.2" sources."safe-buffer-5.1.2" - sources."sax-0.3.5" + sources."safer-buffer-2.1.2" + sources."sax-1.1.4" sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."send-0.16.2" @@ -32244,7 +32396,7 @@ in sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" - sources."shelljs-0.5.3" + sources."shelljs-0.8.2" sources."simple-plist-0.2.1" sources."slash-1.0.0" sources."slide-1.1.6" @@ -32254,7 +32406,7 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - (sources."sshpk-1.14.1" // { + (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -32263,7 +32415,7 @@ in sources."stream-browserify-2.0.1" sources."stream-buffers-2.2.0" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.2" + sources."stream-http-2.8.3" sources."stream-shift-1.0.0" sources."stream-splicer-2.0.0" sources."string-length-1.0.1" @@ -32271,6 +32423,7 @@ in sources."string_decoder-1.0.3" sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" + sources."strip-bom-3.0.0" sources."strip-json-comments-2.0.1" sources."subarg-1.0.0" sources."supports-color-2.0.0" @@ -32288,7 +32441,7 @@ in sources."type-is-1.6.16" sources."typedarray-0.0.6" sources."umd-3.0.3" - sources."underscore-1.9.0" + sources."underscore-1.9.1" sources."unorm-1.4.1" sources."unpipe-1.0.0" (sources."update-notifier-0.5.0" // { @@ -32303,11 +32456,7 @@ in sources."punycode-1.3.2" ]; }) - (sources."util-0.10.3" // { - dependencies = [ - sources."inherits-2.0.1" - ]; - }) + sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-2.0.3" @@ -32326,7 +32475,7 @@ in ]; }) sources."xdg-basedir-2.0.0" - sources."xmlbuilder-4.0.0" + sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" sources."xtend-4.0.1" ]; @@ -32415,7 +32564,7 @@ in sources."uid-number-0.0.6" sources."util-deprecate-1.0.2" sources."validate-npm-package-name-3.0.0" - sources."which-1.3.0" + sources."which-1.3.1" sources."win-release-1.1.1" sources."wrappy-1.0.2" sources."xtend-4.0.1" @@ -32444,7 +32593,7 @@ in sources."chalk-2.4.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."core-js-2.5.6" + sources."core-js-2.5.7" sources."cross-spawn-5.1.0" sources."escape-string-regexp-1.0.5" sources."fs-extra-4.0.3" @@ -32464,7 +32613,7 @@ in sources."source-map-support-0.4.18" sources."supports-color-5.4.0" sources."universalify-0.1.1" - sources."which-1.3.0" + sources."which-1.3.1" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -32513,7 +32662,7 @@ in sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."ap-0.1.0" - sources."append-tree-2.4.1" + sources."append-tree-2.4.4" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-lru-1.1.1" @@ -32537,18 +32686,17 @@ in sources."blake2b-2.1.2" sources."blake2b-wasm-1.1.7" sources."body-0.1.0" - sources."boom-4.3.1" sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-6.0.2" ]; }) - sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equals-1.0.4" - sources."buffer-fill-0.1.1" - sources."buffer-from-1.0.0" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.0" sources."buffer-indexof-1.1.1" sources."bulk-write-stream-1.1.4" sources."bytes-3.0.0" @@ -32562,7 +32710,7 @@ in sources."codecs-1.2.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.2.5" + sources."colors-1.3.0" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -32570,11 +32718,6 @@ in sources."content-types-0.1.0" sources."core-util-is-1.0.2" sources."corsify-2.1.0" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."dat-dns-1.3.2" @@ -32606,12 +32749,17 @@ in sources."process-nextick-args-1.0.7" ]; }) - (sources."dat-node-3.5.8" // { + (sources."dat-node-3.5.9" // { dependencies = [ - sources."buffer-alloc-unsafe-0.1.1" + (sources."discovery-swarm-5.1.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."minimist-0.0.8" sources."process-nextick-args-1.0.7" sources."pump-1.0.3" + sources."random-access-memory-3.0.0" sources."unordered-set-2.0.0" sources."varint-5.0.0" ]; @@ -32660,7 +32808,7 @@ in sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."flat-tree-1.6.0" - sources."for-each-0.3.2" + sources."for-each-0.3.3" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" @@ -32675,17 +32823,15 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-flag-3.0.0" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.14.0" // { + (sources."hypercore-6.15.0" // { dependencies = [ sources."varint-5.0.0" ]; }) sources."hypercore-protocol-6.6.4" - (sources."hyperdrive-9.12.3" // { + (sources."hyperdrive-9.13.0" // { dependencies = [ sources."varint-4.0.1" ]; @@ -32698,6 +32844,7 @@ in sources."ini-1.3.5" sources."ip-1.1.5" sources."is-buffer-1.1.6" + sources."is-callable-1.1.3" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" @@ -32706,6 +32853,7 @@ in sources."is-function-1.0.1" sources."is-glob-2.0.1" sources."is-number-2.1.0" + sources."is-options-1.0.1" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" sources."is-string-1.0.4" @@ -32743,13 +32891,13 @@ in sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."mirror-folder-2.2.0" + sources."mirror-folder-3.0.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" sources."multicast-dns-7.0.0" sources."multicb-1.2.2" - sources."multistream-2.1.0" + sources."multistream-2.1.1" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" sources."nan-2.10.0" @@ -32807,24 +32955,24 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."request-2.86.0" + sources."request-2.87.0" sources."revalidator-0.1.8" sources."rimraf-2.6.2" sources."rusha-0.8.13" sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."signed-varint-2.0.1" sources."simple-sha1-2.1.1" - sources."siphash24-1.1.0" + sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" - sources."sntp-2.1.0" sources."sodium-javascript-0.5.5" sources."sodium-native-2.1.6" sources."sodium-universal-2.0.0" - sources."sorted-array-functions-1.1.0" + sources."sorted-array-functions-1.2.0" sources."sorted-indexof-1.0.0" sources."sparse-bitfield-3.0.3" sources."speedometer-1.0.0" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."stack-trace-0.0.10" sources."status-logger-3.1.1" sources."stream-collector-1.0.1" @@ -32860,7 +33008,7 @@ in sources."unixify-1.0.0" sources."unordered-array-remove-1.0.2" sources."unordered-set-1.1.0" - sources."untildify-3.0.2" + sources."untildify-3.0.3" sources."util-deprecate-1.0.2" sources."utile-0.3.0" sources."utp-native-1.7.1" @@ -32875,7 +33023,7 @@ in }) sources."wrap-ansi-3.0.1" sources."wrappy-1.0.2" - sources."xhr-2.4.1" + sources."xhr-2.5.0" sources."xsalsa20-1.0.2" sources."xtend-4.0.1" ]; @@ -32964,7 +33112,7 @@ in sources."fresh-0.2.4" sources."from-0.1.7" sources."hiredis-0.4.1" - sources."http-parser-js-0.4.12" + sources."http-parser-js-0.4.13" sources."inherits-2.0.3" sources."ini-1.3.5" sources."ipaddr.js-1.0.5" @@ -33064,9 +33212,9 @@ in sources."basic-auth-1.1.0" sources."bindings-1.2.1" sources."bl-0.8.2" - sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-0.1.1" - sources."buffer-fill-0.1.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-fill-1.0.0" sources."bytewise-1.1.0" sources."bytewise-core-1.2.3" sources."cookie-signature-1.1.0" @@ -33215,30 +33363,24 @@ in sha512 = "1bvfy3zh4ir1griyp1af3c2vc11wrkxyi4h8bfsdlgwwgq9azp1l8l1v03b88x69fqr3llr6kgacjr1cykd64p10dr5438zjlw1vcr4"; }; dependencies = [ - sources."JSONStream-1.3.2" + sources."JSONStream-1.3.3" sources."ajv-5.5.2" sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."async-2.6.0" + sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.241.1" + sources."aws-sdk-2.252.1" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.1" - sources."boom-4.3.1" sources."buffer-4.9.1" sources."caseless-0.12.0" sources."co-4.6.0" sources."combined-stream-1.0.6" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" - sources."decimal.js-10.0.0" + sources."decimal.js-10.0.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" sources."events-1.1.1" @@ -33251,8 +33393,6 @@ in sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."ieee754-1.1.8" sources."ini-1.3.5" @@ -33277,15 +33417,15 @@ in sources."punycode-1.3.2" sources."qs-6.5.2" sources."querystring-0.2.0" - (sources."request-2.86.0" // { + (sources."request-2.87.0" // { dependencies = [ sources."punycode-1.4.1" ]; }) sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."sax-1.2.1" - sources."sntp-2.1.0" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."through-2.3.8" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" @@ -33490,10 +33630,11 @@ in sources."request-2.79.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."set-immediate-shim-1.0.1" sources."sntp-1.0.9" sources."split-1.0.1" - (sources."sshpk-1.14.1" // { + (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -33511,7 +33652,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.2.1" sources."verror-1.10.0" - sources."which-1.3.0" + sources."which-1.3.1" sources."wrappy-1.0.2" sources."xmlbuilder-8.2.2" sources."xtend-4.0.1" @@ -33576,7 +33717,7 @@ in sources."concat-map-0.0.1" sources."conf-1.4.0" sources."convert-source-map-1.5.1" - sources."core-js-2.5.6" + sources."core-js-2.5.7" sources."cross-spawn-5.1.0" sources."currently-unhandled-0.4.1" sources."debug-2.6.9" @@ -33679,7 +33820,7 @@ in sources."os-tmpdir-1.0.2" sources."p-cancelable-0.3.0" sources."p-finally-1.0.0" - sources."p-limit-1.2.0" + sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-timeout-1.2.1" sources."p-try-1.0.0" @@ -33736,7 +33877,7 @@ in sources."url-to-options-1.0.1" sources."validate-npm-package-license-3.0.3" sources."whatwg-fetch-2.0.4" - sources."which-1.3.0" + sources."which-1.3.1" sources."wrap-ansi-3.0.1" sources."write-file-atomic-2.3.0" sources."yallist-2.1.2" @@ -33759,7 +33900,7 @@ in sha512 = "0hw70vjlg6z0y9kf6vjr7g0w9hbm426fwvyzr88l62c5hd9mxrbw5v34b6zb31vbbyda3mkvcwgfnxgqaxvpn0wlrxr0va43pbzygbd"; }; dependencies = [ - sources."acorn-5.5.3" + sources."acorn-5.6.2" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -33782,7 +33923,7 @@ in }) sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."caller-path-0.1.0" sources."callsites-0.2.0" (sources."chalk-2.4.1" // { @@ -33845,7 +33986,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."js-tokens-3.0.2" - sources."js-yaml-3.11.0" + sources."js-yaml-3.12.0" sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" @@ -33906,7 +34047,7 @@ in sources."type-check-0.3.2" sources."typedarray-0.0.6" sources."util-deprecate-1.0.2" - sources."which-1.3.0" + sources."which-1.3.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" sources."write-0.2.1" @@ -33930,7 +34071,7 @@ in sha512 = "0xcqrxpj24cns2rq91k2k2khr96129p7ncyjx4bda77dy0nkwn53lv6dhjbr0nq1bm6f13p0as4jkqcf3j4lygd7z1l2mbi829xyglw"; }; dependencies = [ - sources."acorn-5.5.3" + sources."acorn-5.6.2" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -33953,7 +34094,7 @@ in }) sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."caller-path-0.1.0" sources."callsites-0.2.0" (sources."chalk-1.1.3" // { @@ -34028,7 +34169,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."js-tokens-3.0.2" - sources."js-yaml-3.11.0" + sources."js-yaml-3.12.0" sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" @@ -34092,7 +34233,7 @@ in sources."type-check-0.3.2" sources."typedarray-0.0.6" sources."util-deprecate-1.0.2" - sources."which-1.3.0" + sources."which-1.3.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" sources."write-0.2.1" @@ -34143,7 +34284,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.1" - sources."boom-4.3.1" + sources."buffer-from-1.1.0" sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" @@ -34155,13 +34296,8 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."combined-stream-1.0.6" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."currently-unhandled-0.4.1" sources."dashdash-1.14.1" sources."debug-2.6.9" @@ -34173,7 +34309,7 @@ in sources."escape-string-regexp-1.0.5" sources."exit-hook-1.1.1" sources."extend-3.0.1" - sources."extract-zip-1.6.6" + sources."extract-zip-1.6.7" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -34190,8 +34326,6 @@ in sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."hasha-2.2.0" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."hosted-git-info-2.6.0" sources."http-signature-1.2.0" sources."indent-string-2.1.0" @@ -34223,7 +34357,7 @@ in sources."mime-types-2.1.18" sources."mimic-fn-1.2.0" sources."minimist-1.2.0" - sources."mkdirp-0.5.0" + sources."mkdirp-0.5.1" sources."mkpath-1.0.0" sources."ms-2.0.0" sources."node-phantom-simple-2.2.4" @@ -34266,18 +34400,18 @@ in sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."request-2.86.0" + sources."request-2.87.0" sources."request-progress-2.0.1" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."signal-exit-3.0.2" - sources."sntp-2.1.0" sources."spdx-correct-3.0.0" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -34294,7 +34428,7 @@ in sources."uuid-3.2.1" sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" - sources."which-1.3.0" + sources."which-1.3.1" sources."yauzl-2.4.1" sources."zen-observable-0.5.2" ]; @@ -34446,7 +34580,7 @@ in sources."preserve-0.2.0" (sources."prettyjson-1.2.1" // { dependencies = [ - sources."colors-1.2.5" + sources."colors-1.3.0" sources."minimist-1.2.0" ]; }) @@ -34505,14 +34639,14 @@ in sha512 = "0j00v2mkrqla05ynq3cziyh4vslsshbkxdyqbzzg2vkg3if0ln0klsf5hck457pxksqky9gcsybc73c2sf6hgf910wzz5yljlxc5b7g"; }; dependencies = [ - sources."async-2.6.0" + sources."async-2.6.1" sources."debug-3.1.0" sources."lodash-4.17.10" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.0.0" - sources."simple-git-1.92.0" + sources."simple-git-1.95.1" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -34890,7 +35024,7 @@ in sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.9" - sources."natives-1.1.3" + sources."natives-1.1.4" sources."object-assign-3.0.0" sources."object-copy-0.1.0" sources."object-visit-1.0.1" @@ -35011,7 +35145,7 @@ in sources."vinyl-0.4.6" ]; }) - sources."which-1.3.0" + sources."which-1.3.1" sources."wrappy-1.0.2" sources."xtend-4.0.1" ]; @@ -35129,10 +35263,10 @@ in html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.15"; + version = "3.5.16"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.15.tgz"; - sha512 = "01ni8s31nr1rb70wqi980nyfwir4z2z5mjvs454rgylns4nfyqvci581b40s1b67hgd95anq46j4yf5r947y5wzvncr7dgsysnvi5ir"; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.16.tgz"; + sha512 = "2h1ps83xn0f135rff92d6qcwlyh3wja2x3f4rf9clg2hs6fd66s6grsvpvx01gp8yihapv4dxkd0ws10bgbj850s5lv9259niy49znc"; }; dependencies = [ sources."camel-case-3.0.0" @@ -35144,7 +35278,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.5.7" - (sources."uglify-js-3.3.25" // { + (sources."uglify-js-3.3.28" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -35203,7 +35337,7 @@ in sources."arr-flatten-1.1.0" sources."array-flatten-1.1.1" sources."array-unique-0.2.1" - sources."async-2.6.0" + sources."async-2.6.1" sources."async-each-1.0.1" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" @@ -35219,10 +35353,10 @@ in sources."kind-of-6.0.2" ]; }) - sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" - sources."buffer-fill-0.1.1" + sources."buffer-fill-1.0.0" sources."bytes-3.0.0" sources."chalk-2.4.1" sources."chardet-0.4.2" @@ -35242,7 +35376,7 @@ in sources."continuable-cache-0.3.1" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."cookiejar-2.1.1" + sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" sources."crc-3.5.0" sources."crc32-stream-2.0.0" @@ -35281,7 +35415,7 @@ in sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."finalhandler-1.1.1" - sources."follow-redirects-1.4.1" + sources."follow-redirects-1.5.0" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."form-data-2.3.2" @@ -35298,7 +35432,7 @@ in sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" sources."http-errors-1.6.3" - sources."http-parser-js-0.4.12" + sources."http-parser-js-0.4.13" sources."http-proxy-1.17.0" (sources."http-proxy-middleware-0.17.4" // { dependencies = [ @@ -35355,7 +35489,7 @@ in sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."minipass-2.3.0" + sources."minipass-2.3.3" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -35423,7 +35557,7 @@ in sources."strip-ansi-4.0.0" sources."superagent-3.8.3" sources."supports-color-5.4.0" - (sources."tar-4.4.2" // { + (sources."tar-4.4.4" // { dependencies = [ sources."minimist-0.0.8" sources."safe-buffer-5.1.2" @@ -35439,18 +35573,18 @@ in }) sources."tmp-0.0.33" sources."to-buffer-1.1.1" - sources."tslib-1.9.1" + sources."tslib-1.9.2" sources."type-is-1.6.16" sources."ultron-1.1.1" sources."unpipe-1.0.0" - sources."untildify-3.0.2" + sources."untildify-3.0.3" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.2.1" sources."vary-1.1.2" sources."websocket-driver-0.7.0" sources."websocket-extensions-0.1.3" - sources."which-1.3.0" + sources."which-1.3.1" sources."win-release-1.1.1" sources."wrap-ansi-3.0.1" sources."wrappy-1.0.2" @@ -35524,7 +35658,7 @@ in sources."inherits-2.0.3" sources."is-buffer-1.1.6" sources."isexe-2.0.0" - (sources."js-yaml-3.11.0" // { + (sources."js-yaml-3.12.0" // { dependencies = [ sources."esprima-4.0.0" ]; @@ -35560,7 +35694,7 @@ in ]; }) sources."uglify-to-browserify-1.0.2" - sources."which-1.3.0" + sources."which-1.3.1" sources."window-size-0.1.0" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" @@ -35592,7 +35726,7 @@ in sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cycle-1.0.3" - sources."dtrace-provider-0.8.6" + sources."dtrace-provider-0.8.7" sources."eyes-0.1.8" sources."glob-6.0.4" sources."imap-0.8.19" @@ -35607,7 +35741,7 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.22.1" + sources."moment-2.22.2" sources."mv-2.1.1" sources."nan-2.10.0" sources."ncp-2.0.0" @@ -35618,7 +35752,7 @@ in sources."printf-0.2.5" sources."readable-stream-1.1.14" sources."rimraf-2.4.5" - sources."safe-json-stringify-1.1.0" + sources."safe-json-stringify-1.2.0" sources."semver-5.3.0" sources."stack-trace-0.0.10" sources."string_decoder-0.10.31" @@ -35640,10 +35774,10 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.9.0"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.9.0.tgz"; - sha512 = "2j3dppwmpx29w1xxj6pmi1ddyc0v9y6dlw42nr1in2c7qddalh3axqx7b6p21qy5j0gf43wdaxfknk7klr5zyr0flcx552g5asxx7dk"; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.9.2.tgz"; + sha512 = "01pqqc94lq3c9010wbb0zafs81b5z4mzr06864kf4vs3zih30xfral4rbk9d2q2m2kbawcym8zlj5xydgig5k40kzqy1hyhallcm5dm"; }; dependencies = [ sources."ansi-color-0.2.1" @@ -35689,7 +35823,7 @@ in sources."opentracing-0.14.3" sources."path-is-absolute-1.0.1" sources."pathval-1.1.0" - sources."rxjs-5.5.10" + sources."rxjs-5.5.11" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."string-template-0.2.1" @@ -35708,8 +35842,8 @@ in ]; }) sources."vscode-languageserver-protocol-3.5.1" - sources."vscode-languageserver-types-3.7.2" - sources."vscode-uri-1.0.3" + sources."vscode-languageserver-types-3.8.1" + sources."vscode-uri-1.0.5" sources."wrappy-1.0.2" sources."xorshift-0.2.1" sources."xtend-4.0.1" @@ -35969,7 +36103,7 @@ in sources."combined-stream-1.0.6" sources."commander-2.11.0" sources."component-emitter-1.2.1" - sources."cookiejar-2.1.1" + sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" sources."debug-3.1.0" sources."delayed-stream-1.0.0" @@ -35980,7 +36114,7 @@ in sources."graphlib-2.1.5" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."js-yaml-3.11.0" + sources."js-yaml-3.12.0" sources."lodash-4.17.10" sources."methods-1.1.2" sources."mime-1.6.0" @@ -35990,7 +36124,7 @@ in sources."native-promise-only-0.8.1" sources."path-loader-1.0.4" sources."process-nextick-args-2.0.0" - sources."punycode-2.1.0" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" @@ -36013,10 +36147,10 @@ in json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "0.12.2"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.12.2.tgz"; - sha512 = "3dqw05mkw5k42zdpjhg3cjiq7bfh8x1zxllrwyz0jgwmd4p79079fhsiifazqa5is659lzdnmiyiabxy62jjjk55xa296rdhyajc2vm"; + url = "https://registry.npmjs.org/json-server/-/json-server-0.13.0.tgz"; + sha512 = "0lz3n3y62gvdiqazgqbpfb9pdxwjvrjaagzs46ihsl6h6k18d7qmcw6bxiv30jkm3b6alb6p0l48jrym12sksx23am9bmibx45jwiq2"; }; dependencies = [ sources."accepts-1.3.5" @@ -36033,7 +36167,6 @@ in sources."basic-auth-2.0.0" sources."bcrypt-pbkdf-1.0.1" sources."body-parser-1.18.3" - sources."boom-4.3.1" sources."boxen-1.3.0" sources."bytes-3.0.0" sources."camelcase-4.1.0" @@ -36048,8 +36181,12 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."combined-stream-1.0.6" - sources."compressible-2.0.13" - sources."compression-1.7.2" + sources."compressible-2.0.14" + (sources."compression-1.7.2" // { + dependencies = [ + sources."mime-db-1.34.0" + ]; + }) sources."configstore-3.1.2" sources."connect-pause-0.1.1" sources."content-disposition-0.5.2" @@ -36060,16 +36197,11 @@ in sources."cors-2.8.4" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."crypto-random-string-1.0.0" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -36125,8 +36257,6 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-flag-3.0.0" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" @@ -36178,7 +36308,7 @@ in sources."minimist-1.2.0" sources."morgan-1.9.0" sources."ms-2.0.0" - sources."nanoid-1.0.2" + sources."nanoid-1.0.3" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -36188,7 +36318,7 @@ in sources."on-headers-1.0.1" sources."os-locale-2.1.0" sources."p-finally-1.0.0" - sources."p-limit-1.2.0" + sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" sources."package-json-4.0.1" @@ -36208,10 +36338,10 @@ in sources."qs-6.5.2" sources."range-parser-1.2.0" sources."raw-body-2.3.3" - sources."rc-1.2.7" + sources."rc-1.2.8" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" - sources."request-2.86.0" + sources."request-2.87.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."safe-buffer-5.1.1" @@ -36227,8 +36357,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."sntp-2.1.0" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."statuses-1.5.0" sources."steno-0.4.4" sources."string-width-2.1.1" @@ -36251,7 +36380,7 @@ in sources."uuid-3.2.1" sources."vary-1.1.2" sources."verror-1.10.0" - sources."which-1.3.0" + sources."which-1.3.1" sources."which-module-2.0.0" sources."widest-line-2.0.0" (sources."wrap-ansi-2.1.0" // { @@ -36284,10 +36413,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz"; - sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; + sha512 = "3f8k2gvi3gnj9gpr3dnm5n5vpy2w68pshqk4hajlsmkb37ky30cnqza82l8sq153zx1nk67gizcm1ngmvlajw53hkwg4g96gir7d2rw"; }; dependencies = [ sources."argparse-1.0.10" @@ -36332,8 +36461,8 @@ in sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."ast-types-0.11.3" - sources."async-2.6.0" + sources."ast-types-0.11.5" + sources."async-2.6.1" sources."async-each-1.0.1" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" @@ -36356,7 +36485,7 @@ in sources."blob-0.0.4" sources."bluebird-3.5.1" sources."body-parser-1.18.3" - sources."boom-4.3.1" + sources."boom-2.10.1" sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ @@ -36372,7 +36501,7 @@ in sources."chokidar-1.7.0" sources."circular-json-0.5.4" sources."co-4.6.0" - sources."colors-1.2.5" + sources."colors-1.3.0" sources."combine-lists-1.0.1" sources."combined-stream-1.0.6" sources."commander-2.15.1" @@ -36387,13 +36516,9 @@ in }) sources."content-type-1.0.4" sources."cookie-0.3.1" - sources."core-js-2.5.6" + sources."core-js-2.5.7" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) + sources."cryptiles-2.0.5" sources."custom-event-1.0.1" sources."dashdash-1.14.1" sources."data-uri-to-buffer-1.2.0" @@ -36450,7 +36575,7 @@ in sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."finalhandler-1.1.0" - sources."follow-redirects-1.4.1" + sources."follow-redirects-1.5.0" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" @@ -36479,9 +36604,9 @@ in sources."has-ansi-2.0.0" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" - sources."hawk-6.0.2" + sources."hawk-3.1.3" sources."hipchat-notifier-1.1.0" - sources."hoek-4.2.1" + sources."hoek-2.16.3" sources."http-errors-1.6.3" (sources."http-proxy-1.17.0" // { dependencies = [ @@ -36530,19 +36655,15 @@ in sources."libmime-3.0.0" sources."libqp-1.1.0" sources."lodash-4.17.10" - (sources."log4js-2.6.1" // { + (sources."log4js-2.8.0" // { dependencies = [ sources."assert-plus-0.2.0" sources."aws-sign2-0.6.0" - sources."boom-2.10.1" sources."caseless-0.11.0" - sources."cryptiles-2.0.5" sources."debug-3.1.0" sources."follow-redirects-1.0.0" sources."form-data-2.0.0" sources."har-validator-2.0.6" - sources."hawk-3.1.3" - sources."hoek-2.16.3" sources."http-signature-1.1.1" sources."iconv-lite-0.4.15" sources."isarray-0.0.1" @@ -36550,7 +36671,6 @@ in sources."qs-6.2.3" sources."readable-stream-2.0.6" sources."request-2.75.0" - sources."sntp-1.0.9" sources."socks-1.1.9" sources."string_decoder-0.10.31" sources."tunnel-agent-0.4.3" @@ -36639,7 +36759,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."request-2.86.0" + sources."request-2.87.0" sources."requestretry-1.13.0" sources."requires-port-1.0.0" sources."rimraf-2.6.2" @@ -36651,7 +36771,7 @@ in sources."slack-node-0.2.0" sources."smart-buffer-1.1.15" sources."smtp-connection-2.12.0" - sources."sntp-2.1.0" + sources."sntp-1.0.9" (sources."socket.io-2.0.4" // { dependencies = [ sources."isarray-2.0.1" @@ -36667,7 +36787,7 @@ in sources."socks-1.1.10" sources."socks-proxy-agent-3.0.1" sources."source-map-0.6.1" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."statuses-1.5.0" sources."streamroller-0.7.0" sources."string_decoder-1.1.1" @@ -36736,7 +36856,7 @@ in sources."body-parser-1.13.3" sources."bytes-2.1.0" sources."commander-2.6.0" - sources."compressible-2.0.13" + sources."compressible-2.0.14" sources."compression-1.5.2" (sources."connect-2.30.2" // { dependencies = [ @@ -36774,6 +36894,7 @@ in dependencies = [ sources."accepts-1.3.5" sources."destroy-1.0.3" + sources."mime-db-1.34.0" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."statuses-1.2.1" @@ -36879,6 +37000,357 @@ in production = true; bypassCache = false; }; + lcov-result-merger = nodeEnv.buildNodePackage { + name = "lcov-result-merger"; + packageName = "lcov-result-merger"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-3.0.0.tgz"; + sha512 = "2l5nw2y7yblpyp45q06dwd1yhrd5np1q1nxm27lx7kjdjrdscry6qp5rsm04v9ccsa31ccmdl9mx4vmrp95zmbbij6p4bdbfvqzv1p9"; + }; + dependencies = [ + sources."append-buffer-1.0.2" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."buffer-equal-1.0.0" + sources."clone-2.1.2" + sources."clone-buffer-1.0.0" + sources."clone-stats-1.0.0" + sources."cloneable-readable-1.1.2" + sources."concat-map-0.0.1" + sources."convert-source-map-1.5.1" + sources."core-util-is-1.0.2" + sources."define-properties-1.1.2" + sources."duplexify-3.6.0" + sources."end-of-stream-1.4.1" + sources."extend-3.0.1" + sources."flush-write-stream-1.0.3" + sources."foreach-2.0.5" + sources."fs-mkdirp-stream-1.0.0" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."glob-7.1.2" + sources."glob-parent-3.1.0" + sources."glob-stream-6.1.0" + sources."graceful-fs-4.1.11" + sources."has-symbols-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-absolute-1.0.0" + sources."is-buffer-1.1.6" + sources."is-extglob-2.1.1" + sources."is-glob-3.1.0" + sources."is-negated-glob-1.0.0" + sources."is-relative-1.0.0" + sources."is-unc-path-1.0.0" + sources."is-utf8-0.2.1" + sources."is-valid-glob-1.0.0" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" + sources."lazystream-1.0.0" + sources."lead-1.0.0" + sources."minimatch-3.0.4" + sources."normalize-path-2.1.1" + sources."now-and-later-2.0.0" + sources."object-keys-1.0.11" + sources."object.assign-4.1.0" + sources."once-1.4.0" + sources."ordered-read-streams-1.0.1" + sources."path-dirname-1.0.2" + sources."path-is-absolute-1.0.1" + sources."process-nextick-args-2.0.0" + sources."pump-2.0.1" + sources."pumpify-1.5.1" + sources."readable-stream-2.3.6" + sources."remove-bom-buffer-3.0.0" + sources."remove-bom-stream-1.2.0" + sources."remove-trailing-separator-1.1.0" + sources."replace-ext-1.0.0" + sources."resolve-options-1.1.0" + sources."safe-buffer-5.1.2" + sources."stream-shift-1.0.0" + sources."string_decoder-1.1.1" + sources."through2-2.0.3" + sources."through2-filter-2.0.0" + sources."to-absolute-glob-2.0.2" + sources."to-through-2.0.0" + sources."unc-path-regex-0.1.2" + sources."unique-stream-2.2.1" + sources."util-deprecate-1.0.2" + sources."value-or-function-3.0.0" + sources."vinyl-2.1.0" + sources."vinyl-fs-3.0.3" + sources."vinyl-sourcemap-1.1.0" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Merges multiple lcov results into one"; + homepage = https://github.com/mweibel/lcov-result-merger; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + leetcode-cli = nodeEnv.buildNodePackage { + name = "leetcode-cli"; + packageName = "leetcode-cli"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/leetcode-cli/-/leetcode-cli-2.5.2.tgz"; + sha512 = "2gsdhzqz6r2bqvkwk18wg4c7yq25zivdz3da1184nn95y6fsq89lpj6dpyf4h2hdm4h5gzw8zbw3f9fbqldflcw8b4hfj5zpnl9lxra"; + }; + dependencies = [ + sources."abab-1.0.4" + sources."acorn-2.7.0" + sources."acorn-globals-1.0.9" + sources."ajv-5.5.2" + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.0" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-1.5.2" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."boolbase-1.0.0" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."camelcase-2.1.1" + sources."caseless-0.12.0" + sources."chalk-2.4.1" + (sources."cheerio-0.20.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + sources."cli-cursor-2.1.0" + sources."cli-spinners-1.3.1" + sources."cliui-3.2.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."colors-1.3.0" + sources."combined-stream-1.0.6" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + sources."cross-spawn-5.1.0" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."css-select-1.2.0" + sources."css-what-2.1.0" + sources."cssom-0.3.2" + sources."cssstyle-0.2.37" + sources."cycle-1.0.3" + sources."dashdash-1.14.1" + sources."decamelize-1.2.0" + sources."deep-equal-0.2.2" + sources."deep-is-0.1.3" + sources."delayed-stream-1.0.0" + sources."dom-serializer-0.1.0" + sources."domelementtype-1.3.0" + sources."domhandler-2.3.0" + sources."domutils-1.5.1" + sources."ecc-jsbn-0.1.1" + sources."entities-1.1.1" + sources."escape-string-regexp-1.0.5" + sources."escodegen-1.9.1" + sources."esprima-3.1.3" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."execa-0.7.0" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" + sources."find-up-2.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs.realpath-1.0.0" + sources."get-caller-file-1.0.2" + sources."get-stream-3.0.0" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-flag-3.0.0" + sources."hawk-6.0.2" + sources."he-1.1.1" + sources."hoek-4.2.1" + (sources."htmlparser2-3.8.3" // { + dependencies = [ + sources."entities-1.0.0" + ]; + }) + sources."http-signature-1.2.0" + sources."i-0.3.6" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."invert-kv-1.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."isarray-0.0.1" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."jsdom-7.2.2" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."lcid-1.0.0" + sources."levn-0.3.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.10" + sources."log-symbols-2.2.0" + sources."lru-cache-4.1.3" + sources."mem-1.1.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."moment-2.22.2" + sources."mute-stream-0.0.7" + (sources."nconf-0.10.0" // { + dependencies = [ + sources."yargs-3.32.0" + ]; + }) + sources."ncp-1.0.1" + sources."npm-run-path-2.0.2" + sources."nth-check-1.0.1" + sources."number-is-nan-1.0.1" + sources."nwmatcher-1.4.4" + sources."oauth-sign-0.8.2" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optionator-0.8.2" + (sources."ora-1.4.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."supports-color-5.4.0" + ]; + }) + sources."os-locale-1.4.0" + sources."p-finally-1.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."parse5-1.5.1" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."performance-now-2.1.0" + sources."pkginfo-0.4.1" + sources."prelude-ls-1.1.2" + (sources."prompt-1.0.0" // { + dependencies = [ + sources."async-0.9.2" + ]; + }) + sources."pseudomap-1.0.2" + sources."psl-1.1.27" + sources."punycode-1.4.1" + sources."qs-6.5.2" + sources."read-1.0.7" + sources."readable-stream-1.1.14" + (sources."request-2.83.0" // { + dependencies = [ + sources."tough-cookie-2.3.4" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."restore-cursor-2.0.0" + sources."revalidator-0.1.8" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."secure-keys-1.0.0" + sources."set-blocking-2.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."sntp-2.1.0" + sources."source-map-0.6.1" + sources."sprintf-js-1.1.1" + sources."sshpk-1.14.2" + sources."stack-trace-0.0.10" + sources."string-width-1.0.2" + sources."string_decoder-0.10.31" + sources."stringstream-0.0.6" + sources."strip-ansi-3.0.1" + sources."strip-eof-1.0.0" + (sources."supports-color-5.1.0" // { + dependencies = [ + sources."has-flag-2.0.0" + ]; + }) + sources."symbol-tree-3.2.2" + sources."tough-cookie-2.4.2" + sources."tr46-0.0.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."underscore-1.8.3" + sources."utile-0.3.0" + sources."uuid-3.2.1" + sources."verror-1.10.0" + sources."webidl-conversions-2.0.1" + sources."whatwg-url-compat-0.6.5" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."window-size-0.1.4" + (sources."winston-2.1.1" // { + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + sources."pkginfo-0.3.1" + ]; + }) + sources."wordwrap-1.0.0" + sources."wrap-ansi-2.1.0" + sources."wrappy-1.0.2" + sources."xml-name-validator-2.0.1" + sources."y18n-3.2.1" + sources."yallist-2.1.2" + (sources."yargs-10.0.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."camelcase-4.1.0" + sources."is-fullwidth-code-point-2.0.0" + sources."os-locale-2.1.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."yargs-parser-8.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A cli tool to enjoy leetcode!"; + homepage = "https://github.com/skygragon/leetcode-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; @@ -36888,7 +37360,7 @@ in sha512 = "22hg2kpml4wkbgp15nzbhcs81kdaynq0prspzmbfrr5hpbga1cz8vl2adc4dry1lcxs36s2w5pbsvrdic4bw623vx8nngxn0z7kl0wj"; }; dependencies = [ - sources."JSONStream-1.3.2" + sources."JSONStream-1.3.3" sources."add-stream-1.0.0" sources."align-text-0.1.4" sources."amdefine-1.0.1" @@ -36896,7 +37368,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.4" + sources."are-we-there-yet-1.1.5" sources."array-find-index-1.0.2" sources."array-ify-1.0.0" sources."array-union-1.0.2" @@ -36905,7 +37377,7 @@ in sources."async-1.5.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."builtin-modules-1.1.1" sources."byline-5.0.0" sources."camelcase-1.2.1" @@ -36992,7 +37464,7 @@ in sources."decamelize-1.2.0" sources."decamelize-keys-1.1.0" sources."dedent-0.7.0" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."defaults-1.0.3" sources."delegates-1.0.0" sources."detect-indent-5.0.0" @@ -37108,7 +37580,7 @@ in sources."minimist-options-3.0.2" sources."mkdirp-0.5.1" sources."modify-values-1.0.1" - sources."moment-2.22.1" + sources."moment-2.22.2" sources."mute-stream-0.0.7" sources."normalize-package-data-2.4.0" sources."npm-run-path-2.0.2" @@ -37126,7 +37598,7 @@ in sources."os-locale-2.1.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" - sources."p-limit-1.2.0" + sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" (sources."package-json-4.0.1" // { @@ -37149,7 +37621,7 @@ in sources."pseudomap-1.0.2" sources."q-1.5.1" sources."quick-lru-1.1.0" - sources."rc-1.2.7" + sources."rc-1.2.8" sources."read-cmd-shim-1.0.1" sources."read-pkg-3.0.0" sources."read-pkg-up-1.0.1" @@ -37224,16 +37696,16 @@ in sources."uuid-2.0.3" sources."validate-npm-package-license-3.0.3" sources."wcwidth-1.0.1" - sources."which-1.3.0" + sources."which-1.3.1" sources."which-module-2.0.0" - sources."wide-align-1.1.2" + sources."wide-align-1.1.3" sources."window-size-0.1.0" sources."wordwrap-0.0.3" sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."write-file-atomic-2.3.0" sources."write-json-file-2.3.0" - sources."write-pkg-3.1.0" + sources."write-pkg-3.2.0" sources."xtend-4.0.1" sources."y18n-3.2.1" sources."yallist-2.1.2" @@ -37283,16 +37755,10 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.1" - sources."boom-4.3.1" sources."caseless-0.12.0" sources."co-4.6.0" sources."combined-stream-1.0.6" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" @@ -37307,8 +37773,6 @@ in sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."image-size-0.5.5" sources."is-typedarray-1.0.0" @@ -37329,11 +37793,11 @@ in sources."prr-1.0.1" sources."punycode-1.4.1" sources."qs-6.5.2" - sources."request-2.86.0" + sources."request-2.87.0" sources."safe-buffer-5.1.2" - sources."sntp-2.1.0" + sources."safer-buffer-2.1.2" sources."source-map-0.6.1" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -37372,138 +37836,158 @@ in production = true; bypassCache = false; }; - lcov-result-merger = nodeEnv.buildNodePackage { - name = "lcov-result-merger"; - packageName = "lcov-result-merger"; - version = "2.0.0"; + live-server = nodeEnv.buildNodePackage { + name = "live-server"; + packageName = "live-server"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-2.0.0.tgz"; - sha512 = "1y38jkc5m8kb1ll4wcc12yikqdb2l19acc3rdjl0bhs4vjh834mz53hhgyc4jm4gya1gnmzrj3g5337xn05kkxs92vl35zdqcwxij08"; + url = "https://registry.npmjs.org/live-server/-/live-server-1.2.0.tgz"; + sha1 = "4498644bbf81a66f18dd8dffdef61c4c1c374ca3"; }; dependencies = [ + sources."accepts-1.3.5" + sources."anymatch-1.3.2" + sources."apache-crypt-1.2.1" + sources."apache-md5-1.1.2" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-unique-0.2.1" + sources."async-each-1.0.1" sources."balanced-match-1.0.0" + sources."basic-auth-2.0.0" + sources."batch-0.6.1" + sources."bcryptjs-2.4.3" + sources."binary-extensions-1.11.0" sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-6.0.2" ]; }) - sources."clone-2.1.2" - sources."clone-buffer-1.0.0" - sources."clone-stats-1.0.0" - sources."cloneable-readable-1.1.2" + sources."chokidar-1.7.0" + sources."colors-1.3.0" sources."concat-map-0.0.1" - sources."convert-source-map-1.5.1" + sources."connect-3.5.1" sources."core-util-is-1.0.2" - sources."duplexify-3.6.0" - sources."end-of-stream-1.4.1" + sources."cors-2.8.4" + sources."debug-2.2.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."duplexer-0.1.1" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."event-stream-3.3.4" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - sources."extend-3.0.1" - sources."extend-shallow-2.0.1" sources."extglob-0.3.2" + sources."faye-websocket-0.11.1" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" - sources."first-chunk-stream-1.0.0" + sources."finalhandler-0.5.1" sources."for-in-1.0.2" sources."for-own-0.1.5" - sources."glob-5.0.15" + sources."fresh-0.5.2" + sources."from-0.1.7" + sources."fsevents-1.2.4" sources."glob-base-0.3.0" - sources."glob-parent-3.1.0" - (sources."glob-stream-5.3.5" // { - dependencies = [ - sources."readable-stream-1.0.34" - sources."through2-0.6.5" - ]; - }) + sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" - sources."gulp-sourcemaps-1.6.0" - sources."inflight-1.0.6" + sources."http-auth-3.1.3" + sources."http-errors-1.6.3" + sources."http-parser-js-0.4.13" sources."inherits-2.0.3" + sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" - sources."is-glob-3.1.0" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" sources."is-number-2.1.0" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-stream-1.1.0" - sources."is-utf8-0.2.1" - sources."is-valid-glob-0.3.0" + sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isobject-2.1.0" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."kind-of-3.2.2" - sources."lazystream-1.0.0" - sources."lodash.isequal-4.5.0" + sources."map-stream-0.1.0" sources."math-random-1.0.1" - sources."merge-stream-1.0.1" - (sources."micromatch-2.3.11" // { + sources."micromatch-2.3.11" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + (sources."morgan-1.9.0" // { dependencies = [ - sources."glob-parent-2.0.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."safe-buffer-5.1.1" ]; }) - sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."ms-0.7.1" + sources."nan-2.10.0" + sources."negotiator-0.6.1" sources."normalize-path-2.1.1" sources."object-assign-4.1.1" sources."object.omit-2.0.1" - sources."once-1.4.0" - sources."ordered-read-streams-0.3.0" + sources."on-finished-2.3.0" + sources."on-headers-1.0.1" + sources."opn-5.3.0" sources."parse-glob-3.0.4" - sources."path-dirname-1.0.2" + sources."parseurl-1.3.2" sources."path-is-absolute-1.0.1" + sources."pause-stream-0.0.11" sources."preserve-0.2.0" sources."process-nextick-args-2.0.0" + sources."proxy-middleware-0.15.0" (sources."randomatic-3.0.0" // { dependencies = [ sources."is-number-4.0.0" ]; }) + sources."range-parser-1.2.0" sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" sources."safe-buffer-5.1.2" - sources."stream-shift-1.0.0" - sources."string_decoder-1.1.1" - sources."strip-bom-2.0.0" - sources."strip-bom-stream-1.0.0" - sources."through2-2.0.3" - sources."through2-filter-2.0.0" - sources."to-absolute-glob-0.1.1" - sources."unique-stream-2.2.1" - sources."util-deprecate-1.0.2" - sources."vali-date-1.0.0" - sources."vinyl-2.1.0" - (sources."vinyl-fs-2.4.4" // { + (sources."send-0.16.2" // { dependencies = [ - sources."clone-1.0.4" - sources."clone-stats-0.0.1" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - sources."isarray-0.0.1" - sources."replace-ext-0.0.1" - sources."string_decoder-0.10.31" - sources."vinyl-1.2.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."statuses-1.4.0" ]; }) - sources."wrappy-1.0.2" - sources."xtend-4.0.1" + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."set-immediate-shim-1.0.1" + sources."setprototypeof-1.1.0" + sources."split-0.3.3" + sources."statuses-1.3.1" + sources."stream-combiner-0.0.4" + sources."string_decoder-1.1.1" + sources."through-2.3.8" + sources."unix-crypt-td-js-1.0.0" + sources."unpipe-1.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.0" + sources."uuid-3.2.1" + sources."vary-1.1.2" + sources."websocket-driver-0.7.0" + sources."websocket-extensions-0.1.3" ]; buildInputs = globalBuildInputs; meta = { - description = "Merges multiple lcov results into one"; - homepage = https://github.com/mweibel/lcov-result-merger; + description = "simple development http server with live reload capability"; + homepage = "https://github.com/tapio/live-server#readme"; license = "MIT"; }; production = true; @@ -37544,7 +38028,6 @@ in sources."binary-extensions-1.11.0" sources."blob-0.0.4" sources."body-parser-1.18.3" - sources."boom-4.3.1" sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ @@ -37566,11 +38049,6 @@ in sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" @@ -37631,8 +38109,6 @@ in sources."har-validator-5.0.3" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."html-entities-1.2.1" sources."http-errors-1.6.3" sources."http-signature-1.2.0" @@ -37712,25 +38188,24 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."request-2.86.0" + sources."request-2.87.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."send-0.16.2" sources."serve-static-1.13.2" sources."set-immediate-shim-1.0.1" sources."setprototypeof-1.1.0" - sources."sntp-2.1.0" - (sources."socket.io-2.1.0" // { + (sources."socket.io-2.1.1" // { dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" ]; }) sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.1.0" + sources."socket.io-client-2.1.1" sources."socket.io-parser-3.2.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."statuses-1.5.0" sources."string_decoder-1.1.1" sources."to-array-0.1.4" @@ -37759,163 +38234,6 @@ in production = true; bypassCache = false; }; - live-server = nodeEnv.buildNodePackage { - name = "live-server"; - packageName = "live-server"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/live-server/-/live-server-1.2.0.tgz"; - sha1 = "4498644bbf81a66f18dd8dffdef61c4c1c374ca3"; - }; - dependencies = [ - sources."accepts-1.3.5" - sources."anymatch-1.3.2" - sources."apache-crypt-1.2.1" - sources."apache-md5-1.1.2" - sources."arr-diff-2.0.0" - sources."arr-flatten-1.1.0" - sources."array-unique-0.2.1" - sources."async-each-1.0.1" - sources."balanced-match-1.0.0" - sources."basic-auth-2.0.0" - sources."batch-0.6.1" - sources."bcryptjs-2.4.3" - sources."binary-extensions-1.11.0" - sources."brace-expansion-1.1.11" - (sources."braces-1.8.5" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."chokidar-1.7.0" - sources."colors-1.2.5" - sources."concat-map-0.0.1" - sources."connect-3.5.1" - sources."core-util-is-1.0.2" - sources."cors-2.8.4" - sources."debug-2.2.0" - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."duplexer-0.1.1" - sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."event-stream-3.3.4" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" - sources."extglob-0.3.2" - sources."faye-websocket-0.11.1" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.4" - sources."finalhandler-0.5.1" - sources."for-in-1.0.2" - sources."for-own-0.1.5" - sources."fresh-0.5.2" - sources."from-0.1.7" - sources."fsevents-1.2.4" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" - sources."graceful-fs-4.1.11" - sources."http-auth-3.1.3" - sources."http-errors-1.6.3" - sources."http-parser-js-0.4.12" - sources."inherits-2.0.3" - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" - sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - sources."is-number-2.1.0" - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" - sources."is-wsl-1.1.0" - sources."isarray-1.0.0" - sources."isobject-2.1.0" - sources."kind-of-3.2.2" - sources."map-stream-0.1.0" - sources."math-random-1.0.1" - sources."micromatch-2.3.11" - sources."mime-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" - sources."minimatch-3.0.4" - (sources."morgan-1.9.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."safe-buffer-5.1.1" - ]; - }) - sources."ms-0.7.1" - sources."nan-2.10.0" - sources."negotiator-0.6.1" - sources."normalize-path-2.1.1" - sources."object-assign-4.1.1" - sources."object.omit-2.0.1" - sources."on-finished-2.3.0" - sources."on-headers-1.0.1" - sources."opn-5.3.0" - sources."parse-glob-3.0.4" - sources."parseurl-1.3.2" - sources."path-is-absolute-1.0.1" - sources."pause-stream-0.0.11" - sources."preserve-0.2.0" - sources."process-nextick-args-2.0.0" - sources."proxy-middleware-0.15.0" - (sources."randomatic-3.0.0" // { - dependencies = [ - sources."is-number-4.0.0" - ]; - }) - sources."range-parser-1.2.0" - sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" - sources."regex-cache-0.4.4" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.2" - sources."repeat-string-1.6.1" - sources."safe-buffer-5.1.2" - (sources."send-0.16.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."statuses-1.4.0" - ]; - }) - (sources."serve-index-1.9.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."set-immediate-shim-1.0.1" - sources."setprototypeof-1.1.0" - sources."split-0.3.3" - sources."statuses-1.3.1" - sources."stream-combiner-0.0.4" - sources."string_decoder-1.1.1" - sources."through-2.3.8" - sources."unix-crypt-td-js-1.0.0" - sources."unpipe-1.0.0" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.0" - sources."uuid-3.2.1" - sources."vary-1.1.2" - sources."websocket-driver-0.7.0" - sources."websocket-extensions-0.1.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "simple development http server with live reload capability"; - homepage = "https://github.com/tapio/live-server#readme"; - license = "MIT"; - }; - production = true; - bypassCache = false; - }; meat = nodeEnv.buildNodePackage { name = "meat"; packageName = "meat"; @@ -37968,7 +38286,7 @@ in }) sources."@gulp-sourcemaps/map-sources-1.0.0" sources."accord-0.28.0" - sources."acorn-5.5.3" + sources."acorn-5.6.2" sources."ajv-4.11.8" sources."align-text-0.1.4" sources."almond-0.3.3" @@ -38078,11 +38396,11 @@ in sources."kind-of-3.2.2" ]; }) - sources."browserslist-3.2.7" + sources."browserslist-3.2.8" sources."buffer-equal-1.0.0" sources."cache-base-1.0.1" sources."camelcase-1.2.1" - sources."caniuse-lite-1.0.30000842" + sources."caniuse-lite-1.0.30000850" sources."caseless-0.12.0" sources."center-align-0.1.3" sources."chalk-1.1.3" @@ -38106,7 +38424,7 @@ in sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."copy-descriptor-0.1.1" - sources."core-js-2.5.6" + sources."core-js-2.5.7" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" (sources."css-2.2.3" // { @@ -38133,10 +38451,10 @@ in sources."duplexer2-0.0.2" sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" - sources."electron-to-chromium-1.3.47" + sources."electron-to-chromium-1.3.48" sources."end-of-stream-0.1.5" sources."errno-0.1.7" - sources."es5-ext-0.10.42" + sources."es5-ext-0.10.45" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -38315,7 +38633,7 @@ in sources."source-map-0.6.1" sources."string_decoder-1.1.1" sources."through2-2.0.3" - sources."uglify-js-3.3.25" + sources."uglify-js-3.4.0" ]; }) (sources."gulp-util-3.0.8" // { @@ -38457,7 +38775,7 @@ in sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.9" - sources."natives-1.1.3" + sources."natives-1.1.4" sources."next-tick-1.0.0" sources."normalize-path-2.1.1" sources."now-and-later-2.0.0" @@ -38522,6 +38840,7 @@ in sources."right-align-0.1.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."sequencify-0.0.7" sources."set-value-2.0.0" @@ -38559,7 +38878,7 @@ in sources."extend-shallow-3.0.2" ]; }) - (sources."sshpk-1.14.1" // { + (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -38636,7 +38955,7 @@ in sources."vinyl-sourcemaps-apply-0.2.1" sources."whatwg-fetch-2.0.4" sources."when-3.7.8" - sources."which-1.3.0" + sources."which-1.3.1" sources."window-size-0.1.0" sources."wordwrap-0.0.2" sources."wrappy-1.0.2" @@ -38655,24 +38974,24 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz"; - sha512 = "23wcnn35p90xhsc5z94w45s30j756s97acm313h6lacnbliqlaka3drq2xbsi4br8gdkld3r4dc33vglq8kf5jb408c7b2agpyar8lh"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz"; + sha512 = "1qqnhamd691pyvx27ql2l5228qx1migp0yys010zdi748pp516hf10sr26w7gx71323a9p0gv69i358xv2w918gpba9xp2w70l211fq"; }; dependencies = [ sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."browser-stdout-1.3.1" - sources."commander-2.11.0" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."debug-3.1.0" sources."diff-3.5.0" sources."escape-string-regexp-1.0.5" sources."fs.realpath-1.0.0" sources."glob-7.1.2" - sources."growl-1.10.3" - sources."has-flag-2.0.0" + sources."growl-1.10.5" + sources."has-flag-3.0.0" sources."he-1.1.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -38682,7 +39001,7 @@ in sources."ms-2.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."supports-color-4.4.0" + sources."supports-color-5.4.0" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -38708,7 +39027,7 @@ in sources."combined-stream-1.0.6" sources."commander-2.15.1" sources."component-emitter-1.2.1" - sources."cookiejar-2.1.1" + sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" sources."debug-3.1.0" sources."delayed-stream-1.0.0" @@ -38719,7 +39038,7 @@ in sources."graphlib-2.1.5" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."js-yaml-3.11.0" + sources."js-yaml-3.12.0" sources."json-refs-2.1.7" sources."lodash-4.17.10" sources."methods-1.1.2" @@ -38730,7 +39049,7 @@ in sources."native-promise-only-0.8.1" sources."path-loader-1.0.4" sources."process-nextick-args-2.0.0" - sources."punycode-2.1.0" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" @@ -38783,7 +39102,7 @@ in sources."ajv-5.5.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.4" + sources."are-we-there-yet-1.1.5" sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -38791,8 +39110,7 @@ in sources."aws4-1.7.0" sources."base64-js-1.2.3" sources."bcrypt-pbkdf-1.0.1" - sources."boom-4.3.1" - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" @@ -38803,11 +39121,6 @@ in sources."config-chain-1.1.11" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -38832,8 +39145,6 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-unicode-2.0.1" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."hosted-git-info-2.6.0" sources."http-signature-1.2.0" sources."inherits-2.0.3" @@ -38852,7 +39163,7 @@ in sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimist-0.0.8" - sources."minipass-2.3.0" + sources."minipass-2.3.3" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ncp-0.4.2" @@ -38882,21 +39193,21 @@ in sources."punycode-1.4.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" - sources."request-2.86.0" + sources."request-2.87.0" sources."retry-0.10.1" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."slasp-0.0.4" sources."slide-1.1.6" - sources."sntp-2.1.0" sources."spdx-correct-3.0.0" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."ssri-5.3.0" sources."string-width-1.0.2" sources."string_decoder-1.1.1" @@ -38914,7 +39225,7 @@ in sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."walk-2.3.13" - sources."wide-align-1.1.2" + sources."wide-align-1.1.3" sources."wrappy-1.0.2" sources."yallist-3.0.2" ]; @@ -38940,7 +39251,7 @@ in sources."ajv-5.5.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.4" + sources."are-we-there-yet-1.1.5" sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -38949,7 +39260,6 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" - sources."boom-4.3.1" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" @@ -38958,11 +39268,6 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -38982,8 +39287,6 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-unicode-2.0.1" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -39017,14 +39320,14 @@ in sources."punycode-1.4.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" - sources."request-2.86.0" + sources."request-2.87.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sntp-2.1.0" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -39035,8 +39338,8 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.2.1" sources."verror-1.10.0" - sources."which-1.3.0" - sources."wide-align-1.1.2" + sources."which-1.3.1" + sources."wide-align-1.1.3" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -39080,7 +39383,7 @@ in sources."ajv-4.11.8" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.4" + sources."are-we-there-yet-1.1.5" sources."array-find-index-1.0.2" sources."array-flatten-1.1.1" sources."asn1-0.2.3" @@ -39097,7 +39400,7 @@ in sources."yargs-1.3.3" ]; }) - sources."big-integer-1.6.28" + sources."big-integer-1.6.30" sources."block-stream-0.0.9" (sources."body-parser-1.18.2" // { dependencies = [ @@ -39133,7 +39436,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."default-browser-id-1.0.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -39256,7 +39559,7 @@ in sources."http-errors-1.6.2" ]; }) - sources."rc-1.2.7" + sources."rc-1.2.8" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" @@ -39265,6 +39568,7 @@ in sources."request-2.81.0" sources."rimraf-2.2.8" sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" sources."semver-4.3.6" sources."send-0.16.2" (sources."serve-favicon-2.5.0" // { @@ -39281,7 +39585,7 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - (sources."sshpk-1.14.1" // { + (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -39294,7 +39598,7 @@ in sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" sources."strip-json-comments-2.0.1" - sources."strong-data-uri-1.0.5" + sources."strong-data-uri-1.0.6" sources."tar-2.2.1" sources."tar-pack-3.4.1" sources."tough-cookie-2.3.4" @@ -39323,8 +39627,8 @@ in sources."validate-npm-package-license-3.0.3" sources."vary-1.1.2" sources."verror-1.10.0" - sources."which-1.3.0" - sources."wide-align-1.1.2" + sources."which-1.3.1" + sources."wide-align-1.1.3" sources."win-detect-browsers-1.0.2" sources."window-size-0.1.4" sources."wrap-ansi-2.1.0" @@ -39357,7 +39661,7 @@ in sources."abbrev-1.1.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.4" + sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chownr-1.0.1" @@ -39366,7 +39670,7 @@ in sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."debug-2.6.9" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."fs-minipass-1.2.5" @@ -39383,7 +39687,7 @@ in sources."isarray-1.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.3.0" + sources."minipass-2.3.3" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -39400,7 +39704,7 @@ in sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.0" - (sources."rc-1.2.7" // { + (sources."rc-1.2.8" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -39417,9 +39721,9 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.2" + sources."tar-4.4.4" sources."util-deprecate-1.0.2" - sources."wide-align-1.1.2" + sources."wide-align-1.1.3" sources."wrappy-1.0.2" sources."yallist-3.0.2" ]; @@ -39435,10 +39739,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.17.4"; + version = "1.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.4.tgz"; - sha512 = "3bmxd7fd494gy4ddax3mihjz1iy484iakyssbhy87cc2kwbky9xkb8l47vphc3n858q9p9afxl57w0849i24amsdjhwbqh8vxhjy1v5"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.5.tgz"; + sha512 = "2djkgpk29zh4p7wqb8h4g6w0y2fix94zqpgi40fshn9yaf6anp5p0vbqj8r3s6zxsxhgvnv7lzj56v6s6gk0q2byqd9yqrmjmcacv8l"; }; dependencies = [ sources."abbrev-1.1.1" @@ -39531,7 +39835,7 @@ in sources."crypto-random-string-1.0.0" sources."debug-3.1.0" sources."decode-uri-component-0.2.0" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."define-property-2.0.2" sources."dot-prop-4.2.0" sources."duplexer-0.1.1" @@ -39650,7 +39954,7 @@ in sources."ps-tree-1.1.0" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.0" - sources."rc-1.2.7" + sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-not-1.0.2" @@ -39739,7 +40043,7 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."which-1.3.0" + sources."which-1.3.1" sources."widest-line-2.0.0" sources."write-file-atomic-2.3.0" sources."xdg-basedir-3.0.0" @@ -39757,10 +40061,10 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.18.5"; + version = "0.18.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.18.5.tgz"; - sha512 = "39pg9g9hqnalz1dl4zhs3g53lz92syqxbdxpfa89psxxdiz9xg6sa4arf35gw0fi46r3bn5vgwrf9w4ks6s822mq42n1bq85jfq1jqs"; + url = "https://registry.npmjs.org/node-red/-/node-red-0.18.7.tgz"; + sha512 = "20gq2l5qpk797xqjmv5idimlpssq388gdhb1p49kr1jh4n9d5wafdw6w80l78sd3121rk47yn016knf8dxkgpc46i8cincabbkhgkvk"; }; dependencies = [ sources."abbrev-1.1.1" @@ -39770,7 +40074,7 @@ in sources."ansi-regex-2.1.1" sources."append-field-0.1.0" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.4" + sources."are-we-there-yet-1.1.5" sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-indexofobject-0.0.1" @@ -39788,21 +40092,10 @@ in sources."bcryptjs-2.4.3" sources."bl-1.2.2" sources."block-stream-0.0.9" - (sources."body-parser-1.18.2" // { - dependencies = [ - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."http-errors-1.6.2" - ]; - }) - sources."setprototypeof-1.0.3" - ]; - }) + sources."body-parser-1.18.3" sources."boolbase-1.0.0" - sources."boom-4.3.1" sources."brace-expansion-1.1.11" - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."buildmail-2.0.0" sources."busboy-0.2.14" sources."bytes-3.0.0" @@ -39832,16 +40125,11 @@ in sources."cors-2.8.4" sources."crc-3.4.4" sources."cron-1.3.0" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."css-select-1.2.0" sources."css-what-2.1.0" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -39864,6 +40152,19 @@ in sources."etag-1.8.1" (sources."express-4.16.3" // { dependencies = [ + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) + sources."iconv-lite-0.4.19" + sources."qs-6.5.1" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) sources."statuses-1.4.0" ]; }) @@ -39898,13 +40199,11 @@ in sources."har-validator-5.0.3" sources."has-unicode-2.0.1" sources."hash-sum-1.0.2" - sources."hawk-6.0.2" (sources."help-me-1.1.0" // { dependencies = [ sources."pump-2.0.1" ]; }) - sources."hoek-4.2.1" (sources."htmlparser2-3.9.2" // { dependencies = [ sources."domelementtype-1.3.0" @@ -39914,7 +40213,7 @@ in sources."http-signature-1.2.0" sources."i18next-1.10.6" sources."i18next-client-1.10.3" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.23" sources."imap-0.8.19" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -39939,7 +40238,7 @@ in sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json5-0.2.0" - sources."jsonata-1.5.3" + sources."jsonata-1.5.4" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" sources."jsprim-1.4.1" @@ -39986,9 +40285,9 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" - sources."moment-2.22.1" + sources."moment-2.22.2" sources."moment-timezone-0.5.17" - (sources."mqtt-2.17.0" // { + (sources."mqtt-2.18.0" // { dependencies = [ sources."ws-3.3.3" ]; @@ -40027,7 +40326,7 @@ in ]; }) sources."node-red-node-rbe-0.2.3" - sources."node-red-node-twitter-0.1.13" + sources."node-red-node-twitter-0.1.15" sources."nodemailer-1.11.0" sources."nodemailer-direct-transport-1.1.0" sources."nodemailer-smtp-transport-1.1.0" @@ -40066,19 +40365,15 @@ in sources."pump-3.0.0" sources."pumpify-1.5.1" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."random-bytes-1.0.0" sources."range-parser-1.2.0" - (sources."raw-body-2.3.3" // { - dependencies = [ - sources."iconv-lite-0.4.23" - ]; - }) - sources."rc-1.2.7" + sources."raw-body-2.3.3" + sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" - sources."request-2.86.0" + sources."request-2.87.0" sources."retry-0.6.1" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -40092,11 +40387,10 @@ in sources."setprototypeof-1.1.0" sources."signal-exit-3.0.2" sources."smtp-connection-1.3.8" - sources."sntp-2.1.0" sources."source-map-0.6.1" sources."split2-2.2.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."statuses-1.5.0" sources."stream-shift-1.0.0" sources."streamsearch-0.1.2" @@ -40115,7 +40409,7 @@ in sources."twitter-ng-0.6.2" sources."type-is-1.6.16" sources."typedarray-0.0.6" - sources."uglify-js-3.3.24" + sources."uglify-js-3.3.25" sources."uid-number-0.0.6" sources."uid-safe-2.1.5" sources."uid2-0.0.3" @@ -40133,7 +40427,7 @@ in sources."verror-1.10.0" sources."websocket-stream-5.1.2" sources."when-3.7.8" - sources."wide-align-1.1.2" + sources."wide-align-1.1.3" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" (sources."ws-1.1.5" // { @@ -40252,7 +40546,7 @@ in sources."qs-0.5.1" sources."rai-0.1.12" sources."range-parser-0.0.4" - sources."raw-socket-1.6.0" + sources."raw-socket-1.6.1" sources."redis-0.7.3" sources."semver-1.1.0" sources."send-0.1.0" @@ -40287,10 +40581,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.0.1.tgz"; - sha512 = "03x8626d7ngp160j0lx7vmzpjglvlqbz4gf9kmdndaxna9h81zr8rjhad3jcdkr9j1nnlc1rsr7acsdny5ykl3dwilq0p486zr9cyrp"; + url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz"; + sha512 = "3bhkx1ynzp39m6w5mnwfimc25arlpxgs9vgk0w7ai8zw0q6kxyljj4xjvkyxg7wv1f8jbj3k31ifgvy0kff4p3sbp5li53ls851qzvv"; }; buildInputs = globalBuildInputs; meta = { @@ -40315,7 +40609,7 @@ in sources."ajv-5.5.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.4" + sources."are-we-there-yet-1.1.5" sources."argparse-0.1.15" sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -40329,7 +40623,6 @@ in sources."inherits-2.0.3" ]; }) - sources."boom-4.3.1" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."chownr-0.0.2" @@ -40346,11 +40639,6 @@ in sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."couch-login-0.1.20" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -40382,8 +40670,6 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-unicode-2.0.1" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -40403,7 +40689,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.3.5" - sources."natives-1.1.3" + sources."natives-1.1.4" sources."ncp-0.4.2" sources."nopt-2.2.1" (sources."npm-registry-client-0.2.27" // { @@ -40431,16 +40717,16 @@ in sources."punycode-1.4.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" - sources."request-2.86.0" + sources."request-2.87.0" sources."retry-0.6.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."semver-4.3.6" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."slide-1.1.6" - sources."sntp-2.1.0" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -40466,7 +40752,7 @@ in sources."uuid-3.2.1" sources."verror-1.10.0" sources."walk-2.3.13" - sources."wide-align-1.1.2" + sources."wide-align-1.1.3" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -40508,7 +40794,7 @@ in sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."debug-2.6.9" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" sources."escape-string-regexp-1.0.5" @@ -40537,7 +40823,7 @@ in sources."is-stream-1.1.0" sources."isexe-2.0.0" sources."jju-1.3.0" - sources."js-yaml-3.11.0" + sources."js-yaml-3.12.0" sources."json-parse-helpfulerror-1.0.3" sources."json5-0.5.1" sources."latest-version-3.1.0" @@ -40567,7 +40853,7 @@ in sources."pinkie-promise-2.0.1" sources."prepend-http-1.0.4" sources."pseudomap-1.0.2" - sources."rc-1.2.7" + sources."rc-1.2.8" sources."rc-config-loader-2.0.1" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -40600,7 +40886,7 @@ in ]; }) sources."url-parse-lax-1.0.0" - sources."which-1.3.0" + sources."which-1.3.1" sources."widest-line-2.0.0" sources."write-file-atomic-2.3.0" sources."xdg-basedir-3.0.0" @@ -40644,9 +40930,9 @@ in sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.2.5" + sources."colors-1.3.0" sources."cross-spawn-5.1.0" - sources."cvss-1.0.2" + sources."cvss-1.0.3" sources."debug-3.1.0" sources."decamelize-1.2.0" sources."error-ex-1.3.1" @@ -40698,7 +40984,7 @@ in sources."os-locale-2.1.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" - sources."p-limit-1.2.0" + sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" sources."parse-json-2.2.0" @@ -40733,7 +41019,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."validate-npm-package-license-3.0.3" - sources."which-1.3.0" + sources."which-1.3.1" sources."which-module-2.0.0" sources."wrap-ansi-2.1.0" sources."wreck-12.5.1" @@ -40761,10 +41047,10 @@ in ocaml-language-server = nodeEnv.buildNodePackage { name = "ocaml-language-server"; packageName = "ocaml-language-server"; - version = "1.0.34"; + version = "1.0.35"; src = fetchurl { - url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.34.tgz"; - sha512 = "216lq2hh4mmk0lzkn381p0l4lgr84xmv6jdjc42yry1yb695zy7bs36n40dmvc81afgsnc51b1rcbn51438ysk59w0drrxd8x43zykr"; + url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.35.tgz"; + sha512 = "3i0625j9mkprhjdmiw1ik23qi1wxl9kb826dbvbfkl4ksd9yxxs40k23rphxl3a10l303fa6in2lfidcf08qjqnv15m365bmkwbn57m"; }; dependencies = [ sources."async-2.6.0" @@ -40786,7 +41072,7 @@ in sources."vscode-languageclient-4.0.1" sources."vscode-languageserver-4.0.0" sources."vscode-languageserver-protocol-3.6.0" - sources."vscode-languageserver-types-3.7.2" + sources."vscode-languageserver-types-3.8.1" sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" ]; @@ -40833,7 +41119,6 @@ in sources."content-type-1.0.4" ]; }) - sources."boom-4.3.1" sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."bunyan-1.8.12" @@ -40847,23 +41132,22 @@ in sources."cliui-2.1.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."colors-1.2.5" + sources."colors-1.3.0" sources."combined-stream-1.0.6" - sources."compressible-2.0.13" - sources."compression-1.7.2" + sources."compressible-2.0.14" + (sources."compression-1.7.2" // { + dependencies = [ + sources."mime-db-1.34.0" + ]; + }) sources."concat-map-0.0.1" sources."connect-busboy-0.0.2" sources."content-disposition-0.5.2" sources."content-type-git+https://github.com/wikimedia/content-type#master" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."core-js-2.5.6" + sources."core-js-2.5.7" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" @@ -40876,7 +41160,7 @@ in sources."dnscache-1.0.1" sources."dom-storage-2.1.0" sources."domino-1.0.30" - sources."dtrace-provider-0.8.6" + sources."dtrace-provider-0.8.7" sources."ecc-jsbn-0.1.1" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" @@ -40938,8 +41222,6 @@ in sources."har-validator-5.0.3" sources."has-symbols-1.0.0" sources."hat-0.0.3" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."hosted-git-info-2.6.0" sources."hot-shots-4.8.0" sources."http-errors-1.6.3" @@ -40958,7 +41240,7 @@ in sources."is-utf8-0.2.1" sources."isarray-0.0.1" sources."isstream-0.1.2" - sources."js-yaml-3.11.0" + sources."js-yaml-3.12.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" @@ -40988,7 +41270,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.10" sources."mkdirp-0.5.1" - sources."moment-2.22.1" + sources."moment-2.22.2" sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" @@ -41028,13 +41310,13 @@ in sources."read-pkg-up-1.0.1" sources."readable-stream-1.1.14" sources."repeat-string-1.6.1" - sources."request-2.86.0" + sources."request-2.87.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."right-align-0.1.3" sources."rimraf-2.4.5" sources."safe-buffer-5.1.1" - sources."safe-json-stringify-1.1.0" + sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."send-0.16.2" @@ -41056,14 +41338,13 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.0" sources."simplediff-0.1.1" - sources."sntp-2.1.0" sources."source-map-0.4.4" sources."spdx-correct-3.0.0" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."statuses-1.5.0" sources."streamsearch-0.1.2" sources."string-width-1.0.2" @@ -41130,7 +41411,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.0" - sources."big-integer-1.6.28" + sources."big-integer-1.6.30" sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" sources."bittorrent-tracker-7.7.0" @@ -41141,12 +41422,12 @@ in sources."bplist-creator-0.0.6" sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" - sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" - sources."buffer-fill-0.1.1" - sources."buffer-from-1.0.0" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.0" sources."buffer-indexof-1.1.1" sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" @@ -41168,7 +41449,7 @@ in sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-equal-1.0.1" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."dns-equal-1.0.0" sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" @@ -41286,7 +41567,7 @@ in sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" - sources."rc-1.2.7" + sources."rc-1.2.8" sources."re-emitter-1.1.3" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" @@ -41418,12 +41699,12 @@ in sources."body-parser-1.13.3" sources."boom-0.3.8" sources."brace-expansion-1.1.11" - sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" - sources."buffer-fill-0.1.1" - sources."buffer-from-1.0.0" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.0" sources."bytes-2.1.0" sources."callsite-1.0.0" sources."combined-stream-0.0.7" @@ -41432,7 +41713,7 @@ in sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" - sources."compressible-2.0.13" + sources."compressible-2.0.14" sources."compression-1.5.2" sources."concat-map-0.0.1" (sources."connect-2.30.2" // { @@ -41480,6 +41761,7 @@ in dependencies = [ sources."accepts-1.3.5" sources."destroy-1.0.3" + sources."mime-db-1.34.0" sources."ms-2.0.0" sources."multiparty-3.3.2" sources."negotiator-0.6.1" @@ -41699,7 +41981,7 @@ in sources."utp-0.0.7" sources."vary-1.0.1" sources."vhost-3.0.2" - sources."which-1.3.0" + sources."which-1.3.1" sources."wrappy-1.0.2" sources."ws-1.1.5" sources."wtf-8-1.0.0" @@ -41729,7 +42011,7 @@ in sources."ansi-styles-2.2.1" sources."asn1-0.2.3" sources."assert-plus-0.2.0" - sources."async-2.6.0" + sources."async-2.6.1" sources."aws-sign2-0.6.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" @@ -41810,8 +42092,9 @@ in sources."request-2.67.0" sources."request-progress-2.0.1" sources."rimraf-2.6.2" + sources."safer-buffer-2.1.2" sources."sntp-1.0.9" - (sources."sshpk-1.14.1" // { + (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -41844,10 +42127,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.12.1"; + version = "1.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz"; - sha1 = "c1ad20e803e7749faf905a409d2367e06bbe7325"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.13.4.tgz"; + sha512 = "325wxdf3kzhwx8wnfz13gnllivgbgsbwqfqmq3pv29gamzzwspajfjwz7iw83fxlzf3nyd038h4qv9y544v5b5fjvsh52n0crkh8svs"; }; buildInputs = globalBuildInputs; meta = { @@ -41867,7 +42150,7 @@ in sha512 = "1kgjvji88fvdi6vazqq6gx32zqgkg9qp639952cz2v2g5izl7yblgawy1xra5dypv5c1a43wk4ch4iskr1kxxpfmn7pnql92q1nvxgg"; }; dependencies = [ - sources."JSONStream-1.3.2" + sources."JSONStream-1.3.3" sources."acorn-4.0.13" sources."acorn-node-1.3.0" (sources."anymatch-2.0.0" // { @@ -41894,7 +42177,12 @@ in sources."array-reduce-0.0.0" sources."array-unique-0.3.2" sources."asn1.js-4.10.1" - sources."assert-1.4.1" + (sources."assert-1.4.1" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) sources."assign-symbols-1.0.0" sources."astw-2.2.0" sources."async-1.5.2" @@ -41929,7 +42217,7 @@ in }) (sources."browserify-13.3.0" // { dependencies = [ - sources."acorn-5.5.3" + sources."acorn-5.6.2" (sources."concat-stream-1.5.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -41954,7 +42242,7 @@ in sources."browserify-zlib-0.1.4" sources."buffer-4.9.1" sources."buffer-crc32-0.2.13" - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" @@ -41974,7 +42262,7 @@ in ]; }) sources."collection-visit-1.0.0" - sources."colors-1.2.5" + sources."colors-1.3.0" sources."combine-source-map-0.8.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" @@ -42030,7 +42318,7 @@ in ]; }) sources."graceful-fs-4.1.11" - sources."has-1.0.1" + sources."has-1.0.3" sources."has-value-1.0.0" sources."has-values-1.0.0" sources."hash-base-3.0.4" @@ -42183,7 +42471,7 @@ in sources."static-extend-0.1.2" sources."stream-browserify-2.0.1" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.2" + sources."stream-http-2.8.3" sources."stream-splicer-2.0.0" sources."string-stream-0.0.7" sources."string_decoder-0.10.31" @@ -42231,11 +42519,7 @@ in sources."kind-of-6.0.2" ]; }) - (sources."util-0.10.3" // { - dependencies = [ - sources."inherits-2.0.1" - ]; - }) + sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" (sources."watchpack-1.6.0" // { @@ -42263,7 +42547,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."which-1.3.0" + sources."which-1.3.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" sources."xtend-4.0.1" @@ -42299,7 +42583,7 @@ in sources."align-text-0.1.4" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.4" + sources."are-we-there-yet-1.1.5" sources."array-flatten-1.1.1" sources."asap-2.0.6" sources."asn1-0.2.3" @@ -42316,9 +42600,9 @@ in sources."bl-1.2.2" sources."body-parser-1.18.3" sources."boom-2.10.1" - sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-0.1.1" - sources."buffer-fill-0.1.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-fill-1.0.0" sources."bufferutil-2.0.1" sources."bytes-3.0.0" sources."camelcase-1.2.1" @@ -42339,13 +42623,13 @@ in sources."cookie-0.3.1" sources."cookie-parser-1.4.3" sources."cookie-signature-1.0.6" - sources."core-js-2.5.6" + sources."core-js-2.5.7" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -42394,7 +42678,7 @@ in sources."graceful-fs-4.1.11" sources."har-schema-1.0.5" sources."har-validator-4.2.1" - sources."has-1.0.1" + sources."has-1.0.3" sources."has-unicode-2.0.1" sources."hawk-3.1.3" sources."hoek-2.16.3" @@ -42500,7 +42784,7 @@ in sources."qtdatastream-0.7.1" sources."range-parser-1.2.0" sources."raw-body-2.3.3" - sources."rc-1.2.7" + sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" @@ -42525,7 +42809,7 @@ in sources."simple-get-1.4.3" sources."sntp-1.0.9" sources."source-map-0.5.7" - (sources."sshpk-1.14.1" // { + (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -42556,7 +42840,7 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."void-elements-2.0.1" - sources."wide-align-1.1.2" + sources."wide-align-1.1.3" sources."window-size-0.1.0" sources."with-5.1.1" sources."wordwrap-0.0.2" @@ -42583,7 +42867,7 @@ in sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c"; }; dependencies = [ - sources."acorn-5.5.3" + sources."acorn-5.6.2" sources."amdefine-1.0.1" sources."ast-types-0.9.6" sources."balanced-match-1.0.0" @@ -42709,7 +42993,6 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.1" - sources."boom-4.3.1" sources."buffer-crc32-0.2.1" sources."bytes-0.2.1" sources."caseless-0.12.0" @@ -42726,11 +43009,6 @@ in sources."cookie-signature-1.0.1" sources."core-util-is-1.0.2" sources."crc-0.2.0" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."crypto-0.0.3" sources."dashdash-1.14.1" sources."debug-3.1.0" @@ -42765,8 +43043,6 @@ in sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-auth-2.0.7" sources."http-signature-1.2.0" sources."inherits-2.0.3" @@ -42795,7 +43071,7 @@ in (sources."openid-2.0.6" // { dependencies = [ sources."qs-6.5.2" - sources."request-2.86.0" + sources."request-2.87.0" ]; }) sources."pause-0.0.1" @@ -42807,10 +43083,10 @@ in sources."readable-stream-1.1.14" sources."request-2.9.203" sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."send-0.1.4" - sources."sntp-2.1.0" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."stream-counter-0.2.0" sources."string-1.6.1" sources."string_decoder-0.10.31" @@ -42850,160 +43126,58 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.5.7"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.5.7.tgz"; - sha512 = "1kn5wi04mvlkl4p56wihpgkh9va0vxy2a6rsfpy62ra53iri5w0dq8aipp62m8a23hl1s4g2bcfxyxlxmlyzkv9mvqi0455afbpn2nw"; + url = "https://registry.npmjs.org/serve/-/serve-8.1.1.tgz"; + sha512 = "33362hcr3ya4yadf2vzck9w8ihh58g025y2ngrj7c461h2jbazi1ddrp4qi8d82y5781rkrihahas2y3pcskipx75n2mghs2mhs98dx"; }; dependencies = [ - sources."accepts-1.3.5" - sources."address-1.0.3" - sources."align-text-0.1.4" - sources."amdefine-1.0.1" - sources."ansi-align-2.0.0" - sources."ansi-regex-3.0.0" + sources."@zeit/schemas-1.2.0" + sources."ajv-6.5.0" sources."ansi-styles-3.2.1" - sources."arch-2.1.0" - (sources."args-4.0.0" // { - dependencies = [ - sources."chalk-2.3.2" - ]; - }) - sources."async-1.5.2" - sources."basic-auth-2.0.0" - sources."bluebird-3.5.1" - (sources."boxen-1.3.0" // { - dependencies = [ - sources."camelcase-4.1.0" - ]; - }) + sources."arg-2.0.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" sources."bytes-3.0.0" - sources."camelcase-5.0.0" - sources."center-align-0.1.3" - sources."chalk-2.4.0" - sources."cli-boxes-1.0.0" - (sources."clipboardy-1.2.3" // { - dependencies = [ - sources."execa-0.8.0" - ]; - }) - sources."cliui-2.1.0" + sources."chalk-2.4.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."compressible-2.0.13" - sources."compression-1.7.2" - sources."content-type-1.0.4" - sources."cross-spawn-5.1.0" - sources."dargs-5.1.0" - sources."debug-2.6.9" - sources."decamelize-1.2.0" - sources."deep-extend-0.5.1" - sources."depd-1.1.1" - sources."destroy-1.0.4" - sources."detect-port-1.2.2" - sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" - sources."escape-html-1.0.3" + sources."concat-map-0.0.1" + sources."content-disposition-0.5.2" + sources."deep-extend-0.6.0" sources."escape-string-regexp-1.0.5" - sources."etag-1.8.1" - sources."execa-0.7.0" - sources."filesize-3.6.1" - sources."fresh-0.5.2" - sources."fs-extra-5.0.0" - sources."get-stream-3.0.0" - sources."graceful-fs-4.1.11" - (sources."handlebars-4.0.11" // { - dependencies = [ - sources."camelcase-1.2.1" - sources."wordwrap-0.0.2" - ]; - }) + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-url-parser-1.1.3" + sources."glob-slash-1.0.0" + sources."glob-slasher-1.0.1" sources."has-flag-3.0.0" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.19" - sources."inherits-2.0.3" sources."ini-1.3.5" - sources."ip-1.1.5" - sources."is-buffer-1.1.6" - sources."is-fullwidth-code-point-2.0.0" - sources."is-stream-1.1.0" - sources."is-wsl-1.1.0" - sources."isexe-2.0.0" - sources."jsonfile-4.0.0" - sources."kind-of-3.2.2" - sources."lazy-cache-1.0.4" - sources."leven-2.1.0" - sources."longest-1.0.1" - sources."lru-cache-4.1.3" - sources."micro-9.1.4" - sources."micro-compress-1.0.0" - sources."mime-1.4.1" + sources."json-schema-traverse-0.3.1" + sources."lodash-2.4.2" + sources."lodash._objecttypes-2.4.1" + sources."lodash.isobject-2.4.1" sources."mime-db-1.33.0" sources."mime-types-2.1.18" - sources."minimist-0.0.10" - sources."mri-1.1.0" - sources."ms-2.0.0" - sources."negotiator-0.6.1" - sources."node-version-1.1.3" - sources."npm-run-path-2.0.2" - sources."on-finished-2.3.0" - sources."on-headers-1.0.1" - sources."openssl-self-signed-certificate-1.1.6" - sources."opn-5.3.0" - sources."optimist-0.6.1" - sources."p-finally-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" - sources."path-type-3.0.0" - sources."pify-3.0.0" - sources."promise-timeout-1.3.0" - sources."pseudomap-1.0.2" - sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."rc-1.2.7" + sources."path-to-regexp-2.2.1" + sources."punycode-2.1.1" + sources."rc-1.2.8" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" - sources."repeat-string-1.6.1" - sources."right-align-0.1.3" - sources."safe-buffer-5.1.1" - (sources."send-0.16.2" // { + sources."safe-buffer-5.1.2" + (sources."serve-handler-3.1.0" // { dependencies = [ - sources."depd-1.1.2" - sources."statuses-1.4.0" + sources."punycode-1.4.1" ]; }) - sources."setprototypeof-1.0.3" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" - sources."source-map-0.4.4" - sources."statuses-1.5.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.4.0" - sources."term-size-1.2.0" - (sources."uglify-js-2.8.29" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."uglify-to-browserify-1.0.2" - sources."universalify-0.1.1" - sources."unpipe-1.0.0" - (sources."update-check-1.5.0" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - sources."vary-1.1.2" - sources."which-1.3.0" - sources."widest-line-2.0.0" - sources."window-size-0.1.0" - sources."wordwrap-0.0.3" - sources."yallist-2.1.2" - sources."yargs-3.10.0" + sources."toxic-1.0.0" + sources."update-check-1.5.2" + sources."uri-js-4.2.2" ]; buildInputs = globalBuildInputs; meta = { @@ -43046,7 +43220,6 @@ in sources."setprototypeof-1.0.3" ]; }) - sources."boom-4.3.1" sources."bytes-3.0.0" sources."callsite-1.0.0" sources."caseless-0.12.0" @@ -43067,11 +43240,6 @@ in sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" @@ -43114,8 +43282,6 @@ in sources."har-validator-5.0.3" sources."has-binary-data-0.1.1" sources."has-cors-1.0.3" - sources."hawk-6.0.2" - sources."hoek-4.2.1" (sources."htmlparser2-3.7.3" // { dependencies = [ sources."entities-1.0.0" @@ -43176,8 +43342,9 @@ in }) sources."read-1.0.7" sources."readable-stream-1.1.14" - sources."request-2.86.0" + sources."request-2.87.0" sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" sources."send-0.16.2" sources."serve-static-1.13.2" sources."setprototypeof-1.1.0" @@ -43187,7 +43354,6 @@ in sources."debug-0.7.4" ]; }) - sources."sntp-2.1.0" (sources."socket.io-1.0.6" // { dependencies = [ sources."commander-0.6.1" @@ -43203,7 +43369,7 @@ in sources."socket.io-client-1.0.6" sources."socket.io-parser-2.2.0" sources."split-0.3.3" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."statuses-1.4.0" sources."stream-combiner-0.0.4" sources."string_decoder-0.10.31" @@ -43241,7 +43407,7 @@ in sha1 = "36bf5209356facbf6cef18fa32274d116043ed24"; }; dependencies = [ - sources."JSONStream-1.3.2" + sources."JSONStream-1.3.3" sources."accepts-1.3.5" sources."ajv-5.5.2" sources."amdefine-1.0.1" @@ -43265,7 +43431,6 @@ in sources."raw-body-2.3.3" ]; }) - sources."boom-4.3.1" sources."brace-expansion-1.1.11" (sources."bunyan-1.8.12" // { dependencies = [ @@ -43280,10 +43445,11 @@ in sources."color-name-1.1.3" sources."combined-stream-1.0.6" sources."commander-2.15.1" - sources."compressible-2.0.13" + sources."compressible-2.0.14" (sources."compression-1.7.2" // { dependencies = [ sources."bytes-3.0.0" + sources."mime-db-1.34.0" ]; }) sources."concat-map-0.0.1" @@ -43294,11 +43460,6 @@ in sources."cookies-0.7.1" sources."core-util-is-1.0.2" sources."crypt3-0.2.0" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" @@ -43312,7 +43473,7 @@ in sources."domelementtype-1.3.0" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."dtrace-provider-0.8.6" + sources."dtrace-provider-0.8.7" sources."ecc-jsbn-0.1.1" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" @@ -43344,9 +43505,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-flag-3.0.0" - sources."hawk-6.0.2" sources."highlight.js-8.9.1" - sources."hoek-4.2.1" sources."htmlparser2-3.9.2" (sources."http-errors-1.6.3" // { dependencies = [ @@ -43363,7 +43522,7 @@ in sources."isarray-1.0.0" sources."isstream-0.1.2" sources."jju-1.3.0" - sources."js-yaml-3.11.0" + sources."js-yaml-3.12.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" @@ -43390,7 +43549,7 @@ in sources."minimatch-1.0.0" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.22.1" + sources."moment-2.22.2" sources."ms-2.0.0" sources."mv-2.1.1" sources."nan-2.10.0" @@ -43425,7 +43584,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."request-2.86.0" // { + (sources."request-2.87.0" // { dependencies = [ sources."qs-6.5.2" ]; @@ -43438,7 +43597,7 @@ in ]; }) sources."safe-buffer-5.1.1" - sources."safe-json-stringify-1.1.0" + sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" sources."sanitize-html-1.18.2" sources."semver-4.3.6" @@ -43447,11 +43606,10 @@ in sources."setprototypeof-1.0.3" sources."sigmund-1.0.1" sources."sinopia-htpasswd-0.4.5" - sources."sntp-2.1.0" sources."source-map-0.1.43" sources."sprintf-js-1.0.3" sources."srcset-1.0.0" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."statuses-1.3.1" sources."string_decoder-1.1.1" sources."supports-color-5.4.0" @@ -43594,7 +43752,7 @@ in }) sources."rimraf-2.4.5" sources."safe-buffer-5.1.2" - sources."safe-json-stringify-1.1.0" + sources."safe-json-stringify-1.2.0" sources."semver-4.3.6" (sources."smartdc-auth-2.3.1" // { dependencies = [ @@ -43663,10 +43821,10 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.0.tgz"; - sha512 = "2wkm6yqxvn8wk51rbakza3zxg3rknzfgmwqrbzvnlacf1yylplsr61i67m01sg8x7589ymj6x3z266ngvqd6qyyakdx4dlnsl4bfbr9"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz"; + sha512 = "343q0n5zxyjzzcmyq7dr3naqbrpl3x469y1ff8zxxr104np1l5l9w1d0vl7nncbaxhxymwplbzfy9sbipjrbp5d001nvv9ysymnmr5c"; }; dependencies = [ sources."accepts-1.3.5" @@ -43700,7 +43858,7 @@ in sources."parseuri-0.0.5" sources."safe-buffer-5.1.2" sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.1.0" + sources."socket.io-client-2.1.1" sources."socket.io-parser-3.2.0" sources."to-array-0.1.4" sources."ultron-1.1.1" @@ -43870,18 +44028,18 @@ in sources."domelementtype-1.3.0" sources."domutils-1.5.1" sources."entities-1.1.1" - sources."es-abstract-1.11.0" + sources."es-abstract-1.12.0" sources."es-to-primitive-1.1.1" sources."esprima-4.0.0" sources."foreach-2.0.5" sources."function-bind-1.1.1" - sources."has-1.0.1" + sources."has-1.0.3" sources."is-callable-1.1.3" sources."is-date-object-1.0.1" sources."is-regex-1.0.4" sources."is-symbol-1.0.1" sources."js-yaml-3.10.0" - sources."mdn-data-1.1.3" + sources."mdn-data-1.1.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."nth-check-1.0.1" @@ -43954,10 +44112,10 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.1.0.tgz"; - sha1 = "68597b6d324a65c7cf070c40a2a156b219ca06dd"; + url = "https://registry.npmjs.org/titanium/-/titanium-5.1.1.tgz"; + sha1 = "69b0032628178bafc3f0d09a1c9c16437413db5b"; }; dependencies = [ sources."adm-zip-0.4.7" @@ -44072,12 +44230,13 @@ in sources."right-align-0.1.3" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."semver-5.3.0" sources."sntp-1.0.9" sources."source-map-0.1.32" sources."source-map-support-0.3.2" sources."sprintf-0.1.5" - (sources."sshpk-1.14.1" // { + (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -44118,10 +44277,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.8.3"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz"; - sha512 = "2vwhgmdrdw42wwaqbmrnz7zy197hrxl6smkmhrb3n93vsjmqg24a4r10czdralib6qpj82bx2gw97r3gxlspj7y54jswigs2vj3bf1b"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz"; + sha512 = "1066hcxz9xdrz1mnyz6kl6ms4szdjxvlz6j37mdp6jlf6vnhmdxx8qyikbzgy7yzvx6i7hvxhg51kc6isw9wpar2r1ch3f6zzclral7"; }; buildInputs = globalBuildInputs; meta = { @@ -44155,7 +44314,7 @@ in sources."bluebird-3.5.1" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."chalk-1.1.3" @@ -44181,7 +44340,7 @@ in sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."debug-2.6.9" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."defaults-1.0.3" sources."delayed-stream-1.0.0" sources."detect-indent-5.0.0" @@ -44201,7 +44360,7 @@ in sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.1.11" - sources."has-1.0.1" + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-unicode-2.0.1" @@ -44270,8 +44429,9 @@ in sources."process-nextick-args-2.0.0" sources."promise-finally-3.0.0" sources."pseudomap-1.0.2" + sources."psl-1.1.27" sources."punycode-1.4.1" - (sources."rc-1.2.7" // { + (sources."rc-1.2.8" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -44302,9 +44462,9 @@ in sources."throat-3.2.0" sources."timed-out-4.0.1" sources."touch-1.0.0" - sources."tough-cookie-2.3.4" + sources."tough-cookie-2.4.2" sources."typedarray-0.0.6" - sources."typescript-2.8.3" + sources."typescript-2.9.1" (sources."typings-core-2.3.3" // { dependencies = [ sources."minimist-0.0.8" @@ -44324,7 +44484,7 @@ in sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" - sources."which-1.3.0" + sources."which-1.3.1" sources."widest-line-2.0.0" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" @@ -44346,10 +44506,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.25"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.25.tgz"; - sha512 = "1qcjjk817lmd65xc8h3axwdnx4h7xkn3k9lf7dy65bm564jhrqvq5v11va9jiamdva9q0nk589i3vm2pn7dvjmjavx5s3d3pj1fi1l6"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.0.tgz"; + sha512 = "0jsplc22wvbnzdbcs1adsqcdpkn65ywg5ab8lk4v4ajsh9zhiys0qwf2ylairyj8znh9ml8ppknp94vamzlca947paplpz4lffzkir5"; }; dependencies = [ sources."commander-2.15.1" @@ -44367,10 +44527,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.22"; + version = "1.4.24"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.22.tgz"; - sha512 = "22lf4pk1mn1vn8rgakj6z2dllv4xr7nybymkgrpvkfkglrlh6s9ch5cbbqsdy7mgrhgkmqwrygyb5xypwil4rrfw4a2x1q15jpg229w"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.24.tgz"; + sha512 = "1lx5m5bkm4m64qiy8ccnbixchng112m2b9qvzd963k8f0nb298hfjrry1c2la1bavv834zdvgv2xwa93fdyaq0wrv562p9d0n1p5lxy"; }; dependencies = [ sources."abbrev-1.1.1" @@ -44379,7 +44539,7 @@ in sources."ajv-5.5.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.4" + sources."are-we-there-yet-1.1.5" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.3" @@ -44399,9 +44559,8 @@ in sources."bluebird-3.5.1" sources."blueimp-md5-2.10.0" sources."body-parser-1.18.3" - sources."boom-4.3.1" sources."brace-expansion-1.1.11" - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."bytes-3.0.0" @@ -44440,16 +44599,11 @@ in sources."cross-spawn-5.1.0" sources."crossroads-0.12.2" sources."crypt-0.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."delayed-stream-0.0.5" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -44509,7 +44663,7 @@ in sources."gauge-2.7.4" sources."get-caller-file-1.0.2" sources."get-stream-3.0.0" - sources."getmac-1.4.1" + sources."getmac-1.4.3" sources."getpass-0.1.7" sources."glob-7.1.2" sources."graceful-fs-4.1.11" @@ -44519,8 +44673,6 @@ in sources."has-cors-1.1.0" sources."has-unicode-2.0.1" sources."hasher-1.2.0" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."hogan.js-3.0.2" sources."hosted-git-info-2.6.0" sources."http-errors-1.6.3" @@ -44543,7 +44695,7 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jquery-3.3.1" - sources."jquery-ui-1.12.1" + sources."jquery-ui-bundle-1.12.1" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" @@ -44581,13 +44733,13 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.22.1" + sources."moment-2.22.2" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."node-cache-4.2.0" sources."nopt-1.0.10" sources."normalize-package-data-2.4.0" - sources."npm-6.0.1" + sources."npm-6.1.0" sources."npm-package-arg-6.1.0" (sources."npm-registry-client-8.5.1" // { dependencies = [ @@ -44617,7 +44769,7 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-finally-1.0.0" - sources."p-limit-1.2.0" + sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" sources."parseqs-0.0.5" @@ -44639,20 +44791,20 @@ in sources."qs-6.5.2" sources."random-bytes-1.0.0" sources."range-parser-1.2.0" - (sources."raven-2.4.2" // { + (sources."raven-2.6.2" // { dependencies = [ sources."uuid-3.0.0" ]; }) sources."raw-body-2.3.3" - (sources."rc-1.2.7" // { + (sources."rc-1.2.8" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."readable-stream-1.0.27-1" sources."reduce-component-1.0.1" - sources."request-2.86.0" + sources."request-2.87.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."retry-0.10.1" @@ -44671,8 +44823,7 @@ in sources."simple-swizzle-0.2.2" sources."slide-1.1.6" sources."snapsvg-0.5.1" - sources."sntp-2.1.0" - (sources."socket.io-2.1.0" // { + (sources."socket.io-2.1.1" // { dependencies = [ sources."component-emitter-1.2.1" sources."debug-3.1.0" @@ -44680,15 +44831,15 @@ in ]; }) sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.1.0" + sources."socket.io-client-2.1.1" sources."socket.io-parser-3.2.0" sources."spdx-correct-3.0.0" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."ssri-5.3.0" - sources."stack-trace-0.0.9" + sources."stack-trace-0.0.10" sources."statuses-1.5.0" sources."string-width-1.0.2" sources."string_decoder-0.10.31" @@ -44699,7 +44850,7 @@ in dependencies = [ sources."combined-stream-1.0.6" sources."component-emitter-1.2.1" - sources."cookiejar-2.1.1" + sources."cookiejar-2.1.2" sources."debug-3.1.0" sources."delayed-stream-1.0.0" sources."extend-3.0.1" @@ -44735,9 +44886,9 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."whatwg-fetch-2.0.4" - sources."which-1.3.0" + sources."which-1.3.1" sources."which-module-2.0.0" - sources."wide-align-1.1.2" + sources."wide-align-1.1.3" (sources."winston-2.4.2" // { dependencies = [ sources."async-1.0.0" @@ -44754,7 +44905,7 @@ in sources."xmlhttprequest-ssl-1.5.5" sources."y18n-3.2.1" sources."yallist-2.1.2" - (sources."yargs-11.1.0" // { + (sources."yargs-12.0.0-candidate.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -44762,7 +44913,7 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."yargs-parser-9.0.2" + sources."yargs-parser-10.0.0" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -44777,10 +44928,10 @@ in vue-cli = nodeEnv.buildNodePackage { name = "vue-cli"; packageName = "vue-cli"; - version = "2.9.3"; + version = "2.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.3.tgz"; - sha512 = "1wljsr8srayqg7crbbczi00v31q3dxm3vz4fjcdqasdgsm1ajc9gham6sinsxlraniwg4dn5b1kmpw0nln63cy3v02vib07shyvq2ki"; + url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.6.tgz"; + sha512 = "10ysmrjahrqcnpqwr8x6vapf0wdzaa0g9y143fgpk99p0ggm1536isaasl091y6rrhyfqpyb41k5gpg02zmx24dmz2nfjc9zink815k"; }; dependencies = [ sources."absolute-0.0.1" @@ -44799,7 +44950,7 @@ in sources."arrify-1.0.1" sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."async-2.6.0" + sources."async-2.6.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" @@ -44808,13 +44959,12 @@ in sources."bcrypt-pbkdf-1.0.1" sources."bl-1.2.2" sources."bluebird-3.5.1" - sources."boom-4.3.1" sources."brace-expansion-1.1.11" sources."buffer-3.6.0" - sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" - sources."buffer-fill-0.1.1" + sources."buffer-fill-1.0.0" sources."builtins-1.0.3" sources."camelcase-1.2.1" sources."capture-stack-trace-1.0.0" @@ -44826,7 +44976,7 @@ in }) sources."center-align-0.1.3" sources."chalk-2.4.1" - sources."chardet-0.4.2" + sources."chardet-0.5.0" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" sources."cli-width-2.2.0" @@ -44846,11 +44996,6 @@ in sources."consolidate-0.14.5" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."decamelize-1.2.0" (sources."decompress-4.2.0" // { @@ -44883,11 +45028,11 @@ in sources."esprima-4.0.0" sources."extend-3.0.1" sources."extend-shallow-2.0.1" - sources."external-editor-2.2.0" + sources."external-editor-3.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" - sources."fd-slicer-1.0.1" + sources."fd-slicer-1.1.0" sources."figures-2.0.0" sources."file-type-5.2.0" sources."filename-reserved-regex-2.0.0" @@ -44919,15 +45064,13 @@ in sources."has-generators-1.0.1" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" sources."ieee754-1.1.11" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-3.3.0" + sources."inquirer-6.0.0" sources."is-3.2.1" sources."is-buffer-1.1.6" sources."is-extendable-0.1.1" @@ -44943,7 +45086,7 @@ in sources."isarray-1.0.0" sources."isstream-0.1.2" sources."isurl-1.0.0" - sources."js-yaml-3.11.0" + sources."js-yaml-3.12.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" @@ -45003,7 +45146,7 @@ in sources."readable-stream-2.3.6" sources."recursive-readdir-2.2.2" sources."repeat-string-1.6.1" - (sources."request-2.86.0" // { + (sources."request-2.87.0" // { dependencies = [ sources."co-4.6.0" ]; @@ -45012,17 +45155,15 @@ in sources."right-align-0.1.3" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" + sources."rxjs-6.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."seek-bzip-1.0.5" sources."semver-5.5.0" sources."signal-exit-3.0.2" - sources."sntp-2.1.0" sources."source-map-0.4.4" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."stat-mode-0.2.2" sources."string-width-2.1.1" sources."string_decoder-1.1.1" @@ -45041,6 +45182,7 @@ in sources."toml-2.3.3" sources."tough-cookie-2.3.4" sources."trim-repeated-1.0.0" + sources."tslib-1.9.2" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" (sources."uglify-js-2.8.29" // { @@ -45069,7 +45211,7 @@ in sources."xtend-4.0.1" sources."yaml-js-0.0.8" sources."yargs-3.10.0" - sources."yauzl-2.9.1" + sources."yauzl-2.9.2" ]; buildInputs = globalBuildInputs; meta = { @@ -45095,7 +45237,7 @@ in sources."ansi-styles-2.2.1" sources."asn1-0.2.3" sources."assert-plus-0.2.0" - sources."async-2.6.0" + sources."async-2.6.1" sources."aws-sign2-0.6.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" @@ -45194,9 +45336,10 @@ in sources."request-2.67.0" sources."request-progress-2.0.1" sources."rimraf-2.6.2" + sources."safer-buffer-2.1.2" sources."semver-2.3.2" sources."sntp-1.0.9" - (sources."sshpk-1.14.1" // { + (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -45211,7 +45354,7 @@ in sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - sources."underscore-1.9.0" + sources."underscore-1.9.1" sources."util-deprecate-1.0.2" sources."verror-1.10.0" sources."which-1.2.14" @@ -45231,28 +45374,31 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.8.3"; + version = "4.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.8.3.tgz"; - sha512 = "2rkj1v8fvs1hqpgiikpfnbv29yf1fmyqxfsmgkk3rwhbxbg35ca932ysiamxdq0cgn56lw8sknmfh98cgiw9rfywx5cgj8j2a6c05zy"; + url = "https://registry.npmjs.org/webpack/-/webpack-4.11.1.tgz"; + sha512 = "2lhfa6yb1xg2qcka4a2gmk2vc0xm853vz1ymqrx32fjnf6ljpqf189v4v1l4pgsghsb5lav1d33gmz37hv7xcl8h7av9x76qb394wgh"; }; dependencies = [ - sources."@webassemblyjs/ast-1.4.3" - sources."@webassemblyjs/floating-point-hex-parser-1.4.3" - sources."@webassemblyjs/helper-buffer-1.4.3" - sources."@webassemblyjs/helper-code-frame-1.4.3" - sources."@webassemblyjs/helper-fsm-1.4.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.4.3" - sources."@webassemblyjs/helper-wasm-section-1.4.3" - sources."@webassemblyjs/leb128-1.4.3" - sources."@webassemblyjs/validation-1.4.3" - sources."@webassemblyjs/wasm-edit-1.4.3" - sources."@webassemblyjs/wasm-gen-1.4.3" - sources."@webassemblyjs/wasm-opt-1.4.3" - sources."@webassemblyjs/wasm-parser-1.4.3" - sources."@webassemblyjs/wast-parser-1.4.3" - sources."@webassemblyjs/wast-printer-1.4.3" - sources."acorn-5.5.3" + sources."@webassemblyjs/ast-1.5.10" + sources."@webassemblyjs/floating-point-hex-parser-1.5.10" + sources."@webassemblyjs/helper-api-error-1.5.10" + sources."@webassemblyjs/helper-buffer-1.5.10" + sources."@webassemblyjs/helper-code-frame-1.5.10" + sources."@webassemblyjs/helper-fsm-1.5.10" + sources."@webassemblyjs/helper-module-context-1.5.10" + sources."@webassemblyjs/helper-wasm-bytecode-1.5.10" + sources."@webassemblyjs/helper-wasm-section-1.5.10" + sources."@webassemblyjs/ieee754-1.5.10" + sources."@webassemblyjs/leb128-1.5.10" + sources."@webassemblyjs/utf8-1.5.10" + sources."@webassemblyjs/wasm-edit-1.5.10" + sources."@webassemblyjs/wasm-gen-1.5.10" + sources."@webassemblyjs/wasm-opt-1.5.10" + sources."@webassemblyjs/wasm-parser-1.5.10" + sources."@webassemblyjs/wast-parser-1.5.10" + sources."@webassemblyjs/wast-printer-1.5.10" + sources."acorn-5.6.2" sources."acorn-dynamic-import-3.0.0" sources."ajv-6.5.0" sources."ajv-keywords-3.2.0" @@ -45263,7 +45409,11 @@ in sources."arr-union-3.1.0" sources."array-unique-0.3.2" sources."asn1.js-4.10.1" - sources."assert-1.4.1" + (sources."assert-1.4.1" // { + dependencies = [ + sources."util-0.10.3" + ]; + }) sources."assign-symbols-1.0.0" sources."async-each-1.0.1" sources."atob-2.1.1" @@ -45300,7 +45450,7 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."buffer-4.9.1" - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cacache-10.0.4" @@ -45385,7 +45535,11 @@ in sources."has-value-1.0.0" sources."has-values-1.0.0" sources."hash-base-3.0.4" - sources."hash.js-1.1.3" + (sources."hash.js-1.1.3" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) sources."hmac-drbg-1.0.1" sources."https-browserify-1.0.0" sources."ieee754-1.1.11" @@ -45408,6 +45562,7 @@ in sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isobject-3.0.1" + sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.3.1" sources."json5-0.5.1" sources."kind-of-6.0.2" @@ -45418,6 +45573,7 @@ in sources."long-3.2.0" sources."lru-cache-4.1.3" sources."make-dir-1.3.0" + sources."mamacro-0.0.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.4" @@ -45466,7 +45622,7 @@ in sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-browserify-0.3.0" - sources."p-limit-1.2.0" + sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" sources."pako-1.0.6" @@ -45489,7 +45645,7 @@ in sources."public-encrypt-4.0.2" sources."pump-2.0.1" sources."pumpify-1.5.1" - sources."punycode-2.1.0" + sources."punycode-2.1.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.0.6" @@ -45567,7 +45723,7 @@ in sources."static-extend-0.1.2" sources."stream-browserify-2.0.1" sources."stream-each-1.2.2" - sources."stream-http-2.8.2" + sources."stream-http-2.8.3" sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" sources."tapable-1.0.0" @@ -45602,7 +45758,7 @@ in ]; }) sources."upath-1.1.0" - sources."uri-js-4.2.1" + sources."uri-js-4.2.2" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -45614,11 +45770,14 @@ in sources."kind-of-6.0.2" ]; }) - sources."util-0.10.3" + (sources."util-0.10.4" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" sources."watchpack-1.6.0" - sources."webassemblyjs-1.4.3" (sources."webpack-sources-1.1.0" // { dependencies = [ sources."source-map-0.6.1" @@ -45657,7 +45816,7 @@ in }) sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.4" + sources."are-we-there-yet-1.1.5" sources."ascli-0.3.0" sources."async-limiter-1.0.0" sources."balanced-match-1.0.0" @@ -45665,7 +45824,7 @@ in sources."binary-search-1.3.3" sources."bindings-1.3.0" sources."bitfield-2.0.0" - sources."bittorrent-dht-8.3.0" + sources."bittorrent-dht-8.4.0" sources."bittorrent-peerid-1.2.0" sources."bittorrent-protocol-2.4.1" sources."bittorrent-tracker-9.9.1" @@ -45675,11 +45834,11 @@ in sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" sources."browserify-package-json-1.0.1" - sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equals-1.0.4" - sources."buffer-fill-0.1.1" - sources."buffer-from-1.0.0" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.0" sources."buffer-indexof-1.1.1" (sources."bufferutil-3.0.5" // { dependencies = [ @@ -45709,7 +45868,7 @@ in sources."create-torrent-3.31.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."defined-1.0.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" @@ -45775,7 +45934,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" - sources."moment-2.22.1" + sources."moment-2.22.2" sources."mp4-box-encoding-1.1.4" sources."mp4-stream-2.0.3" sources."ms-2.0.0" @@ -45784,7 +45943,7 @@ in sources."thunky-1.0.2" ]; }) - sources."multistream-2.1.0" + sources."multistream-2.1.1" sources."nan-2.10.0" sources."netmask-1.0.6" sources."network-address-1.1.2" @@ -45801,7 +45960,8 @@ in sources."optjs-3.2.2" sources."os-homedir-1.0.2" sources."package-json-versionify-1.0.4" - (sources."parse-torrent-6.0.0" // { + sources."parse-numeric-range-0.0.2" + (sources."parse-torrent-6.0.1" // { dependencies = [ sources."simple-get-3.0.2" ]; @@ -45822,9 +45982,9 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."range-slice-stream-1.2.0" - sources."rc-1.2.7" + sources."rc-1.2.8" sources."readable-stream-2.3.6" - sources."record-cache-1.0.2" + sources."record-cache-1.1.0" (sources."render-media-3.1.0" // { dependencies = [ sources."pump-1.0.3" @@ -45842,7 +46002,7 @@ in sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - sources."simple-peer-9.1.1" + sources."simple-peer-9.1.2" sources."simple-sha1-2.1.1" (sources."simple-websocket-7.0.2" // { dependencies = [ @@ -45891,7 +46051,7 @@ in sources."util-deprecate-1.0.2" sources."videostream-2.4.2" sources."vlc-command-1.1.1" - (sources."webtorrent-0.99.4" // { + (sources."webtorrent-0.100.0" // { dependencies = [ sources."debug-3.1.0" sources."minimist-0.0.8" @@ -45900,10 +46060,10 @@ in ]; }) sources."which-pm-runs-1.0.0" - sources."wide-align-1.1.2" + sources."wide-align-1.1.3" sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-5.1.1" + sources."ws-5.2.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" @@ -45922,18 +46082,18 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.6.0.tgz"; - sha1 = "52c074123e6376a4fb673e565c33dd027714e9b0"; + url = "https://registry.npmjs.org/web-ext/-/web-ext-2.7.0.tgz"; + sha512 = "1ab12frdfy6f1lnsg9g7lymq825vw9l84sspghqfm3k5j8d2gc8gfdg87lq4x393scnq9qrjckw2gpyg2sqlklrqql6vs7ibwqzyy45"; }; dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.1.1" + sources."@types/node-10.3.1" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" - sources."acorn-5.5.3" + sources."acorn-5.6.2" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -45942,13 +46102,13 @@ in sources."adbkit-2.11.0" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-0.41.0" // { + (sources."addons-linter-1.0.0" // { dependencies = [ sources."ajv-keywords-1.5.1" sources."ansi-escapes-1.4.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."async-2.6.0" + sources."async-2.6.1" sources."camelcase-2.1.1" sources."cli-cursor-1.0.2" sources."cliui-4.1.0" @@ -45956,10 +46116,10 @@ in sources."decamelize-1.2.0" sources."domelementtype-1.1.3" sources."es6-promise-4.2.4" + sources."fast-deep-equal-1.1.0" sources."figures-1.7.0" sources."for-in-0.1.8" sources."globals-11.5.0" - sources."inherits-2.0.1" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-0.0.1" @@ -45968,13 +46128,13 @@ in sources."pify-3.0.0" sources."pluralize-1.2.1" sources."progress-1.1.8" - sources."punycode-2.1.0" + sources."punycode-1.4.1" sources."restore-cursor-1.0.1" sources."run-async-0.1.0" sources."rx-lite-3.1.2" sources."slice-ansi-0.0.4" sources."source-map-0.6.1" - sources."source-map-support-0.5.4" + sources."source-map-support-0.5.6" sources."string-width-1.0.2" sources."string_decoder-0.10.31" sources."strip-ansi-4.0.0" @@ -45993,7 +46153,7 @@ in }) sources."adm-zip-0.4.11" sources."agent-base-4.2.0" - sources."ajv-6.3.0" + sources."ajv-6.5.0" sources."ajv-keywords-2.1.1" sources."ajv-merge-patch-3.0.0" sources."anchor-markdown-header-0.5.7" @@ -46038,7 +46198,7 @@ in sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.11.3" + sources."ast-types-0.11.5" sources."async-0.2.10" sources."async-each-1.0.1" sources."asynckit-0.4.0" @@ -46090,12 +46250,12 @@ in sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" - sources."buffer-fill-0.1.1" - sources."buffer-from-1.0.0" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.0" sources."builtin-modules-1.1.1" (sources."bunyan-1.8.12" // { dependencies = [ @@ -46111,7 +46271,7 @@ in sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" sources."ccount-1.0.3" - sources."chalk-2.3.2" + sources."chalk-2.4.0" sources."character-entities-1.2.2" sources."character-entities-html4-1.1.2" sources."character-entities-legacy-1.1.2" @@ -46161,7 +46321,7 @@ in sources."configstore-3.1.2" sources."convert-source-map-1.5.1" sources."copy-descriptor-0.1.1" - sources."core-js-2.5.6" + sources."core-js-2.5.7" sources."core-util-is-1.0.2" sources."crc-3.5.0" sources."crc32-stream-2.0.0" @@ -46188,7 +46348,7 @@ in }) sources."decode-uri-component-0.2.0" sources."deep-equal-1.0.1" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepcopy-0.6.3" sources."deepmerge-2.1.0" @@ -46199,7 +46359,7 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."detect-indent-4.0.0" - (sources."dispensary-0.16.0" // { + (sources."dispensary-0.18.0" // { dependencies = [ sources."ajv-5.5.2" ]; @@ -46211,17 +46371,17 @@ in sources."domhandler-2.4.2" sources."domutils-1.5.1" sources."dot-prop-4.2.0" - sources."dtrace-provider-0.8.6" + sources."dtrace-provider-0.8.7" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.1" sources."ecdsa-sig-formatter-1.0.10" - sources."email-validator-2.0.3" + sources."email-validator-2.0.4" sources."emoji-regex-6.1.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" sources."entities-1.1.1" sources."error-ex-1.3.1" - sources."es5-ext-0.10.42" + sources."es5-ext-0.10.45" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" @@ -46237,7 +46397,7 @@ in sources."escape-string-regexp-1.0.5" sources."escodegen-1.9.1" sources."escope-3.6.0" - (sources."eslint-4.19.0" // { + (sources."eslint-4.19.1" // { dependencies = [ sources."ajv-5.5.2" sources."esprima-4.0.0" @@ -46292,7 +46452,7 @@ in ]; }) sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-parse-1.0.3" sources."fast-json-patch-1.2.2" sources."fast-json-stable-stringify-2.0.0" @@ -46311,8 +46471,8 @@ in }) sources."first-chunk-stream-2.0.0" sources."flat-cache-1.3.0" - sources."flatstr-1.0.5" - sources."fluent-syntax-0.6.6" + sources."flatstr-1.0.8" + sources."fluent-syntax-0.7.0" sources."for-in-1.0.2" sources."for-own-1.0.0" sources."forever-agent-0.6.1" @@ -46329,11 +46489,10 @@ in }) sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - (sources."fx-runner-1.0.8" // { + (sources."fx-runner-1.0.9" // { dependencies = [ sources."commander-2.9.0" sources."isexe-1.1.2" - sources."lodash-3.10.1" sources."which-1.2.4" ]; }) @@ -46370,7 +46529,7 @@ in sources."growly-1.3.0" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."has-1.0.1" + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-color-0.1.7" sources."has-flag-3.0.0" @@ -46439,16 +46598,14 @@ in sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" - sources."isemail-1.2.0" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" sources."jed-1.1.1" sources."jetpack-id-1.0.0" - sources."joi-6.10.1" sources."js-select-0.6.0" sources."js-tokens-3.0.2" - sources."js-yaml-3.11.0" + sources."js-yaml-3.12.0" sources."jsbn-0.1.1" sources."jsesc-1.3.0" sources."json-merge-patch-0.2.3" @@ -46462,7 +46619,7 @@ in sources."jsonfile-4.0.0" sources."jsonify-0.0.0" sources."jsonpointer-4.0.1" - sources."jsonwebtoken-7.1.9" + sources."jsonwebtoken-8.2.1" sources."jsprim-1.4.1" sources."jszip-2.6.1" sources."jwa-1.1.6" @@ -46481,6 +46638,12 @@ in sources."lodash.clonedeep-4.5.0" sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" + sources."lodash.includes-4.3.0" + sources."lodash.isboolean-3.0.3" + sources."lodash.isinteger-4.0.4" + sources."lodash.isnumber-3.0.3" + sources."lodash.isplainobject-4.0.6" + sources."lodash.isstring-4.0.1" sources."lodash.once-4.1.1" sources."lodash.set-4.3.2" sources."lodash.sortby-4.7.0" @@ -46512,7 +46675,7 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.22.1" + sources."moment-2.22.2" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."mv-2.1.1" @@ -46546,7 +46709,6 @@ in sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-0.0.5" sources."opn-5.3.0" sources."optionator-0.8.2" sources."os-homedir-1.0.2" @@ -46555,7 +46717,7 @@ in sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" - sources."p-limit-1.2.0" + sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" sources."pac-proxy-agent-2.0.2" @@ -46579,8 +46741,8 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pino-4.14.0" - sources."pino-std-serializers-1.2.0" + sources."pino-4.16.1" + sources."pino-std-serializers-2.1.0" sources."pluralize-7.0.0" (sources."po2json-0.4.5" // { dependencies = [ @@ -46607,11 +46769,11 @@ in sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."punycode-1.4.1" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."quick-format-unescaped-1.1.2" sources."raw-body-2.3.3" - sources."rc-1.2.7" + sources."rc-1.2.8" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" @@ -46654,7 +46816,7 @@ in sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.2" - sources."safe-json-stringify-1.1.0" + sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -46676,29 +46838,15 @@ in sources."shell-quote-1.6.1" sources."shelljs-0.8.1" sources."shellwords-0.1.1" - (sources."sign-addon-0.3.0" // { + (sources."sign-addon-0.3.1" // { dependencies = [ - sources."assert-plus-0.2.0" - sources."aws-sign2-0.6.0" sources."babel-polyfill-6.16.0" - sources."boom-2.10.1" - sources."caseless-0.11.0" - sources."chalk-1.1.3" - sources."cryptiles-2.0.5" sources."es6-error-4.0.0" - sources."form-data-2.1.4" - sources."har-validator-2.0.6" - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" - sources."ms-0.7.3" + sources."ms-2.1.1" sources."mz-2.5.0" - sources."qs-6.3.2" sources."regenerator-runtime-0.9.6" - sources."request-2.79.0" - sources."sntp-1.0.9" + sources."request-2.87.0" sources."source-map-support-0.4.6" - sources."tunnel-agent-0.4.3" ]; }) sources."signal-exit-3.0.2" @@ -46719,7 +46867,7 @@ in sources."snapdragon-node-2.1.1" sources."snapdragon-util-3.0.1" sources."sntp-2.1.0" - (sources."snyk-1.80.1" // { + (sources."snyk-1.82.1" // { dependencies = [ sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -46746,14 +46894,14 @@ in sources."string-width-1.0.2" ]; }) - sources."snyk-go-plugin-1.5.0" + sources."snyk-go-plugin-1.5.1" sources."snyk-gradle-plugin-1.3.0" sources."snyk-module-1.8.2" sources."snyk-mvn-plugin-1.2.0" sources."snyk-nuget-plugin-1.6.2" sources."snyk-php-plugin-1.5.1" sources."snyk-policy-1.12.0" - sources."snyk-python-plugin-1.6.0" + sources."snyk-python-plugin-1.6.1" sources."snyk-resolve-1.0.1" sources."snyk-resolve-deps-3.1.0" (sources."snyk-sbt-plugin-1.3.0" // { @@ -46787,7 +46935,7 @@ in }) sources."split2-2.2.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."static-extend-0.1.2" sources."statuses-1.5.0" sources."stream-parser-0.3.1" @@ -46831,7 +46979,6 @@ in sources."to-regex-range-2.1.1" sources."to-utf8-0.0.1" sources."toml-2.3.3" - sources."topo-1.1.0" sources."tosource-1.0.0" sources."tough-cookie-2.3.4" sources."tr46-1.0.1" @@ -46873,9 +47020,10 @@ in ]; }) sources."unzip-response-2.0.1" - sources."upath-1.0.4" + sources."upath-1.0.5" sources."update-notifier-2.3.0" sources."update-section-0.3.3" + sources."uri-js-4.2.2" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" (sources."use-3.1.0" // { @@ -46884,7 +47032,7 @@ in ]; }) sources."user-home-2.0.0" - sources."util-0.10.3" + sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."uuid-3.2.1" sources."validate-npm-package-license-3.0.3" @@ -46918,9 +47066,13 @@ in }) sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - sources."whatwg-url-6.3.0" + (sources."whatwg-url-6.4.1" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) sources."when-3.7.7" - sources."which-1.3.0" + sources."which-1.3.1" sources."which-module-2.0.0" sources."widest-line-2.0.0" sources."win-release-1.1.1" @@ -46993,10 +47145,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.6.0.tgz"; - sha1 = "9cec6f7986dc237d39ec705ce74d95155fe55d4b"; + url = "https://registry.npmjs.org/yarn/-/yarn-1.7.0.tgz"; + sha1 = "0076b9fde6010e01950526a609bc53bc175ef925"; }; buildInputs = globalBuildInputs; meta = { @@ -47017,7 +47169,7 @@ in }; dependencies = [ sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.0.2" + sources."@nodelib/fs.stat-1.1.0" sources."@sindresorhus/is-0.7.0" sources."aggregate-error-1.0.0" sources."ajv-5.5.2" @@ -47026,7 +47178,7 @@ in sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."are-we-there-yet-1.1.4" + sources."are-we-there-yet-1.1.5" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -47038,7 +47190,7 @@ in sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-2.6.0" + sources."async-2.6.1" sources."asynckit-0.4.0" sources."atob-2.1.1" sources."aws-sign2-0.7.0" @@ -47061,7 +47213,6 @@ in sources."semver-4.3.6" ]; }) - sources."boom-4.3.1" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -47071,7 +47222,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."builtin-modules-1.1.1" sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { @@ -47116,11 +47267,6 @@ in sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."cross-spawn-async-2.2.5" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" sources."dashdash-1.14.1" @@ -47128,7 +47274,7 @@ in sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."default-uid-1.0.0" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" @@ -47239,8 +47385,6 @@ in sources."has-unicode-2.0.1" sources."has-value-1.0.0" sources."has-values-1.0.0" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."hosted-git-info-2.6.0" sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" @@ -47415,7 +47559,7 @@ in sources."p-cancelable-0.4.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-1.2.0" + sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-some-2.0.1" sources."p-timeout-2.0.1" @@ -47450,10 +47594,11 @@ in sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" + sources."psl-1.1.27" sources."punycode-1.4.1" sources."qs-6.5.2" sources."query-string-5.1.1" - sources."rc-1.2.7" + sources."rc-1.2.8" sources."read-pkg-1.1.0" (sources."read-pkg-up-2.0.0" // { dependencies = [ @@ -47476,7 +47621,11 @@ in sources."repeat-string-1.6.1" sources."repeating-2.0.1" sources."replace-ext-0.0.1" - sources."request-2.86.0" + (sources."request-2.87.0" // { + dependencies = [ + sources."tough-cookie-2.3.4" + ]; + }) sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -47486,7 +47635,7 @@ in sources."rx-4.1.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."rxjs-5.5.10" + sources."rxjs-5.5.11" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -47527,7 +47676,6 @@ in sources."kind-of-3.2.2" ]; }) - sources."sntp-2.1.0" sources."sort-keys-2.0.0" sources."sort-on-2.0.0" sources."source-map-0.5.7" @@ -47543,7 +47691,7 @@ in sources."extend-shallow-3.0.2" ]; }) - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."static-extend-0.1.2" sources."strict-uri-encode-1.1.0" sources."string-length-1.0.1" @@ -47584,7 +47732,7 @@ in sources."to-object-path-0.3.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."tough-cookie-2.3.4" + sources."tough-cookie-2.4.2" sources."trim-newlines-1.0.0" sources."tunnel-0.0.4" sources."tunnel-agent-0.6.0" @@ -47606,7 +47754,7 @@ in }) ]; }) - sources."untildify-3.0.2" + sources."untildify-3.0.3" sources."unzip-response-2.0.1" (sources."update-notifier-2.5.0" // { dependencies = [ @@ -47633,7 +47781,7 @@ in sources."vinyl-1.2.0" sources."vinyl-file-2.0.0" sources."walk-2.3.13" - sources."which-1.3.0" + sources."which-1.3.1" sources."widest-line-2.0.0" sources."win-release-1.1.1" (sources."wrap-ansi-2.1.0" // { @@ -47657,7 +47805,7 @@ in sources."onetime-1.1.0" ]; }) - (sources."yeoman-environment-2.1.1" // { + (sources."yeoman-environment-2.2.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 40eabbd6e662..a3b8689a2ac6 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -49,13 +49,13 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; - "@types/node-10.1.1" = { + "@types/node-10.3.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.1.1"; + version = "10.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.1.1.tgz"; - sha512 = "35nbbgd4qp35g3nfbrsc9ndmigc9gl31xdjhx0fakfms35c6jqxpdx7m9c3pi0h3b062p31al5vas36facjhs1nmxf3bdpnrb5k3g4z"; + url = "https://registry.npmjs.org/@types/node/-/node-10.3.1.tgz"; + sha512 = "0xqz0wlddb3vi0mmlncn1ypd7sa2zv3fcq58jk7nr0xdsrwwzn9ncdq784lvg8d2k7lzq1p2kjyak5nghq0imbdj8hrmk6365lgvi92"; }; }; "@types/superagent-3.5.6" = { @@ -256,13 +256,13 @@ let sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a"; }; }; - "append-tree-2.4.1" = { + "append-tree-2.4.4" = { name = "append-tree"; packageName = "append-tree"; - version = "2.4.1"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.1.tgz"; - sha512 = "2zb14nlfxs726ng8jhfpf6n9b9kw32smg2krcl0vj90dfrkcc20fm36j2zgdd49b2ln1z4jz2wvvy4qgss14zzfr3rps719h6vlyjg7"; + url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.4.tgz"; + sha512 = "0gfvfdnxy8zznb198pbzshiqg8vnn2icjbc49dmy158qqb33w2ifh86migd8xighgbjl66lhqlb9cvqv2ghviri1k7kh9kw8hr19wxc"; }; }; "aproba-1.2.0" = { @@ -274,13 +274,13 @@ let sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; }; }; - "are-we-there-yet-1.1.4" = { + "are-we-there-yet-1.1.5" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz"; - sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6"; }; }; "argparse-1.0.10" = { @@ -454,13 +454,13 @@ let sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; }; }; - "async-2.6.0" = { + "async-2.6.1" = { name = "async"; packageName = "async"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz"; - sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4"; + url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz"; + sha512 = "2aqgkis9ac37q6jv6zspfpj3rikh2vr9fdch7wajrvqihq5sxyd1gh5zv65hy0y3r22l720qkidwh6img8dngqcjj0dwrl0dwpj5lbw"; }; }; "async-each-1.0.1" = { @@ -661,24 +661,6 @@ let sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; }; }; - "boom-4.3.1" = { - name = "boom"; - packageName = "boom"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; - sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; - }; - }; - "boom-5.2.0" = { - name = "boom"; - packageName = "boom"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; - sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; - }; - }; "boxen-1.3.0" = { name = "boxen"; packageName = "boxen"; @@ -733,31 +715,22 @@ let sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb"; }; }; - "buffer-alloc-1.1.0" = { + "buffer-alloc-1.2.0" = { name = "buffer-alloc"; packageName = "buffer-alloc"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz"; - sha1 = "05514d33bf1656d3540c684f65b1202e90eca303"; - }; - }; - "buffer-alloc-unsafe-0.1.1" = { - name = "buffer-alloc-unsafe"; - packageName = "buffer-alloc-unsafe"; - version = "0.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz"; - sha1 = "ffe1f67551dd055737de253337bfe853dfab1a6a"; + url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; + sha512 = "2isng7g5ld0a4ih1d38bcdqpw8jpqajmcn6vfkrqpahmhim4cfw51c1sikz5s5hnmfychcbzcxvwydn8qi6zq6mhl15anzd1110fnq8"; }; }; - "buffer-alloc-unsafe-1.0.0" = { + "buffer-alloc-unsafe-1.1.0" = { name = "buffer-alloc-unsafe"; packageName = "buffer-alloc-unsafe"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; - sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; + sha512 = "01b27ck9qpkjb3s14q703k5vi00m7lpl0zkyi91z4kxjww4b6q09frq68lm6m9hvhb5m4w0arwybncm5hia3j9kr9vd4h84qa43chsc"; }; }; "buffer-crc32-0.2.13" = { @@ -778,22 +751,22 @@ let sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; }; }; - "buffer-fill-0.1.1" = { + "buffer-fill-1.0.0" = { name = "buffer-fill"; packageName = "buffer-fill"; - version = "0.1.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.1.tgz"; - sha512 = "3nny0zbpnaxp1544gp7lc53jvs1jgzpmp92cy939dik36bi8lvhrsh4g082lxdplwsma22cgg9q93dw5dnbn1ljqkh4fb2i6w3lq032"; + url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz"; + sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c"; }; }; - "buffer-from-1.0.0" = { + "buffer-from-1.1.0" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz"; - sha512 = "3252laq8prm41lgzlhmc7rdj99gwcvpf7cn6j686g4qmspnl3haid5khv9pc9cfjja9wb64nwfvgdwi2kpdf125xfg48aqapwssjxpk"; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz"; + sha512 = "0ch7mwp2p7iz81hlj769cki9vapg34rp3368mbxffjync131zz3cig7vkjv4n1lfyfnaapj9axq5d6sg92a8ri6fnvggz481fb936bk"; }; }; "buffer-indexof-1.1.1" = { @@ -958,6 +931,15 @@ let sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; }; }; + "chardet-0.5.0" = { + name = "chardet"; + packageName = "chardet"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz"; + sha512 = "3931r17a9qqilrj8ymqwiqrayvwaz6d7hvhscrh8s4a7cksmw0saq1bg2xk7r20mcnzbcpn4c05bii36axilkfrpj2j0gcy2shdm57m"; + }; + }; "charenc-0.0.2" = { name = "charenc"; packageName = "charenc"; @@ -1228,13 +1210,13 @@ let sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; }; - "colors-1.2.5" = { + "colors-1.3.0" = { name = "colors"; packageName = "colors"; - version = "1.2.5"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz"; - sha512 = "2k2a7k096qcm5fghgcmybg96y3x5bpqb62j0zdlnxq7za4asb6vsy9i69nkg9wqfhkcbh6qzm8zzvq7q516p54awxpp2qrzm8nm3cvs"; + url = "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz"; + sha512 = "03rrn3n1k9lcwlg5xdx0cj727blwc1a0r6rnq1r8nynwni4bwqlbzlb9qp02x09pfnrfj0ihb28wsimqxiivm5k0f2wa77hmvfmffhh"; }; }; "combine-errors-3.0.3" = { @@ -1264,15 +1246,6 @@ let sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; }; }; - "commander-2.11.0" = { - name = "commander"; - packageName = "commander"; - version = "2.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; - sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; - }; - }; "commander-2.15.1" = { name = "commander"; packageName = "commander"; @@ -1417,13 +1390,13 @@ let sha1 = "0abf356ad00d1c5a219d88d44518046dd026acfe"; }; }; - "cookiejar-2.1.1" = { + "cookiejar-2.1.2" = { name = "cookiejar"; packageName = "cookiejar"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; - sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz"; + sha512 = "302w4kd3x9k0jy5iva1k5inp3r25avz8ddpkdb20icvrizicvas253kfp6ynmrcwpxv1lafcnagggxfs5dmmd4gg07ifgzkqxsrl3rk"; }; }; "copy-descriptor-0.1.1" = { @@ -1480,15 +1453,6 @@ let sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; }; }; - "cryptiles-3.1.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; - sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; - }; - }; "crypto-random-string-1.0.0" = { name = "crypto-random-string"; packageName = "crypto-random-string"; @@ -1633,13 +1597,13 @@ let sha1 = "69449ac8a368593a8f71902b282390c3655ab4b8"; }; }; - "dat-node-3.5.8" = { + "dat-node-3.5.9" = { name = "dat-node"; packageName = "dat-node"; - version = "3.5.8"; + version = "3.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.8.tgz"; - sha512 = "3j28p80dwmic3g00asmcpgiv3sh3s8023x1023g7bm534h1ai8i2zryivx95gc22is64k9mynmqr2g0ny25xp1f7h1cbc25klizg8dc"; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.9.tgz"; + sha512 = "104lk78v9z8z1p5dkkn5w6ciimn7gbh83yvfcpl6vcd6fahdghak9kp95wmmfjlbas1959a156552i8a891qjbfa32q1wcanyv4yri4"; }; }; "dat-registry-4.0.0" = { @@ -1777,13 +1741,13 @@ let sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d"; }; }; - "deep-extend-0.5.1" = { + "deep-extend-0.6.0" = { name = "deep-extend"; packageName = "deep-extend"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz"; - sha512 = "3bzqm7nqgh7m8xjhl0q8jc0ccm9riymsfmy0144x6n2qy9v1gin2ww8s9wjlayk0xyzq9cz9pyar02yiv30mhqsj7rmw35ywrsc3jrp"; + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c"; }; }; "define-property-0.2.5" = { @@ -1921,6 +1885,15 @@ let sha1 = "5d3160a46019e50e874195765df7d601ee55a813"; }; }; + "discovery-swarm-5.1.1" = { + name = "discovery-swarm"; + packageName = "discovery-swarm"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.1.tgz"; + sha512 = "1sa0sciklf04fnha64gb01s3wqddxkzf9n1q0zyjcr3cdhn49xyql60cbxby922bqq0wd7k57b6qjk50vn4hjsk08pggzcggbvkszxg"; + }; + }; "dns-discovery-5.6.1" = { name = "dns-discovery"; packageName = "dns-discovery"; @@ -2101,13 +2074,13 @@ let sha512 = "3cjrpi6n5i6gf8jaiwg31y2xkgx59szhhcj9myqwmdw16s9r6yvwznxd2lhqf96mpm6knyb3w2bcnksg5nzkrq6iada0k6nvdj2pjfl"; }; }; - "es5-ext-0.10.42" = { + "es5-ext-0.10.45" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.42"; + version = "0.10.45"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz"; - sha512 = "1412ssfrx1kvraz8kp4x9lc1jzcdh2952vbmlimrfalmbjv44rh504ihb4fg5mjwx8ix1f1wii0a0qngwrfk4gl271mcywgp7b4x700"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz"; + sha512 = "04p6qjhmiaqlqqgi0690lz7zzcdg1n80pxiywkkk6qalpxd8b85kv4403ckchsv8jlx9rhz4chgh819ahzcgwanibnnqzkibklwqiqn"; }; }; "es6-iterator-2.0.3" = { @@ -2299,6 +2272,15 @@ let sha512 = "3sf897ajmkcp0j6rgd0jy6k95s9ck3j305yrr00kmckl8qdhswhbdd5g4m2fai03x8phs1vw2ahf9v7ym5ji4zfxydxyamiy61glabd"; }; }; + "external-editor-3.0.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.0.tgz"; + sha512 = "28h4s6rjdakrr2danff6n7mwwf1n2syyba9q93ac1wpic535lk0xvwh4bpnzhmw3gkjblvbvfsd4zp57hwy7d70hk41lxs4867iz6cs"; + }; + }; "extglob-0.3.2" = { name = "extglob"; packageName = "extglob"; @@ -2362,13 +2344,13 @@ let sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1"; }; }; - "fd-slicer-1.0.1" = { + "fd-slicer-1.1.0" = { name = "fd-slicer"; packageName = "fd-slicer"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; + url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; }; }; "figures-1.7.0" = { @@ -2488,13 +2470,13 @@ let sha1 = "fca30cddb9006fb656eb5ebc79aeb274e7fde9ed"; }; }; - "for-each-0.3.2" = { + "for-each-0.3.3" = { name = "for-each"; packageName = "for-each"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz"; - sha1 = "2c40450b9348e97f281322593ba96704b9abd4d4"; + url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"; + sha512 = "2dikmdxwassw4w48vv82swjv4v1zx2sivsgcnxi3zi0imzw165ba8vaxgawz0wz4fgf138hvvc3xc5znr2wmz07r74dp8z6kqp1z9lf"; }; }; "for-in-1.0.2" = { @@ -2839,13 +2821,13 @@ let sha1 = "3042d9adec2a1ded6a7707a9ed2380f8a17a430e"; }; }; - "growl-1.10.3" = { + "growl-1.10.5" = { name = "growl"; packageName = "growl"; - version = "1.10.3"; + version = "1.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz"; - sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; + url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz"; + sha512 = "146i7if4fjml1p6xw1ybb7vm22k6i8yc7r8wcw8yia7qy385w1s6j18ip91g5mv47zvv5fw5m8kpzlaayjs183fkpg174hbw4xgh6m8"; }; }; "growl-1.9.2" = { @@ -2902,15 +2884,6 @@ let sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; }; - "has-flag-2.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; - sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; - }; - }; "has-flag-3.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -2992,15 +2965,6 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "hawk-6.0.2" = { - name = "hawk"; - packageName = "hawk"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; - sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; - }; - }; "he-1.1.1" = { name = "he"; packageName = "he"; @@ -3010,15 +2974,6 @@ let sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; }; }; - "hoek-4.2.1" = { - name = "hoek"; - packageName = "hoek"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz"; - sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; - }; - }; "http-errors-1.6.3" = { name = "http-errors"; packageName = "http-errors"; @@ -3046,13 +3001,13 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "hypercore-6.14.0" = { + "hypercore-6.15.0" = { name = "hypercore"; packageName = "hypercore"; - version = "6.14.0"; + version = "6.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.14.0.tgz"; - sha512 = "3liw77yhvn3nlrczf9s30vvn4bxrn3glh65a2psy1va9pvcnjwx6wfh52v5l9qbd7zyp4q4nb7qrq0n3am7jwmz3dkb5fzvdnlwikkh"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.15.0.tgz"; + sha512 = "2qd2nd34xmr8fvagbifn72ffcr6hw9byas8rccy1wx252kj2qza8yy9g0ck9nf7np794267ry4jih7j1ryrjrbs8r8q2hbvgcyv5w0z"; }; }; "hypercore-protocol-6.6.4" = { @@ -3064,13 +3019,13 @@ let sha512 = "0rxj8d4lp45q7v3wwwv23m7qi84vw3wvyafqiy9x5f9lqkynq8v8yajpq9bcnc935927qjnxajn8n0cyhg0fqjnpywlfyxgxczkndgm"; }; }; - "hyperdrive-9.12.3" = { + "hyperdrive-9.13.0" = { name = "hyperdrive"; packageName = "hyperdrive"; - version = "9.12.3"; + version = "9.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.3.tgz"; - sha512 = "3w0ia766bacphqzgyjhiwbppgdja61vlz2xp6x710dk4pn6570gag3w5xa8rfivh2lvig8v2ics3bkdlm9cmq9kpzjgwzm19a089fb3"; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.13.0.tgz"; + sha512 = "1ncs5n26spkycvrfi5j0dy62bw3d9l0cmpaagc54nb6rfh33zyh228b3n99yajvzhyym0d6g0hphpwjyz8s7pngv13ql8f41x05zq40"; }; }; "hyperdrive-http-4.2.2" = { @@ -3208,6 +3163,15 @@ let sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47"; }; }; + "inquirer-6.0.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.0.0.tgz"; + sha512 = "0k09hsg3dfdz7vp482v56hvhqa9g4qbm8jpmig9p0phdzsaspajxk9d4z575dd8rc70pmipg7pxxpgdqwa3x1z4rwmhhw1d3icr115l"; + }; + }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -3262,6 +3226,15 @@ let sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; }; }; + "is-callable-1.1.3" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; + sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; + }; + }; "is-ci-1.1.0" = { name = "is-ci"; packageName = "is-ci"; @@ -3505,6 +3478,15 @@ let sha512 = "34m1wg28c9l1v9bqz2klwl4ybhyqkhk80d95664jmcbq1jjpg471nv96mqgqy4838xpa8wm7mbpynmq4294pq6iw163s0ar1b3a4f1r"; }; }; + "is-options-1.0.1" = { + name = "is-options"; + packageName = "is-options"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-options/-/is-options-1.0.1.tgz"; + sha512 = "339gkkcm39mcw2c8wwl37y02rq3ga7309fgrvp2garlavgh93aydxpfx8wg9j9xs6k9h3ha11c4z9bkcqihd7w5d8fb03ik1nqgqy6r"; + }; + }; "is-path-inside-1.0.1" = { name = "is-path-inside"; packageName = "is-path-inside"; @@ -3703,13 +3685,13 @@ let sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c"; }; }; - "js-yaml-3.11.0" = { + "js-yaml-3.12.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz"; - sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; + sha512 = "3f8k2gvi3gnj9gpr3dnm5n5vpy2w68pshqk4hajlsmkb37ky30cnqza82l8sq153zx1nk67gizcm1ngmvlajw53hkwg4g96gir7d2rw"; }; }; "jsbn-0.1.1" = { @@ -4558,13 +4540,13 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "minipass-2.3.0" = { + "minipass-2.3.3" = { name = "minipass"; packageName = "minipass"; - version = "2.3.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz"; - sha512 = "1p0pbj1iwnzb7kkqbh5h0vd6byh1l6na1yx69qmbb0wbmwm0qc5g4hn4z6lr8wkzb4kybvd1hjm4hxd93nrdr8ydbqqd9wd1w9bcq4d"; + url = "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz"; + sha512 = "1ii40xdjvsqw9k2pyavlv1h4wh5pc3fz4kn91gxpy404kilgp6p9q7q6zba7wa9i7xh9iijnz2pmr8h0wc4yh14lwkqhps4zgvjfc7y"; }; }; "minizlib-1.1.0" = { @@ -4576,13 +4558,13 @@ let sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; }; }; - "mirror-folder-2.2.0" = { + "mirror-folder-3.0.0" = { name = "mirror-folder"; packageName = "mirror-folder"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.2.0.tgz"; - sha512 = "3js8pwgmj4lzzi6nzl0wp021rhsnz31jpkkzdf35xzwm1l65m6ygjf4hz77vvy3dk2h5jb2d32nvzy26n3d5hswg3nb8s0rylvv510r"; + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.0.tgz"; + sha512 = "3vdfga0d1l6kpkk3bvkzw6jx6x6n4dn1z1q6rxgnsj0wqhs68v0fgdik67f3r9vll25kdmvwhn67v6p5xqiwkxncc55m90jfw6v07ky"; }; }; "mixin-deep-1.3.1" = { @@ -4702,13 +4684,13 @@ let sha1 = "9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"; }; }; - "multistream-2.1.0" = { + "multistream-2.1.1" = { name = "multistream"; packageName = "multistream"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/multistream/-/multistream-2.1.0.tgz"; - sha1 = "625c267d5c44424ad6294788b5bb4da3dcb32f1d"; + url = "https://registry.npmjs.org/multistream/-/multistream-2.1.1.tgz"; + sha512 = "0ssriqcskcwvja0aw04frfy7fymv2nwl0dqh3fp03d2cd78yf45r6jlvv1pn87w1b2yzp7iy8mznj7cybxr9dscfkspmsk5m3pjzay5"; }; }; "mute-stream-0.0.5" = { @@ -4855,13 +4837,13 @@ let sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8"; }; }; - "nodemon-1.17.4" = { + "nodemon-1.17.5" = { name = "nodemon"; packageName = "nodemon"; - version = "1.17.4"; + version = "1.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.4.tgz"; - sha512 = "3bmxd7fd494gy4ddax3mihjz1iy484iakyssbhy87cc2kwbky9xkb8l47vphc3n858q9p9afxl57w0849i24amsdjhwbqh8vxhjy1v5"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.5.tgz"; + sha512 = "2djkgpk29zh4p7wqb8h4g6w0y2fix94zqpgi40fshn9yaf6anp5p0vbqj8r3s6zxsxhgvnv7lzj56v6s6gk0q2byqd9yqrmjmcacv8l"; }; }; "nopt-1.0.10" = { @@ -5476,13 +5458,13 @@ let sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; - "punycode-2.1.0" = { + "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz"; - sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d"; + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx"; }; }; "qs-2.3.3" = { @@ -5548,6 +5530,15 @@ let sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; }; }; + "random-access-memory-3.0.0" = { + name = "random-access-memory"; + packageName = "random-access-memory"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.0.0.tgz"; + sha512 = "160skc30mby806rmlwilb56h0r5bcc3sf2dr980k4a93c3bhnlnjcfiqbx1k5sjljqiygs6sn014gpgilzhhx9c1vdcyfhkz45pkxrv"; + }; + }; "random-access-storage-1.2.0" = { name = "random-access-storage"; packageName = "random-access-storage"; @@ -5593,13 +5584,13 @@ let sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca"; }; }; - "rc-1.2.7" = { + "rc-1.2.8" = { name = "rc"; packageName = "rc"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz"; - sha512 = "30b4pqzhk8f4ppzyk5diwxac7xpf4hd3rysyin012l59da9v5iaai4wd6yzlz3rjspfvvy191q6qcsw47mwlw9y07n35kzq23rw7lid"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb"; }; }; "read-1.0.7" = { @@ -5755,13 +5746,13 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "request-2.86.0" = { + "request-2.87.0" = { name = "request"; packageName = "request"; - version = "2.86.0"; + version = "2.87.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.86.0.tgz"; - sha512 = "37xa5i4dk3fkcl9gxrzxkjjy6vcqn6bcc61bwq6kjpqrg5i01yc6xn0iq3zy68vqqav93k1kgr2xdabp22p0bfynfcbzxp8ms3n41h5"; + url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; + sha512 = "0vnsbflzj7gxa33r47bzsiaf7jc00b9iqkqdz8l7n9x5dgdgbq1qpcqqslds1arazipz8pjr4m5rf4ikg4d59d49gn9dky0ds921jkx"; }; }; "resolve-1.1.7" = { @@ -5890,6 +5881,15 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; + "rxjs-6.2.0" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.0.tgz"; + sha512 = "01sy4p9dqb8xiv59c5dn2lwza4jm6dv1hsy9v4ifj60kwh1l8iqar17lvgxmhjpqjaqgqkrx6kx0kv7l121704v16if4y5sxgkdy758"; + }; + }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -6097,13 +6097,13 @@ let sha512 = "2l45afqnby96gdihg3hi51006502yc33wly8cgmgrww00aiq37jdvp22l9qhbxljra5j6s8lwigjh5hpzj521ccgwlhk59zw9vhylx4"; }; }; - "siphash24-1.1.0" = { + "siphash24-1.1.1" = { name = "siphash24"; packageName = "siphash24"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.0.tgz"; - sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w"; + url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.1.tgz"; + sha512 = "1ach37ibirvd6yxa42ffkn1dwfcar70pjbnj9alrf713n1bdzb4y44nbrm5bi3swpvqrr7f8sbbcyj586wn049hxmyawf8kia6b18kl"; }; }; "slash-1.0.0" = { @@ -6178,15 +6178,6 @@ let sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; }; }; - "sntp-2.1.0" = { - name = "sntp"; - packageName = "sntp"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; - sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; - }; - }; "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; @@ -6214,13 +6205,13 @@ let sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj"; }; }; - "sorted-array-functions-1.1.0" = { + "sorted-array-functions-1.2.0" = { name = "sorted-array-functions"; packageName = "sorted-array-functions"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.1.0.tgz"; - sha512 = "209rl01n6lwbsxl40lmh1v38sad3d94s0mjb4mz6r3wwwhzcahibr8m2fhlqgsjgzf3dja9wyhz7qjkw39gxlwpapyid2whs4nrzbnf"; + url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.2.0.tgz"; + sha512 = "1759vgxawg63w16nnrklz5azzj9kklrlz5sdd643y8jp8qz7hiwdn5ydlnwx2ns4j761x4rqllh6fvlzjqgi3dixy7dl9hr28z66smi"; }; }; "sorted-immutable-list-1.1.0" = { @@ -6331,13 +6322,13 @@ let sha1 = "04e6926f662895354f3dd015203633b857297e2c"; }; }; - "sshpk-1.14.1" = { + "sshpk-1.14.2" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; - sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; + sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; }; }; "stack-trace-0.0.10" = { @@ -6601,15 +6592,6 @@ let sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; }; }; - "supports-color-4.4.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; - sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; - }; - }; "supports-color-5.4.0" = { name = "supports-color"; packageName = "supports-color"; @@ -6682,13 +6664,13 @@ let sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; }; }; - "tar-4.4.2" = { + "tar-4.4.4" = { name = "tar"; packageName = "tar"; - version = "4.4.2"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz"; - sha512 = "25ypdsz6l4xmg1f89pjy8s773j3lzx855iiakbdknz115vxyg4p4z1j0i84iyjpzwgfjfs2l2njpd0y2hlr5sh4n01nh6124zs09y85"; + url = "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz"; + sha512 = "3iy3r78nycp0ly9nldcygkklrc7jas93k4bis6ypiw5fqlsygqyylgwl1378qf61r1yh2lsd11vrjr8hwfzw4j25d95yd0zhv265bws"; }; }; "tar-stream-1.6.1" = { @@ -6925,6 +6907,15 @@ let sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; }; }; + "tslib-1.9.2" = { + name = "tslib"; + packageName = "tslib"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.9.2.tgz"; + sha512 = "0ms6i864mv97lfwlmnzpbf6f539kqcsnj8qbyj12h46r0zszxpk8gsfchs5s7spfwpnapfmbaakx8xiqg0v4rxqmz22nnkpi5ggjlq1"; + }; + }; "ttl-1.3.1" = { name = "ttl"; packageName = "ttl"; @@ -7096,13 +7087,13 @@ let sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; }; }; - "untildify-3.0.2" = { + "untildify-3.0.3" = { name = "untildify"; packageName = "untildify"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz"; - sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; + url = "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz"; + sha512 = "0l4awya87dx6bnxaywh0dn50ka8hybj603k75d98vlwj9grqfcmaib9hhjy52nsgm62f39v0nnv4yn268jpjy7n9y7wpbwzqwkkyac9"; }; }; "unyield-0.0.1" = { @@ -7267,13 +7258,13 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; - "validator-10.2.0" = { + "validator-10.3.0" = { name = "validator"; packageName = "validator"; - version = "10.2.0"; + version = "10.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-10.2.0.tgz"; - sha512 = "2v8ipjc5jdlwdhj1bcggxm98q2cigj2016rjqyzj0wq4kvjqghi3k66d6j17bpvqix0dqy01s4sh4qg0wv56jshix9zcdddfn9fwgw3"; + url = "https://registry.npmjs.org/validator/-/validator-10.3.0.tgz"; + sha512 = "1vr7ds3qf30h7cfk87q2h9jdfh4v3hk0yl1rcs668z2xm0xf8kj1i0l1qs46ws12birk1xlmqpmb3xd4pzrbn78fair94hxjxqdszkf"; }; }; "variable-diff-1.1.0" = { @@ -7330,22 +7321,22 @@ let sha1 = "d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"; }; }; - "which-1.3.0" = { + "which-1.3.1" = { name = "which"; packageName = "which"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.0.tgz"; - sha512 = "358cfi3qak701qp5pwkq47n87ca4m8k4lvjl0pdybvmp92nwwd7azzhahy9gy3kg8lqrqdry9l6pl2csflzr0nvwnc3p6asjyi6khn5"; + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz"; }; }; - "wide-align-1.1.2" = { + "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz"; - sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0"; }; }; "widest-line-2.0.0" = { @@ -7447,13 +7438,13 @@ let sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; }; }; - "xhr-2.4.1" = { + "xhr-2.5.0" = { name = "xhr"; packageName = "xhr"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/xhr/-/xhr-2.4.1.tgz"; - sha512 = "38f6fgl0n5syagym161b29l5vhyan3azv5zs3vmyd4s80svy9xl7ppczk3rdawjn70s1ws5qvbh5zf1wyrj2ifawnr7ix3by3k180m4"; + url = "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz"; + sha512 = "36z7hw07wb42na5hy12xmsrg9yzd3hd5ln8y3wyq88qh4xvxr2lp07bbp5la5254mf8qaimgg1plwzvvvsmvj0mcma17p1dbvzlwyg2"; }; }; "xsalsa20-1.0.2" = { @@ -7465,13 +7456,13 @@ let sha512 = "35rg34yxk4ag0qclk7bqxirgr3dgypcvkisqqj2g3y0ma16pkfy81iv79pcwff5p4spygwjh2m9v37llq7367fypqrx89s9kscwal43"; }; }; - "xstream-11.2.0" = { + "xstream-11.4.0" = { name = "xstream"; packageName = "xstream"; - version = "11.2.0"; + version = "11.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/xstream/-/xstream-11.2.0.tgz"; - sha512 = "2jnrf16561zx9hsvlb8d48ca9qwdh9wxcbkwhkjvp5r88b8pcfjlx2g58k9w5kjs0kw660rw6hj2zhvdsznyf0ic9mj682xz6hf7kfh"; + url = "https://registry.npmjs.org/xstream/-/xstream-11.4.0.tgz"; + sha512 = "0a7xg54dwzg9ldfjgiq87zfd3mzcilal41spn2rsji91sbx15x10rbinsa0m60xsnrw725csmi6y47xzkkkiakgz46nz0b580iafd69"; }; }; "xtend-4.0.1" = { @@ -7519,13 +7510,13 @@ let sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; - "yauzl-2.9.1" = { + "yauzl-2.9.2" = { name = "yauzl"; packageName = "yauzl"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz"; - sha1 = "a81981ea70a57946133883f029c5821a89359a7f"; + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.2.tgz"; + sha1 = "4fb1bc7ae1fc2f57037b54af6acc8fe1031c5b77"; }; }; "z-schema-3.22.0" = { @@ -7592,7 +7583,7 @@ in sources."chalk-1.1.3" ]; }) - sources."@types/node-10.1.1" + sources."@types/node-10.3.1" sources."@types/superagent-3.5.6" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -7612,7 +7603,7 @@ in sources."combine-errors-3.0.3" sources."combined-stream-1.0.6" sources."component-emitter-1.2.1" - sources."cookiejar-2.1.1" + sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."cssauron-1.4.0" @@ -7621,7 +7612,7 @@ in sources."d-1.0.0" sources."debug-3.1.0" sources."delayed-stream-1.0.0" - sources."es5-ext-0.10.42" + sources."es5-ext-0.10.45" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-set-0.1.5" @@ -7697,8 +7688,8 @@ in sources."tmp-0.0.33" sources."util-deprecate-1.0.2" sources."variable-diff-1.1.0" - sources."which-1.3.0" - sources."xstream-11.2.0" + sources."which-1.3.1" + sources."xstream-11.4.0" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -7726,7 +7717,7 @@ in sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."ap-0.1.0" - sources."append-tree-2.4.1" + sources."append-tree-2.4.4" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-lru-1.1.1" @@ -7750,18 +7741,17 @@ in sources."blake2b-2.1.2" sources."blake2b-wasm-1.1.7" sources."body-0.1.0" - sources."boom-4.3.1" sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-6.0.2" ]; }) - sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equals-1.0.4" - sources."buffer-fill-0.1.1" - sources."buffer-from-1.0.0" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.0" sources."buffer-indexof-1.1.1" sources."bulk-write-stream-1.1.4" sources."bytes-3.0.0" @@ -7775,7 +7765,7 @@ in sources."codecs-1.2.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.2.5" + sources."colors-1.3.0" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -7783,11 +7773,6 @@ in sources."content-types-0.1.0" sources."core-util-is-1.0.2" sources."corsify-2.1.0" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."dat-dns-1.3.2" @@ -7819,12 +7804,17 @@ in sources."process-nextick-args-1.0.7" ]; }) - (sources."dat-node-3.5.8" // { + (sources."dat-node-3.5.9" // { dependencies = [ - sources."buffer-alloc-unsafe-0.1.1" + (sources."discovery-swarm-5.1.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."minimist-0.0.8" sources."process-nextick-args-1.0.7" sources."pump-1.0.3" + sources."random-access-memory-3.0.0" sources."unordered-set-2.0.0" sources."varint-5.0.0" ]; @@ -7873,7 +7863,7 @@ in sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."flat-tree-1.6.0" - sources."for-each-0.3.2" + sources."for-each-0.3.3" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" @@ -7888,17 +7878,15 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-flag-3.0.0" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.14.0" // { + (sources."hypercore-6.15.0" // { dependencies = [ sources."varint-5.0.0" ]; }) sources."hypercore-protocol-6.6.4" - (sources."hyperdrive-9.12.3" // { + (sources."hyperdrive-9.13.0" // { dependencies = [ sources."varint-4.0.1" ]; @@ -7911,6 +7899,7 @@ in sources."ini-1.3.5" sources."ip-1.1.5" sources."is-buffer-1.1.6" + sources."is-callable-1.1.3" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" @@ -7919,6 +7908,7 @@ in sources."is-function-1.0.1" sources."is-glob-2.0.1" sources."is-number-2.1.0" + sources."is-options-1.0.1" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" sources."is-string-1.0.4" @@ -7956,13 +7946,13 @@ in sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."mirror-folder-2.2.0" + sources."mirror-folder-3.0.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" sources."multicast-dns-7.0.0" sources."multicb-1.2.2" - sources."multistream-2.1.0" + sources."multistream-2.1.1" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" sources."nan-2.10.0" @@ -8020,24 +8010,24 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."request-2.86.0" + sources."request-2.87.0" sources."revalidator-0.1.8" sources."rimraf-2.6.2" sources."rusha-0.8.13" sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."signed-varint-2.0.1" sources."simple-sha1-2.1.1" - sources."siphash24-1.1.0" + sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" - sources."sntp-2.1.0" sources."sodium-javascript-0.5.5" sources."sodium-native-2.1.6" sources."sodium-universal-2.0.0" - sources."sorted-array-functions-1.1.0" + sources."sorted-array-functions-1.2.0" sources."sorted-indexof-1.0.0" sources."sparse-bitfield-3.0.3" sources."speedometer-1.0.0" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."stack-trace-0.0.10" sources."status-logger-3.1.1" sources."stream-collector-1.0.1" @@ -8073,7 +8063,7 @@ in sources."unixify-1.0.0" sources."unordered-array-remove-1.0.2" sources."unordered-set-1.1.0" - sources."untildify-3.0.2" + sources."untildify-3.0.3" sources."util-deprecate-1.0.2" sources."utile-0.3.0" sources."utp-native-1.7.1" @@ -8088,7 +8078,7 @@ in }) sources."wrap-ansi-3.0.1" sources."wrappy-1.0.2" - sources."xhr-2.4.1" + sources."xhr-2.5.0" sources."xsalsa20-1.0.2" sources."xtend-4.0.1" ]; @@ -8138,24 +8128,24 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz"; - sha512 = "23wcnn35p90xhsc5z94w45s30j756s97acm313h6lacnbliqlaka3drq2xbsi4br8gdkld3r4dc33vglq8kf5jb408c7b2agpyar8lh"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz"; + sha512 = "1qqnhamd691pyvx27ql2l5228qx1migp0yys010zdi748pp516hf10sr26w7gx71323a9p0gv69i358xv2w918gpba9xp2w70l211fq"; }; dependencies = [ sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."browser-stdout-1.3.1" - sources."commander-2.11.0" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."debug-3.1.0" sources."diff-3.5.0" sources."escape-string-regexp-1.0.5" sources."fs.realpath-1.0.0" sources."glob-7.1.2" - sources."growl-1.10.3" - sources."has-flag-2.0.0" + sources."growl-1.10.5" + sources."has-flag-3.0.0" sources."he-1.1.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -8165,7 +8155,7 @@ in sources."ms-2.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."supports-color-4.4.0" + sources."supports-color-5.4.0" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -8211,7 +8201,7 @@ in sources."ajv-5.5.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.4" + sources."are-we-there-yet-1.1.5" sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -8220,7 +8210,6 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" - sources."boom-4.3.1" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" @@ -8229,11 +8218,6 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -8253,8 +8237,6 @@ in sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-unicode-2.0.1" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -8288,14 +8270,14 @@ in sources."punycode-1.4.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" - sources."request-2.86.0" + sources."request-2.87.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sntp-2.1.0" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -8306,8 +8288,8 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.2.1" sources."verror-1.10.0" - sources."which-1.3.0" - sources."wide-align-1.1.2" + sources."which-1.3.1" + sources."wide-align-1.1.3" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -8348,7 +8330,7 @@ in sources."abbrev-1.1.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.4" + sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chownr-1.0.1" @@ -8357,7 +8339,7 @@ in sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."debug-2.6.9" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."fs-minipass-1.2.5" @@ -8374,7 +8356,7 @@ in sources."isarray-1.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.3.0" + sources."minipass-2.3.3" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -8391,7 +8373,7 @@ in sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.0" - (sources."rc-1.2.7" // { + (sources."rc-1.2.8" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -8408,9 +8390,9 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.2" + sources."tar-4.4.4" sources."util-deprecate-1.0.2" - sources."wide-align-1.1.2" + sources."wide-align-1.1.3" sources."wrappy-1.0.2" sources."yallist-3.0.2" ]; @@ -8426,10 +8408,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "1.43.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-1.43.1.tgz"; - sha1 = "0766354192aa2d843bcf1ddb277627e5cbc9c1e9"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.2.2.tgz"; + sha1 = "23d5ed8d7c5133ad46b4ac7b0ee63cbe7bdec688"; }; buildInputs = globalBuildInputs; meta = { @@ -8500,10 +8482,10 @@ in vue-cli = nodeEnv.buildNodePackage { name = "vue-cli"; packageName = "vue-cli"; - version = "2.9.3"; + version = "2.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.3.tgz"; - sha512 = "1wljsr8srayqg7crbbczi00v31q3dxm3vz4fjcdqasdgsm1ajc9gham6sinsxlraniwg4dn5b1kmpw0nln63cy3v02vib07shyvq2ki"; + url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.6.tgz"; + sha512 = "10ysmrjahrqcnpqwr8x6vapf0wdzaa0g9y143fgpk99p0ggm1536isaasl091y6rrhyfqpyb41k5gpg02zmx24dmz2nfjc9zink815k"; }; dependencies = [ sources."absolute-0.0.1" @@ -8522,7 +8504,7 @@ in sources."arrify-1.0.1" sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."async-2.6.0" + sources."async-2.6.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" @@ -8531,13 +8513,12 @@ in sources."bcrypt-pbkdf-1.0.1" sources."bl-1.2.2" sources."bluebird-3.5.1" - sources."boom-4.3.1" sources."brace-expansion-1.1.11" sources."buffer-3.6.0" - sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" - sources."buffer-fill-0.1.1" + sources."buffer-fill-1.0.0" sources."builtins-1.0.3" sources."camelcase-1.2.1" sources."capture-stack-trace-1.0.0" @@ -8549,7 +8530,7 @@ in }) sources."center-align-0.1.3" sources."chalk-2.4.1" - sources."chardet-0.4.2" + sources."chardet-0.5.0" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" sources."cli-width-2.2.0" @@ -8569,11 +8550,6 @@ in sources."consolidate-0.14.5" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."decamelize-1.2.0" (sources."decompress-4.2.0" // { @@ -8606,11 +8582,11 @@ in sources."esprima-4.0.0" sources."extend-3.0.1" sources."extend-shallow-2.0.1" - sources."external-editor-2.2.0" + sources."external-editor-3.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" - sources."fd-slicer-1.0.1" + sources."fd-slicer-1.1.0" sources."figures-2.0.0" sources."file-type-5.2.0" sources."filename-reserved-regex-2.0.0" @@ -8642,15 +8618,13 @@ in sources."has-generators-1.0.1" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" sources."ieee754-1.1.11" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-3.3.0" + sources."inquirer-6.0.0" sources."is-3.2.1" sources."is-buffer-1.1.6" sources."is-extendable-0.1.1" @@ -8666,7 +8640,7 @@ in sources."isarray-1.0.0" sources."isstream-0.1.2" sources."isurl-1.0.0" - sources."js-yaml-3.11.0" + sources."js-yaml-3.12.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" @@ -8726,7 +8700,7 @@ in sources."readable-stream-2.3.6" sources."recursive-readdir-2.2.2" sources."repeat-string-1.6.1" - (sources."request-2.86.0" // { + (sources."request-2.87.0" // { dependencies = [ sources."co-4.6.0" ]; @@ -8735,17 +8709,15 @@ in sources."right-align-0.1.3" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" + sources."rxjs-6.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."seek-bzip-1.0.5" sources."semver-5.5.0" sources."signal-exit-3.0.2" - sources."sntp-2.1.0" sources."source-map-0.4.4" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.1" + sources."sshpk-1.14.2" sources."stat-mode-0.2.2" sources."string-width-2.1.1" sources."string_decoder-1.1.1" @@ -8764,6 +8736,7 @@ in sources."toml-2.3.3" sources."tough-cookie-2.3.4" sources."trim-repeated-1.0.0" + sources."tslib-1.9.2" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" (sources."uglify-js-2.8.29" // { @@ -8792,7 +8765,7 @@ in sources."xtend-4.0.1" sources."yaml-js-0.0.8" sources."yargs-3.10.0" - sources."yauzl-2.9.1" + sources."yauzl-2.9.2" ]; buildInputs = globalBuildInputs; meta = { @@ -8872,7 +8845,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."buffer-from-1.0.0" + sources."buffer-from-1.1.0" sources."busboy-0.2.14" sources."bytes-1.0.0" sources."cache-base-1.0.1" @@ -8913,7 +8886,7 @@ in sources."configstore-3.1.2" sources."connect-3.6.6" sources."content-type-1.0.4" - sources."cookiejar-2.1.1" + sources."cookiejar-2.1.2" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" @@ -8924,7 +8897,7 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."deep-extend-0.5.1" + sources."deep-extend-0.6.0" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."depd-1.1.2" @@ -9028,7 +9001,7 @@ in sources."mkdirp-0.3.0" ]; }) - sources."js-yaml-3.11.0" + sources."js-yaml-3.12.0" (sources."json-refs-2.1.7" // { dependencies = [ sources."debug-3.1.0" @@ -9122,7 +9095,7 @@ in sources."nan-2.10.0" sources."nanomatch-1.2.9" sources."native-promise-only-0.8.1" - (sources."nodemon-1.17.4" // { + (sources."nodemon-1.17.5" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -9186,7 +9159,7 @@ in sources."ps-tree-1.1.0" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.0" - sources."punycode-2.1.0" + sources."punycode-2.1.1" sources."qs-4.0.0" sources."range-parser-1.2.0" (sources."raw-body-2.0.2" // { @@ -9194,7 +9167,7 @@ in sources."bytes-2.1.0" ]; }) - sources."rc-1.2.7" + sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."readline2-1.0.1" @@ -9358,8 +9331,8 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."valid-url-1.0.9" - sources."validator-10.2.0" - sources."which-1.3.0" + sources."validator-10.3.0" + sources."which-1.3.1" sources."widest-line-2.0.0" sources."window-size-0.1.0" sources."wordwrap-0.0.3" @@ -9383,10 +9356,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.0.1.tgz"; - sha512 = "03x8626d7ngp160j0lx7vmzpjglvlqbz4gf9kmdndaxna9h81zr8rjhad3jcdkr9j1nnlc1rsr7acsdny5ykl3dwilq0p486zr9cyrp"; + url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz"; + sha512 = "3bhkx1ynzp39m6w5mnwfimc25arlpxgs9vgk0w7ai8zw0q6kxyljj4xjvkyxg7wv1f8jbj3k31ifgvy0kff4p3sbp5li53ls851qzvv"; }; buildInputs = globalBuildInputs; meta = { @@ -9400,10 +9373,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.92.0"; + version = "0.93.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.92.0.tgz"; - sha1 = "8d3d1f5af890e62da7f4cb45d20c09fa51057dcd"; + url = "https://registry.npmjs.org/three/-/three-0.93.0.tgz"; + sha1 = "3fd6c367ef4554abbb6e16ad69936283e895c123"; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix index e9dda44997fb..23af3a672337 100644 --- a/pkgs/development/python-modules/Babel/default.nix +++ b/pkgs/development/python-modules/Babel/default.nix @@ -1,17 +1,21 @@ -{ lib, buildPythonPackage, fetchPypi, pytz, pytest, freezegun }: +{ lib, buildPythonPackage, fetchPypi, pytz, pytest, freezegun, glibcLocales }: buildPythonPackage rec { pname = "Babel"; - version = "2.5.3"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "8ce4cb6fdd4393edd323227cba3a077bceb2a6ce5201c902c65e730046f41f14"; + sha256 = "8cba50f48c529ca3fa18cf81fa9403be176d374ac4d60738b839122dfaaa3d23"; }; propagatedBuildInputs = [ pytz ]; - checkInputs = [ pytest freezegun ]; + checkInputs = [ pytest freezegun glibcLocales ]; + + preCheck = '' + export LC_ALL="en_US.UTF-8" + ''; meta = with lib; { homepage = http://babel.edgewall.org; diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 189468a2daa9..1c391d3495dd 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -9,6 +9,7 @@ , gdb , numpy , ncurses +, fetchpatch }: let @@ -48,6 +49,15 @@ in buildPythonPackage rec { ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''} ''; + patches = [ + # The following is in GitHub in 0.28.3 but not in the `sdist`. + # https://github.com/cython/cython/issues/2319 + (fetchpatch { + url = https://github.com/cython/cython/commit/c485b1b77264c3c75d090a3c526de24966830d42.patch; + sha256 = "1p6jj9rb097kqvhs5j5127sj5zy18l7x9v0p478cjyzh41khh9r0"; + }) + ]; + meta = { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; homepage = http://cython.org; diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 8e3f3939b363..1cb5275a6c32 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.1.13"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - sha256 = "d160f7dc39f2f05ddc0bbf3a7bea4cc659fedc45fd9042e87346b24fe1cd00bb"; + sha256 = "e0eb8358b549552b1cc5972350bc3e41dd0a926c15b3ff95ce60f3c78c80824c"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 0ba846bb0f6e..432158744bed 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "adal"; - version = "0.5.1"; + version = "1.0.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "dd3ecb2dfb2de9393320d0ed4e6115ed07a6984a28e18adf46499b91d3c3a494"; + sha256 = "71b0e9b479320f76af4bcd268f7359580ba2e217228e83ff7529f51a9845f393"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index 10a1d8991576..2dc86a2bfc3e 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "aioamqp"; name = "${pname}-${version}"; - version = "0.10.0"; + version = "0.11.0"; meta = { homepage = https://github.com/polyconseil/aioamqp; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0132921yy31ijb8w439zcz1gla4hiws4hx8zf6la4hjr01nsy666"; + sha256 = "7f1eb9e0f1b7c7e21a3a6ca498c3daafdfc3e95b4a1a0633fd8d6ba2dfcab777"; }; buildInputs = lib.optionals isPy33 [ asyncio ]; diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 4865901713a3..f0756e1572e7 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohttp-jinja2"; - version = "0.17.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "8139c63fe989e140dceae378440680258dfb72f3301c79173945245299d795e6"; + sha256 = "df1ba60b8779d232a23e5e38589b85f6430e9ace5adce546353155349bdea023"; }; propagatedBuildInputs = [ aiohttp jinja2 ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 947f4341e6df..ec76d840a56b 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -12,24 +12,30 @@ , gunicorn , pytest-mock , async_generator +, pytestrunner +, pytest-timeout }: buildPythonPackage rec { pname = "aiohttp"; - version = "3.1.3"; + version = "3.3.2"; src = fetchPypi { inherit pname version; - sha256 = "9fcef0489e3335b200d31a9c1fb6ba80fdafe14cd82b971168c2f9fa1e4508ad"; + sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12"; }; disabled = pythonOlder "3.5"; - checkInputs = [ pytest gunicorn pytest-mock async_generator ]; + checkInputs = [ pytest gunicorn pytest-mock async_generator pytestrunner pytest-timeout ]; propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ] ++ lib.optional (pythonOlder "3.7") idna-ssl; + + # Several test failures. Need to be looked into. + doCheck = false; + meta = with lib; { description = "Asynchronous HTTP Client/Server for Python and asyncio"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 0211fef16060..2ad260f5d406 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "1.3.1"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "05b2fj8pzbij8hglx6p5ckfx0h1b7wcfpys306l853vp56d882yh"; + sha256 = "87f0f86865e88ea715ab358b1e5f2838b79ee7cdc0bdf762e9ed60aaf4c8bd4a"; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index fcd9a0978005..5f30529bb815 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "alabaster"; - version = "0.7.10"; + version = "0.7.11"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0"; + sha256 = "b63b1f4dc77c074d386752ec4a8a7517600f6c0db8cd42980cae17ab7b3275d7"; }; propagatedBuildInputs = [ pygments ]; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index d98eba693d23..274fa0fbbf27 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "altair"; - version = "1.2.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "c1303f77f1ba4d632f2958c83c0f457b2b969860b1ac9adfb872aefa1780baa7"; + sha256 = "e8b222588dde98ec614e6808357fde7fa321118db44cc909df2bf30158d931c0"; }; postPatch = '' diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index fa5b27a4ced8..fc984d40cc61 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -1,17 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, case, vine }: +{ stdenv, buildPythonPackage, fetchPypi, pytest, case, vine, pytest-sugar }: buildPythonPackage rec { pname = "amqp"; - version = "2.2.2"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "cba1ace9d4ff6049b190d8b7991f9c1006b443a5238021aca96dd6ad2ac9da22"; + sha256 = "073dd02fdd73041bffc913b767866015147b61f2a9bc104daef172fc1a0066eb"; }; - buildInputs = [ pytest case ]; + checkInputs = [ pytest case pytest-sugar ]; propagatedBuildInputs = [ vine ]; + # Disable because pytest-sugar requires an old version of pytest + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/celery/py-amqp; description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 6e596172d9e7..df8fae2a8d82 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "3.0.0"; + version = "3.0.2"; name = "${pname}-${version}"; meta = with stdenv.lib; { @@ -16,6 +16,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7cf068e7aec00edeb21879c2bbda048656c34d281e133a77425be03b352122d8"; + sha256 = "7849749cf00ae0680ad2bdfe4419c7a662bef19c03691a19e008c8b9a5267802"; }; } diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index a7661cd7bb64..7cdc56e2553a 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "astroid"; - version = "1.6.4"; + version = "1.6.5"; src = fetchPypi { inherit pname version; - sha256 = "dea42ae6e0b789b543f728ddae7ddb6740ba33a49fb52c4a4d9cb7bb4aa6ec09"; + sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a"; }; propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 0dcd5dfca364..4901b798955f 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "astropy"; - version = "3.0.2"; + version = "3.0.3"; disabled = !isPy3k; # according to setup.py @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "22e682904a3b8884595addfb743cf1a3ecf2b539c6616d98f8426208d822d84a"; + sha256 = "6af07abe5e263820a3dec93832a6ad74005013071490e125afbc6514411721da"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index 5f9318aa5c21..bc8e375271d6 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "async-timeout"; - version = "2.0.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0"; + sha256 = "b3c0ddc416736619bd4a95ca31de8da6920c3b9a140c64dbef2b2fa7bf521287"; }; # Circular dependency on aiohttp diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index d5ab50dc9046..ef21cb001b49 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "1.13.0"; + version = "1.13.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "1n75z4dvhzymd4n610dpwlq7wl8cyz1gxx9m7iq92pzhss5vgpfd"; + sha256 = "a44736830741e2bb9c4e3992819288b77ac4af217a46d12f415bb57c18ed9c22"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index 8ef2b5989f45..c443d17e0667 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "attrs"; - version = "17.4.0"; + version = "18.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9"; + sha256 = "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b"; }; # macOS needs clang for testing diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix index 88fdcbbeba17..30d75f92dc5b 100644 --- a/pkgs/development/python-modules/audioread/default.nix +++ b/pkgs/development/python-modules/audioread/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "audioread"; name = "${pname}-${version}"; - version = "2.1.5"; + version = "2.1.6"; src = fetchPypi { inherit pname version; - sha256 = "36c3b118f097c58ba073b7d040c4319eff200756f094295677567e256282d0d7"; + sha256 = "b0b9270c20833a75ce0d167fb2fdad52ddcd8e8f300be8afad3ac9715850bc50"; }; # No tests, need to disable or py3k breaks diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index a48ab10474ed..ac26daa13749 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "autobahn"; - version = "18.3.1"; + version = "18.6.1"; src = fetchurl { url = "mirror://pypi/a/${pname}/${name}.tar.gz"; - sha256 = "fc1d38227bb44a453b54cffa48de8b2e6ce48ddc5e97fb5950b0faa27576f385"; + sha256 = "2f41bfc512ec482044fa8cfa74182118dedd87e03b3494472d9ff1b5a1e27d24"; }; # Upstream claim python2 support, but tests require pytest-asyncio which @@ -22,7 +22,7 @@ buildPythonPackage rec { (stdenv.lib.optionals (!isPy3k) [ trollius futures ]); checkPhase = '' - py.test $out + USE_TWISTED=true py.test $out ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index e4f3e061dd4e..15950d38b53c 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchurl, m2r, setuptools_scm, six, attrs }: buildPythonPackage rec { - version = "0.6.0"; + version = "0.7.0"; pname = "Automat"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/A/Automat/${name}.tar.gz"; - sha256 = "3c1fd04ecf08ac87b4dd3feae409542e9bf7827257097b2b6ed5692f69d6f6a8"; + sha256 = "cbd78b83fa2d81fe2a4d23d258e1661dd7493c9a50ee2f1a5b2cac61c1793b0e"; }; buildInputs = [ m2r setuptools_scm ]; diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 514ccc7f619c..d7bdd143b697 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.5.4"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "9d8a25e058c78d2cef5c07aec7f98cbc2070dbfc2eb6a2e102a16beafd14e3ca"; + sha256 = "1da15d459150eb631af4f400ca336901da6a564b543fe3d7a75169ca2c9f36cb"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 972b8f847bf2..9dbd20cd6eef 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "0.97"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "43eca57bb48b718ea58968608cfd22f4b9c62c2d904bb08aa2f8afe56eeb9de4"; + sha256 = "13470b95a2f55036a5d7b6642250d8f3a519a6c454cd91f55778b1bb4bf5b89d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 2991ae9be82f..195a1ccad766 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -1,17 +1,17 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k , beautifulsoup4, bottle, chardet, dateutil , google_api_python_client, lxml, ply, python_magic -, nose }: +, nose, requests }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.1.2"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0wxwf02d3raglwqsxdsgf89fniakv1m19q825w76k5z004g18y42"; + sha256 = "d0d5f7088cb6b699cc4d030dad42d20b8228232cdb445bb1330d4ef5e3581f52"; }; checkInputs = [ nose ]; @@ -31,6 +31,7 @@ buildPythonPackage rec { lxml ply python_magic + requests ]; meta = { diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index d3ea1f151d34..b9364d51d14a 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "blessed"; - version = "1.14.2"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "0fv9f0074kxy1849h0kwwxw12sifpq3bv63pcz900zzjsigi4hi3"; + sha256 = "777b0b6b5ce51f3832e498c22bc6a093b6b5f99148c7cbf866d26e2dec51ef21"; }; checkInputs = [ pytest mock glibcLocales ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index dcbc9e5ccd07..4f9bc3183581 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "0.12.16"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "de14151c7ef768f858f46168546c1d492cb04ab3c58bc118329a78ebf35b4688"; + sha256 = "d0cf59774d7c74b7173b82ce36bde35b8fe9da0f960364ba3c4df0d1fbd874d6"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 886433a358ae..217a40bf7aa9 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "branca"; - version = "0.2.0"; + version = "0.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "327b0bae73a519f25dc2f320d8d9f1885aad2e8e5105add1496269d5391b8ea4"; + sha256 = "bea38396cf58fd7173ac942277fe4138127eb1546622684206cb34d344b03fb4"; }; checkInputs = [ pytest selenium ]; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 1397dc6876fa..37e3fbea2cf6 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }: buildPythonPackage rec { - version = "4.7.3"; + version = "4.9.1"; pname = "breathe"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/b/breathe/${name}.tar.gz"; - sha256 = "d0b0e029daba6c3889d15d6c2dd4b0e9d468dc631d41021d0576c1b0dabee302"; + sha256 = "76e1f3706efeda2610d9a8e7b421d2877ff0654a3fe6d3190a8686536111a684"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 8af103cb999d..b7b9820b7a98 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "BTrees"; - version = "4.4.1"; + version = "4.5.0"; name = "${pname}-${version}"; buildInputs = [ transaction ]; @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a2738b71693971c1f7502888d649bef270c65f026db731e03d53f1ec4edfe8a3"; + sha256 = "46b02cb69b26a5238db771ea1955b503df73ecf254bb8063af4c61999fc75b5c"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 5d36ae4d122e..8f900c7b09c6 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.11.4"; + version = "2.11.5"; name = "${pname}-nix-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "20b22d9c99c99909b6b2dc679e8acd9e1fcf9f58e23f336d8b2c5be70617fbb2"; + sha256 = "537a22715d82362cddd811da08d11a31d30d5161ce7994b208bd85ebb348d122"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/cachetools/1.nix b/pkgs/development/python-modules/cachetools/1.nix index 6daa735cfaed..f527a7773736 100644 --- a/pkgs/development/python-modules/cachetools/1.nix +++ b/pkgs/development/python-modules/cachetools/1.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "cachetools"; - version = "2.0.1"; + version = "2.1.0"; disabled = isPyPy; # a test fails src = fetchPypi { inherit pname version; - sha256 = "ede01f2d3cbd6ddc9e35e16c2b0ce011d8bb70ce0dbaf282f5b4df24b213bc5d"; + sha256 = "90f1d559512fc073483fe573ef5ceb39bf6ad3d39edc98dc55178a2b2b176fa3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index fe69768c976a..7f11e85752e5 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "cachetools"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0pdw2fr29pxlyn1g5fhdrrqbpn0iw062nv716ngdqvdx7hnizq7d"; + sha256 = "90f1d559512fc073483fe573ef5ceb39bf6ad3d39edc98dc55178a2b2b176fa3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index e7a7351b4ab8..3a357282c165 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "celery"; - version = "4.1.1"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d1f2a3359bdbdfb344edce98b8e891f5fe64f8a11c5a45538ec20ac237c971f5"; + sha256 = "ff727c115533edbc7b81b2b4ba1ec88d1c2fc4836e1e2f4c3c33a76ff53e5d7f"; }; # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index 12536584f051..4c3421750218 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Cerberus"; - version = "1.1"; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "a5b39090fde3ec3294c9d7030b8eda935b42222160a66a922e0c8aea34cabfdf"; + sha256 = "f5c2e048fb15ecb3c088d192164316093fcfa602a74b3386eefb2983aa7e800a"; }; checkInputs = [ pytestrunner pytest ]; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index d36f0f308d33..3bc686121cf0 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,12 +5,11 @@ buildPythonPackage rec { pname = "certifi"; - version = "2018.1.18"; - name = "${pname}-${version}"; + version = "2018.4.16"; src = fetchPypi { inherit pname version; - sha256 = "edbc3f203427eef571f79a7692bb160a2b0f7ccaa31953e99bd17e307cf63f7d"; + sha256 = "13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7"; }; meta = { diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix new file mode 100644 index 000000000000..0e355723604e --- /dev/null +++ b/pkgs/development/python-modules/cftime/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, coveralls +, pytestcov +, cython +, numpy +}: + +buildPythonPackage rec { + pname = "cftime"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "f62fe79ed2ad38f4211477e59f6f045c91278351f4ce7578e33ddf52fb121ea8"; + }; + + checkInputs = [ pytest coveralls pytestcov ]; + buildInputs = [ cython ]; + propagatedBuildInputs = [ numpy ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "Time-handling functionality from netcdf4-python"; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index fe1f84aa1bba..b07a205ba215 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "chainer"; - version = "3.5.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "d72c1f5ff5f4743b141900d5e50aeb8337a213e553a28012dad4a4d2335bbabb"; + sha256 = "49a4a691708626f742cc6fc949fce6b313e3379bd64886eb19e002b1122cc329"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 46692999a498..454a4f5f6ac7 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "channels"; name = "${pname}-${version}"; - version = "2.0.2"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "5d41e0f2aa40f9755f36c2c1dd83748b6793732190d577922e06294a3b37fd92"; + sha256 = "173441ccf2ac3a93c3b4f86135db301cbe95be58f5815c1e071f2e7154c192a2"; }; # Files are missing in the distribution diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 56c6c551ee7c..1feec7ed828d 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "check-manifest"; - version = "0.36"; + version = "0.37"; src = fetchPypi { inherit pname version; - sha256 = "2bb906a736a0f026cc5fd6c0dab5a481793b3d7a7d70106cca6e238da5f52d84"; + sha256 = "44e3cf4b0833a55460046bf7a3600eaadbcae5e9d13baf0c9d9789dd5c2c6452"; }; doCheck = false; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 7aa01623b085..398f52cefd2a 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "cheroot"; - version = "6.0.0"; + version = "6.3.2"; src = fetchPypi { inherit pname version; - sha256 = "10s67wxymk4xg45l7ca59n4l6m6rnj8b9l52pg1angxh958lwixs"; + sha256 = "52f915d077ce6201e59c95c4a2ef89617d9b90e6185defb40c03ff3515d2066f"; }; propagatedBuildInputs = [ more-itertools six ]; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index bb97a3a7e678..368111b3651f 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "CherryPy"; - version = "14.0.1"; + version = "16.0.2"; src = fetchPypi { inherit pname version; - sha256 = "721d09bbeedaf5b3493e9e644ae9285d776ea7f16b1d4a0a5aaec7c0d22e5074"; + sha256 = "858fbff27235a392026b1d821ad815b587815c94fbb14312e2e64cc23766b9c3"; }; propagatedBuildInputs = [ cheroot portend routes six ]; diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index b703bce2cc7a..7e6cc206cdc0 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "circus"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "b8ca91d8bd87b350fda199488ac9ddff91a546b0c6214a28a2f13393713cf062"; + sha256 = "d1603cf4c4f620ce6593d3d2a67fad25bf0242183ea24110d8bb1c8079c55d1b"; }; doCheck = false; # weird error diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 4a96ef7f6730..68a4662d2820 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -9,12 +9,10 @@ buildPythonPackage rec { sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; }; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - locale = "${locale}/bin/locale"; - }) - ]; + patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (substituteAll { + src = ./fix-paths.patch; + locale = "${locale}/bin/locale"; + }); buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix new file mode 100644 index 000000000000..617b0ea101fc --- /dev/null +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -0,0 +1,89 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyyaml, openssh +, nose, bc, hostname, coreutils, bash, gnused +}: + +buildPythonPackage rec { + pname = "ClusterShell"; + version = "1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bm0pq8w2rql9q9i2bhs865rqvb6zck3h3gkb1d0mh59arrr7p4m"; + }; + + propagatedBuildInputs = [ pyyaml ]; + + postPatch = '' + substituteInPlace lib/ClusterShell/Worker/Ssh.py \ + --replace '"ssh"' '"${openssh}/bin/ssh"' \ + --replace '"scp"' '"${openssh}/bin/scp"' + + substituteInPlace lib/ClusterShell/Worker/fastsubprocess.py \ + --replace '"/bin/sh"' '"${bash}/bin/sh"' + ''; + + checkInputs = [ nose bc hostname coreutils gnused ]; + + # Many tests want to open network connections + # https://github.com/cea-hpc/clustershell#test-suite + # + # Several tests fail on Darwin + checkPhase = '' + for f in tests/*; do + substituteInPlace $f \ + --replace '/bin/hostname' '${hostname}/bin/hostname' \ + --replace '/bin/sleep' '${coreutils}/bin/sleep' \ + --replace '"sleep' '"${coreutils}/bin/sleep' \ + --replace '/bin/echo' '${coreutils}/bin/echo' \ + --replace '/bin/uname' '${coreutils}/bin/uname' \ + --replace '/bin/false' '${coreutils}/bin/false' \ + --replace '/bin/true' '${coreutils}/bin/true' \ + --replace '/usr/bin/printf' '${coreutils}/bin/printf' \ + --replace '"sed' '"${gnused}/bin/sed' \ + --replace ' sed ' ' ${gnused}/bin/sed ' + done + + rm tests/CLIClushTest.py + rm tests/TreeWorkerTest.py + rm tests/TaskDistantMixin.py + rm tests/TaskDistantTest.py + rm tests/TaskDistantPdshMixin.py + rm tests/TaskDistantPdshTest.py + rm tests/TaskRLimitsTest.py + + nosetests -v \ + -e test_channel_ctl_shell_remote1 \ + -e test_channel_ctl_shell_remote2 \ + -e test_fromall_grouplist \ + -e test_rank_placeholder \ + -e test_engine_on_the_fly_launch \ + -e test_ev_pickup_fanout \ + -e test_ev_pickup_fanout_legacy \ + -e test_timeout \ + -e test_008_broken_pipe_on_write \ + -e testLocalBufferRCGathering \ + -e testLocalBuffers \ + -e testLocalErrorBuffers \ + -e testLocalFanout \ + -e testLocalRetcodes \ + -e testLocalRCBufferGathering \ + -e testLocalSingleLineBuffers \ + -e testLocalWorkerFanout \ + -e testSimpleMultipleCommands \ + -e testClushConfigSetRlimit \ + -e testTimerInvalidateInHandler \ + -e testTimerSetNextFireInHandler \ + -e test_channel_ctl_shell_mlocal1 \ + -e test_channel_ctl_shell_mlocal2 \ + -e test_channel_ctl_shell_mlocal3 \ + -e test_node_placeholder \ + tests/*.py + ''; + + meta = with stdenv.lib; { + description = "Scalable Python framework for cluster administration"; + homepage = https://cea-hpc.github.io/clustershell; + license = licenses.lgpl21; + maintainers = [ maintainers.alexvorobiev ]; + }; +} diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix index 52afdee46ab7..cfd6389ce5fb 100644 --- a/pkgs/development/python-modules/coinmarketcap/default.nix +++ b/pkgs/development/python-modules/coinmarketcap/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "coinmarketcap"; - version = "4.2.1"; + version = "5.0.3"; src = fetchPypi { inherit pname version; - sha256 = "0bk530cmfqri84m9386ydn3f89gq23nxylvnl523gr5589vw54bj"; + sha256 = "1cfee31bf330a17cedf188e4e99588e6a4c6c969c93da71f55a9f4ec6a6c216f"; }; propagatedBuildInputs = [ requests-cache ]; diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix index 5722893a8537..888e7a922528 100644 --- a/pkgs/development/python-modules/consul/default.nix +++ b/pkgs/development/python-modules/consul/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-consul"; - version = "0.7.2"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "ef0b7c8a2d8efba5f9602f45aadbe5035e22a511d245624ed732af81223a6571"; + sha256 = "0feb7a14b6869bbfa9eb4868e823f040e3642b84e80c39ffdff3a8b7fd7017c4"; }; buildInputs = [ requests six pytest ]; diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix index 6ecad9a160e2..832089c99c2f 100644 --- a/pkgs/development/python-modules/cufflinks/default.nix +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "cufflinks"; - version = "0.12.1"; + version = "0.13.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "8f11e4b6326cc5b2a18011c09fb64f178ba21002f337fd305f64818012a6c679"; + sha256 = "59f1bae67aaa5042c8f9f94caba44b9b8e6e530ce9e81f6e06b643aca253d2f4"; }; propagatedBuildInputs = [ pandas plotly colorlover ]; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 44d258a3de55..3a3aeb7b2267 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "2.5.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "60e36add95b0bc15f0863e7b4a425c00111dab0985075a96ede689510a9c56be"; + sha256 = "3e714fa21401ab1d278b648543fae56fbce97e389076ebf03b4189f88c2d61e0"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index be6f688f5032..e17bd38da02b 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "cvxopt"; - version = "1.1.9"; + version = "1.2.0"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - sha256 = "0gcqq8ymjxv8qa5ss2pdhsj5bahvdxa6h2rlpp51520mjxrpw5cg"; + sha256 = "3296c9d49b7dcb894b20db5d7d1c1a443912b4d82358e03f836575e8398e0d60"; }; # similar to Gsl, glpk, fftw there is also a dsdp interface diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index d18b2cb1c7c4..8ec7bb24a623 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.17.5"; + version = "0.18.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ea8ad7735048a6e8a9e389186f840a0a9e5c5eeb55379c8b3c9d4883be863c5c"; + sha256 = "ebaa0f144b43a00e7b9b3b9cb557e8ebada5fcbb982cdaba1802cd8c4c5720f0"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/pkgs/development/python-modules/dataclasses/default.nix index 083ea6d6347b..44d4d3b57694 100644 --- a/pkgs/development/python-modules/dataclasses/default.nix +++ b/pkgs/development/python-modules/dataclasses/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "dataclasses"; - version = "0.5"; + version = "0.6"; # backport only works on Python 3.6, and is in the standard library in Python 3.7 disabled = !isPy36; src = fetchPypi { inherit pname version; - sha256 = "07lgn1k56sqpw7yfzv5a6mwshsgaipjawflgyr6lrkryjl64481z"; + sha256 = "6988bd2b895eef432d562370bb707d540f32f7360ab13da45340101bc2307d84"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/dateutil/1_5.nix b/pkgs/development/python-modules/dateutil/1_5.nix index 6580b0e10070..0808cf4f2011 100644 --- a/pkgs/development/python-modules/dateutil/1_5.nix +++ b/pkgs/development/python-modules/dateutil/1_5.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "python-dateutil"; - version = "1.5"; + version = "2.7.3"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg"; + sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index 32514f86226d..4e8da39662e7 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,15 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, six }: +{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm }: buildPythonPackage rec { name = "${pname}-${version}"; pname = "python-dateutil"; - version = "2.6.1"; + version = "2.7.3"; src = fetchPypi { inherit pname version; - sha256 = "1jkahssf0ir5ssxc3ydbp8cpv77limn8d4s77szb2nrgl2r3h749"; + sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six setuptools_scm ]; meta = with stdenv.lib; { description = "Powerful extensions to the standard datetime module"; diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index e852ac0385ca..e3b1bebcccb2 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "decorator"; - version = "4.2.1"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "7d46dd9f3ea1cf5f06ee0e4e1277ae618cf48dfb10ada7c8427cd46c42702a0e"; + sha256 = "c39efa13fbdeb4506c476c9b3babf6a718da943dab7811c206005a4a956c080c"; }; meta = { diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index cc991c7aeb4d..6e79119b6a8f 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deluge-client"; - version = "1.4.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "86979ebcb9f1f991554308e88c7a57469cbf339958b44c71cbdcba128291b043"; + sha256 = "a95d5bc3cf12e842793cb90eecef5c91f4bd8a7fc4e1e8fdef36d62b643d87cb"; }; # it will try to connect to a running instance diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix index a455db96c22b..6220a1e15f0c 100644 --- a/pkgs/development/python-modules/dendropy/default.nix +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "DendroPy"; - version = "4.3.0"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "bd5b35ce1a1c9253209b7b5f3939ac22beaa70e787f8129149b4f7ffe865d510"; + sha256 = "f0a0e2ce78b3ed213d6c1791332d57778b7f63d602430c1548a5d822acf2799c"; }; prePatch = '' diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index 63c3fcd74cac..d1ec79210990 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deprecation"; - version = "2.0.2"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "e8d0dc5a17d7d551730e5f23ff3a53fc9e438364b9efb47d41c3e9b05522eabe"; + sha256 = "2c259bfc0237f16bbe36cb32b6d81addd919b8f4bc7253738576816e82841b96"; }; propagatedBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 79c87772ffe7..839a70bdbf11 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "dill"; - version = "0.2.7.1"; + version = "0.2.8.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "97fd758f5fe742d42b11ec8318ecfcff8776bccacbfcec05dfd6276f5d450f73"; + sha256 = "53a6d7bf74f737a514cb89f72d0cb8b80dbd44a9cbbffaa14bffb57f4d7c3822"; }; # Messy test suite. Even when running the tests like tox does, it fails diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index da6984c9be9e..4029eb891395 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "distro"; - version = "1.2.0"; + version = "1.3.0"; buildInputs = [ pytest pytestcov tox]; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d94370e43b676ac44fbe1ab68ca903a6147eaba3a9e8eff85b2c05556a455b76"; + sha256 = "224041cef9600e72d19ae41ba006e71c05c4dc802516da715d7fda55ba3d8742"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix new file mode 100644 index 000000000000..905ce92e5177 --- /dev/null +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi +, setuptools_scm, django, dateutil, whoosh, pysolr +, coverage, mock, nose, geopy, requests }: + +buildPythonPackage rec { + pname = "django-haystack"; + version = "2.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "8b54bcc926596765d0a3383d693bcdd76109c7abb6b2323b3984a39e3576028c"; + }; + + checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ]; + propagatedBuildInputs = [ django ]; + nativeBuildInputs = [ setuptools_scm ]; + + postPatch = '' + sed -i 's/geopy==/geopy>=/' setup.py + ''; + + # ImportError: cannot import name django.contrib.gis.geos.prototypes + doCheck = false; + + meta = with lib; { + description = "Modular search for Django"; + homepage = "http://haystacksearch.org/"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index 5deccb34d894..c9589f86993e 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "django-ipware"; name = "${pname}-${version}"; - version = "2.0.2"; + version = "2.1.0"; meta = { description = "A Django application to retrieve user's IP address"; @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "abf2bfbf0ec6c04679372a55c25889c9b08f55ec404bca3dfc08f3cf6c832a11"; + sha256 = "a7c7a8fd019dbdc9c357e6e582f65034e897572fc79a7e467674efa8aef9d00b"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index fbdc7282c1b6..3bf5e064c40c 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -3,13 +3,13 @@ pyparsing, django, celery }: buildPythonPackage rec { - version = "0.5"; + version = "0.6"; pname = "django-raster"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/django-raster/${name}.tar.gz"; - sha256 = "0v1jldb13s4dqq1vaq8ghfv3743jpi9a9n05bqgjm8szlkq8s7ah"; + sha256 = "9a0f8e71ebeeeb5380c6ca68e027e9de335f43bc15e89dd22e7a470c4eb7aeb8"; }; # Tests require a postgresql + postgis server diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index 9c8cde3a0d8a..7d73877b792c 100644 --- a/pkgs/development/python-modules/django/2_0.nix +++ b/pkgs/development/python-modules/django/2_0.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "2.0.5"; + version = "2.0.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "71d1a584bb4ad2b4f933d07d02c716755c1394feaac1ce61ce37843ac5401092"; + sha256 = "3eb25c99df1523446ec2dc1b00e25eb2ecbdf42c9d8b0b8b32a204a8db9011f8"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/djmail/default.nix b/pkgs/development/python-modules/djmail/default.nix index c8e6e2fa03d6..d296e3ee9dd6 100644 --- a/pkgs/development/python-modules/djmail/default.nix +++ b/pkgs/development/python-modules/djmail/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "djmail"; name = "${pname}-${version}"; - version = "1.0.1"; + version = "1.1.0"; meta = { description = "Simple, powerfull and nonobstructive django email middleware."; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1827i9qcn1ki09i5pg0lmar7cxjv18avh76x1n20947p1cimf3rp"; + sha256 = "87d2a8b4bdf67ae9b312e127ccc873a53116cf297ec786460d782ce82eaa76b5"; }; propagatedBuildInputs = [ celery django psycopg2 ]; diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index dd20400ea4f4..491ab814e3b8 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "docker-pycreds"; - version = "0.2.3"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "e3732a03610a00461a716997670c7010bf1c214a3edc440f7d6a2a3a830ecd9d"; + sha256 = "8b0e956c8d206f832b06aa93a710ba2c3bcbacb5a314449c040b0b814355bbff"; }; # require docker-credential-helpers binaries diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 2ae56b7dc5a7..0eedf4f01a6e 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,12 +3,12 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "3.3.0"; + version = "3.4.0"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "dc5cc0971a0d36fe94c5ce89bd4adb6c892713500af7b0818708229c3199911a"; + sha256 = "e9cc39e24905e67ba9e2df14c94488f5cf030fb72ae1c60de505ce5ea90503f7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 1be9e34ec18f..8a5f23de8998 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "8.7.1"; + version = "8.9.0"; src = fetchPypi { inherit pname version; - sha256 = "019f1529631d335f2b57ffd65a4545406bd3d139d0a9611cb6ca8c66c4ae7309"; + sha256 = "e7eeac47f35e73b34023b7a3089380e74bacd0cce4b57e1e347539dfb53681d2"; }; # Set DROPBOX_TOKEN environment variable to a valid token. diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 80a42ac30fd5..3001b687556b 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -4,12 +4,12 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.19.2"; + version = "0.19.3"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "c51e10c260543240e0806052af046e1a78b98cbe1ac1ef3880a78d2269e09da4"; + sha256 = "0d1ab6adf5e8e9bc30cce6e2f924ca06e50241fb1bb17a585fc8d98e3c09c4a4"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 502da4b1b604..087ca3910c55 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "6.2.0"; + version = "6.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b106fa3e01750376a42f8a9882bd84d630fda58c7aba38b4fec797d11c0bd0a2"; + sha256 = "80ff7a1a56920535a9987da333c7e385b2ded27595b6de33860707dab758efbe"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 472a630549b2..2deb16924d20 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "0.8.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "3f10c22f15ffedb34519e4af2201f1a088a958efedfd50da0da1aa3887283dff"; + sha256 = "be0288ef1125bf1c539bb8f3079ef4aa5fb813af28f0c5294a4e744ee554398a"; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 99bbb7704034..deed6536fe74 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "Eve"; - version = "0.7.9"; + version = "0.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "e4ffa43be977997a4c6b62f5ab7996df3acf54c68824875fecd896da5af341a3"; + sha256 = "9f926c715f88c7a92dc2b950ccc09cccd91f72fe0e93cde806b85d25b947df2f"; }; patches = [ diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 431d137ea2e9..6441db945d7f 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.8.15"; + version = "0.8.16"; src = fetchPypi { inherit pname version; - sha256 = "a77a1a2223a8e0d32618878350bbd2171040f32b526ba2cddfab8864704bb370"; + sha256 = "04645d946256b835c675c1cef7c03817a164b0c4e452018fd50b212ddff08c22"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index e8bdb78f7317..7458ffc03d0e 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "feedgen"; - version = "0.6.1"; + version = "0.7.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "e5a1f2a8aaed06dae325e6024aa7083e90655c6cbddeb3671249b3895c135762"; + sha256 = "82c9e29884e137c3e3e7959a02f142d1f7a46cd387d572e9e40150112a27604f"; }; propagatedBuildInputs = [ dateutil lxml ]; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 7e9e2e1da64c..7ee4f77109b7 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.7.11.post2"; + version = "1.7.12"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5804c6f5f7e02cf1f95ca404c22653dd47d64e4496a0ba7af5a2d6b2051b872a"; + sha256 = "8b54eb8422d7c502bb7776b184018186bede1a489cf438a7a47f992ade6a0e51"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/flask-common/default.nix b/pkgs/development/python-modules/flask-common/default.nix index 31fe2a677c39..05a728d78cb5 100644 --- a/pkgs/development/python-modules/flask-common/default.nix +++ b/pkgs/development/python-modules/flask-common/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Flask-Common"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1f6ibvkxpxgczxs4qcbh5bj8rf9ggggbagi2dkaphx5w29xbbys4"; + sha256 = "13d99f2dbc0a332b8bc4b2cc394d3e48f89672c266868e372cd9d7b433d921a9"; }; propagatedBuildInputs = [ crayons flask flask_cache gunicorn maya meinheld whitenoise ]; diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 491ee22b0212..2b66b0f85f46 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Flask-Cors"; - version = "3.0.4"; + version = "3.0.6"; src = fetchPypi { inherit pname version; - sha256 = "bec996f0603a0693c0ea63c8126e5f8e966bb679cf82e6104b254e9c7f3a7d08"; + sha256 = "ecc016c5b32fa5da813ec8d272941cfddf5f6bba9060c405a70285415cbf24c9"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index 078b23869756..6ac958d6435c 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "flask-marshmallow"; name = "${pname}-${version}"; - version = "0.8.0"; + version = "0.9.0"; meta = { homepage = "https://github.com/marshmallow-code/flask-marshmallow"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1fa6xgxrn9bbc2pazbg46iw3ykvpcwib5b5s46qn59ndwj77lifi"; + sha256 = "db7aff4130eb99fd05ab78fd2e2c58843ba0f208899aeb1c14aff9cd98ae8c80"; }; propagatedBuildInputs = [ flask marshmallow ]; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 1a4bd11a1fa3..71c4170d26cd 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; buildPythonPackage rec { pname = "Flask-Migrate"; - version = "2.1.1"; + version = "2.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b709ca8642559c3c5a81a33ab10839fa052177accd5ba821047a99db635255ed"; + sha256 = "cd1b4e6cb829eeb41c02ad9202d83bef5f4b7a036dd9fad72ce96ad1e22efb07"; }; checkInputs = optional isPy3k glibcLocales; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 1a2c6417167b..b7372fa90328 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "${pname}-${version}"; - version = "0.12.4"; + version = "1.0.2"; pname = "Flask"; src = fetchPypi { inherit pname version; - sha256 = "2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd"; + sha256 = "2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 1381fc45c228..4874fbba3c6f 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.25.0"; + version = "3.28.0"; src = fetchPypi { inherit pname version; - sha256 = "c1b7eb0469d4e684bb8995906c327109beac870a33900090d64f85d79d646360"; + sha256 = "ebf2ee25a6060e8551880a3b05d6ecadcdcfbd1b32fc272ff7b3acdb22945b6f"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 6b94652402e3..1169dd3a4a47 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchurl, buildPythonPackage, isPyPy, python, libev, greenlet }: +{ stdenv, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet }: buildPythonPackage rec { pname = "gevent"; - version = "1.2.2"; - name = pname + "-" + version; + version = "1.3.4"; - src = fetchurl { - url = "mirror://pypi/g/gevent/${name}.tar.gz"; - sha256 = "0bbbjvi423y9k9xagrcsimnayaqymg6f2dj76m9z3mjpkjpci4a7"; + src = fetchPypi { + inherit pname version; + sha256 = "53c4dc705886d028f5d81e698b1d1479994a421498cd6529cb9711b5e2a84f74"; }; buildInputs = [ libev ]; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 04fae0db1b7a..6cb6e626f279 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,5 +1,6 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchurl -, utillinux, pygit2, gitMinimal, git-annex }: +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch +, utillinux, pygit2, gitMinimal, git-annex +}: buildPythonPackage rec { pname = "git-annex-adapter"; @@ -22,10 +23,13 @@ buildPythonPackage rec { ''; # TODO: Remove for next version - patches = fetchurl { - url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch"; - sha256 = "1hbw8651amjskakvs1wv2msd1wryrq0vpryvbispg5267rs8q7hp"; - }; + patches = [ + ./not-a-git-repo-testcase.patch + (fetchpatch { + url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch"; + sha256 = "0yh66gial6bx7kbl7s7lkzljnkpgvgr8yahqqcq9z76d0w752dir"; + }) + ]; checkInputs = [ utillinux # `rev` is needed in tests/test_process.py @@ -43,6 +47,6 @@ buildPythonPackage rec { homepage = https://github.com/alpernebbi/git-annex-adapter; description = "Call git-annex commands from Python"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda ma27 ]; }; } diff --git a/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch b/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch new file mode 100644 index 000000000000..2a386ee3f2f9 --- /dev/null +++ b/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_process.py b/tests/test_process.py +index 493fc8f..feb1833 100644 +--- a/tests/test_process.py ++++ b/tests/test_process.py +@@ -126,7 +126,7 @@ class TestProcessOnEmptyDir(TempDirTestCase): + with self.assertRaises(subprocess.CalledProcessError) as cm: + runner('status', '-sb') + self.assertIn( +- "fatal: Not a git repository", ++ "fatal: not a git repository", + cm.exception.stderr, + ) + diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 74fe88be4475..72172c4a2586 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,19 +1,19 @@ { lib, buildPythonPackage, fetchPypi -, httplib2, six, oauth2client, uritemplate }: +, httplib2, six, google-auth-httplib2, uritemplate }: buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.6.7"; + version = "1.7.3"; src = fetchPypi { inherit pname version; - sha256 = "05583a386e323f428552419253765314a4b29828c3cee15be735f9ebfa5aebf2"; + sha256 = "e32d30563b90c4f88ff042d4d891b5e8ed1f6cdca0adab95e9c2ce2603087436"; }; # No tests included in archive doCheck = false; - propagatedBuildInputs = [ httplib2 six oauth2client uritemplate ]; + propagatedBuildInputs = [ httplib2 google-auth-httplib2 six uritemplate ]; meta = with lib; { description = "The core Python library for accessing Google APIs"; diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix new file mode 100644 index 000000000000..c76f5c572e40 --- /dev/null +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flask +, mock +, six +, pytest +, pytest-localserver +, google_auth +, httplib2 + +}: + +buildPythonPackage rec { + pname = "google-auth-httplib2"; + version = "0.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "098fade613c25b4527b2c08fa42d11f3c2037dda8995d86de0745228e965d445"; + }; + + checkInputs = [ + flask mock six pytest pytest-localserver + ]; + + propagatedBuildInputs = [ + google_auth httplib2 + ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "Google Authentication Library: httplib2 transport"; + homepage = https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2; + license = lib.licenses.asl20; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 9e1a0c308047..2273b48b5b31 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.1.2"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "2000963305e95410a66e6ef6cfcc9f4627a4a95cb1c10abc98268814f2a6cd80"; + sha256 = "e24e391054ed6e925ff6d03f225d9f66f3da97d0ab6f61e59274fb918fbe3ef1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index ef101077eaab..d908bb041510 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "9051802d3dae256036cca9e34633a32c0ed1427730d4ebc513dff91ec8b6dd45"; + sha256 = "1745c9066f698eac3da99cef082914495fb71bc09597ba7626efbbb64c4acc57"; }; checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ]; diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 75c14ff62ebc..56882c5269ad 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "0.32.1"; + version = "0.34.0"; src = fetchPypi { inherit pname version; - sha256 = "4f9a8ab3eb6630d0c0ca6ac15230dceba7d55d6707d162a84f255139ff780ee9"; + sha256 = "8396646aa9de210bacb144fabd82ab5fe577b3b11708725c879b72c96009d631"; }; propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ]; diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix new file mode 100644 index 000000000000..91b075163018 --- /dev/null +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, isPyPy +}: + + +buildPythonPackage rec { + pname = "greenlet"; + version = "0.4.13"; + disabled = isPyPy; # builtin for pypy + + src = fetchPypi { + inherit pname version; + sha256 = "0fef83d43bf87a5196c91e73cb9772f945a4caaff91242766c5916d1dd1381e4"; + }; + + propagatedBuildInputs = [ six ]; + + # see https://github.com/python-greenlet/greenlet/issues/85 + preCheck = '' + rm tests/test_leaks.py + ''; + + meta = { + homepage = https://pypi.python.org/pypi/greenlet; + description = "Module for lightweight in-process concurrent programming"; + license = lib.licenses.lgpl2; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index b434848006a1..265b631e1125 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "grpcio"; - version = "1.12.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "0dsw58aimr8yyb6cgdvs7b7jc0rz2k9vhrsfglg2h7bmh83izzg1"; + sha256 = "f14faadfd09aa8526536cd2149e274563f45b767fca1736ccc53803a6af3f90e"; }; propagatedBuildInputs = [ six protobuf ] diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 08f547d835da..5ceadcc0f91b 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -3,11 +3,11 @@ nose, shouldbe, gss, krb5Full, which, darwin }: buildPythonPackage rec { pname = "gssapi"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "be8f37dd9da726db375b9c693e0a63b391d381d903516e79ecc2a2cc965580e4"; + sha256 = "be715cb74ac56db2dd888b016097aaa29ab7d7d34c1f8c706ff63f76b3553f71"; }; # It's used to locate headers diff --git a/pkgs/development/python-modules/guessit/2.0.nix b/pkgs/development/python-modules/guessit/2.0.nix index c8f30746310a..3c85898ffbf9 100644 --- a/pkgs/development/python-modules/guessit/2.0.nix +++ b/pkgs/development/python-modules/guessit/2.0.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "guessit"; - version = "2.1.4"; + version = "3.0.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56"; + sha256 = "bf17e78783cf13bf903750770de4c3bb6c9ca89baafedb1612794660b6ebe32b"; }; # Tests require more packages. diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 77c45d12335b..fa68994ace96 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "guessit"; - version = "2.1.4"; + version = "3.0.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56"; + sha256 = "bf17e78783cf13bf903750770de4c3bb6c9ca89baafedb1612794660b6ebe32b"; }; # Tests require more packages. diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 89af8596edbc..efc42dedc655 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -1,20 +1,20 @@ -{ stdenv, buildPythonPackage, fetchurl +{ stdenv, buildPythonPackage, fetchPypi , pytest, mock, pytestcov, coverage }: buildPythonPackage rec { pname = "gunicorn"; - version = "19.7.1"; - name = "${pname}-${version}"; + version = "19.8.1"; - src = fetchurl { - url = "mirror://pypi/g/gunicorn/${name}.tar.gz"; - sha256 = "eee1169f0ca667be05db3351a0960765620dad53f53434262ff8901b68a1b622"; + src = fetchPypi { + inherit pname version; + sha256 = "bc59005979efb6d2dd7d5ba72d99f8a8422862ad17ff3a16e900684630dd2a10"; }; - buildInputs = [ pytest mock pytestcov coverage ]; + checkInputs = [ pytest mock pytestcov coverage ]; prePatch = '' - substituteInPlace requirements_test.txt --replace "==" ">=" + substituteInPlace requirements_test.txt --replace "==" ">=" \ + --replace "coverage>=4.0,<4.4" "coverage" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix index ade4111c5a3b..3899be92b1e9 100644 --- a/pkgs/development/python-modules/hbmqtt/default.nix +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k , transitions, websockets, passlib, docopt, pyyaml, nose }: buildPythonPackage rec { @@ -12,6 +12,13 @@ buildPythonPackage rec { sha256 = "6f61e05007648a4f33e300fafcf42776ca95508ba1141799f94169427ce5018c"; }; + patches = [ + (fetchpatch { + url = "https://github.com/beerfactory/hbmqtt/commit/75a85d1ea4cb41f2a15f2681d3114da7158942ae.patch"; + sha256 = "0bl4v5zxp4kz2w7riwrx48f7yqmp7pxg79g9qavkda0i85lxswnp"; + }) + ]; + propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix index 8acaf9f06376..bb200139496d 100644 --- a/pkgs/development/python-modules/hglib/default.nix +++ b/pkgs/development/python-modules/hglib/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "python-hglib"; - version = "2.5"; + version = "2.6.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "fee180bb6796e5d2d25158b2d3c9f048648e427dd28b23a58d369adb14dd67cb"; + sha256 = "7c1fa0cb4d332dd6ec8409b04787ceba4623e97fb378656f7cab0b996c6ca3b2"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix index 7283a5022681..b2633e6c9d24 100644 --- a/pkgs/development/python-modules/hiro/default.nix +++ b/pkgs/development/python-modules/hiro/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, six, mock }: buildPythonPackage rec { pname = "hiro"; - version = "0.1.9"; + version = "0.5"; src = fetchPypi { inherit pname version; - sha256 = "3b19abd8873880ad59575788279731c07838e803c4f31d62410920fa6b1f95d5"; + sha256 = "57d9dac63077f24c3d0132c02ac5c71e4bd1d79bdac30dccad4c83fadd49fa1c"; }; propagatedBuildInputs = [ six mock ]; diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index 9bcb61751de4..37f491a550f3 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.1"; + version = "1.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "e18037fa43fb4af7c00bd262ca6f5d7bcd22debd5d71e43b0fb1437f56e78035"; + sha256 = "20387760e4d32bd4813c2cabc8e51d92b2c22c546102a0af182c33c152cd7ede"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 8bc54e9226cf..862d7af91f0a 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2c9308334301daee3b5c6d56a032ca2c81eeb97d2777b73d795e201e8d037687"; + sha256 = "e7b8425ce36894cda8b8ed3387a47119edc517302e6a72942602df54a96ee453"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix index 22f4ba9301f8..eb4b859c2f64 100644 --- a/pkgs/development/python-modules/ibmquantumexperience/default.nix +++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "IBMQuantumExperience"; - version = "1.9.1"; + version = "1.9.6"; src = fetchPypi { inherit pname version; - sha256 = "480cce2ca285368432b7d00b9cd702a4f8a1c9d69914ba6f65e08099e151e407"; + sha256 = "83baa3c88979df67e7be929b147d253cffe45a7f7f5657f87fbe945819e9ce24"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index e66700d87ee0..9ce3ba3f6680 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "idna"; - version = "2.6"; + version = "2.7"; src = fetchPypi { inherit pname version; - sha256 = "2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f"; + sha256 = "684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16"; }; meta = { diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix index 975353406ca9..64fc707b8fd8 100644 --- a/pkgs/development/python-modules/immutables/default.nix +++ b/pkgs/development/python-modules/immutables/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "immutables"; - version = "0.5"; + version = "0.6"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1hba0vkqanwfnb5b3rs14bs7schsmczhan5nd93c1i6fzi17glap"; + sha256 = "63023fa0cceedc62e0d1535cd4ca7a1f6df3120a6d8e5c34e89037402a6fd809"; }; meta = { diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index e4765a29e835..4b3481d7528e 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "6.1.1"; + version = "6.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f1e03ebb8d17f67f03bafa5d85f220883462f7bd7a97fe904c7d56ffba8534a3"; + sha256 = "9afb0001d6fa2eca9340e9daab5da021db05211987868f47ab5b305d701cb12d"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index d44a708befb2..2c0e4aaf4db6 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "ipython"; - version = "6.3.1"; + version = "6.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a6ac981381b3f5f604b37a293369963485200e3639fb0404fa76092383c10c41"; + sha256 = "eca537aa61592aca2fef4adea12af8e42f5c335004dfa80c78caf80e8b525e5c"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index a43dbf737167..eed6a8b979b4 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "7facd437d27365e217787e1013ecdc402aa77af7248e16128f6a753920000905"; + sha256 = "ac5646460defa5bf3d062504d870954c77d6234536365baf52433fb845b620d0"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jdcal/default.nix b/pkgs/development/python-modules/jdcal/default.nix index d3ed32c0882f..7b235b446391 100644 --- a/pkgs/development/python-modules/jdcal/default.nix +++ b/pkgs/development/python-modules/jdcal/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jdcal"; - version = "1.3"; + version = "1.4"; src = fetchPypi { inherit pname version; - sha256 = "b760160f8dc8cc51d17875c6b663fafe64be699e10ce34b6a95184b5aa0fdc9e"; + sha256 = "ea0a5067c5f0f50ad4c7bdc80abad3d976604f6fb026b0b3a17a9d84bb9046c9"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index db83e6cb2991..c18b6c5cac47 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "0.5.6"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "887a9a49d0caee913a883c3e7eb185f6260ebe2137562365be422d1316bd39c9"; + sha256 = "5104e45a2b804b48a46a92a5e6d6e86830fe60ae83b1da32c867402c8f4c2094"; }; checkInputs = [ pytest unicodecsv ]; diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 541455642ef5..f968b9fbd9f5 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1k0ahzzaq2rrjiifwbhbp7vm8z4zk0ipgiqwicil80kzlf6bhj4z"; + sha256 = "fb5c62c77d26e04df29cb5ecd01b9ce69b6fcc9e521eb1ca193b7faa2afa7086"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index 9d4331c8ea80..fd31dc93fbfa 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsondiff"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "2d0437782de9418efa34e694aa59f43d7adb1899bd9a793f063867ddba8f7893"; + sha256 = "7e18138aecaa4a8f3b7ac7525b8466234e6378dd6cae702b982c9ed851d2ae21"; }; # No tests diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 992780ef33d3..f72bec57e90b 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.1.7"; + version = "2.1.8"; src = fetchPypi { inherit pname version; - sha256 = "95a037cdd05618a189517357e46a06886909a18c7923b628c6ac43d5f54b2912"; + sha256 = "daa62e5abfc66ef12e4fb43a1c264673e662e6f2d937cd10666c1c6dcf2ac6ac"; }; diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 02348c68e07a..8a228bebb0b0 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupyterhub-ldapauthenticator"; - version = "1.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "19dz3a3122wln8lkixj5jbh9x3cqlrcb3p7a53825cj72cmpcxwz"; + sha256 = "5bba2ee246834130c9f86c13d39585b1af21563b814fa03aacb26b6696dd7e20"; }; # No tests implemented diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 4cf69a1114e7..64485085d1a8 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, isPy3k, fetchPypi, ipython_genutils, jupyterlab_launcher, notebook }: buildPythonPackage rec { pname = "jupyterlab"; - version = "0.31.12"; + version = "0.32.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1hp6p9bsr863glildgs2iy1a4l99m7rxj2sy9fmkxp5zhyhqvsrz"; + sha256 = "88290656a2db2e38ef913a257ec283f3b5bd99144ed3d52899c9af7030077554"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index f5590e11120b..be59a112be74 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.1.6"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "c14af1081242c25617ade7eb62121d58d01f16e1e744bae9fc4f1f95a417716e"; + sha256 = "5b8499d157af217f1a5ee33589e774127ebc3e266c833c22cb5afbb0ed1734bf"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 5566eea64eb8..9d91fdc9679d 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "5.0.0"; + version = "6.0.0"; prePatch = '' sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1z8rrlq73bzli9rg57kj8ivz09vhsydyjq1ksbcis6j7h9c187zq"; + sha256 = "b370ab4abd925309db69a14a4723487948e9a83de60ca92782ec14992b741c89"; }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index c039bcc043a2..95672600a30a 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "python-ldap"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "86746b912a2cd37a54b06c694f021b0c8556d4caeab75ef50435ada152e2fbe1"; + sha256 = "41975e79406502c092732c57ef0c2c2eb318d91e8e765f81f5d4ab6c1db727c5"; }; propagatedBuildInputs = [ pyasn1 pyasn1-modules ]; diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index a58090680cd9..24690d9d5302 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }: buildPythonPackage rec { - version = "2.4.1"; + version = "2.5"; pname = "ldap3"; src = fetchPypi { inherit pname version; - sha256 = "1a66pc00az0nx9kvhzidbg099pvk52ngycf891bp5jyfm1ahvzp8"; + sha256 = "55078bbc981f715a8867b4c040402627fdfccf5664e0277a621416559748e384"; }; buildInputs = [ gssapi ]; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index b420e7149d75..4d702f166114 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.22.0"; + version = "0.23.2"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "a0a875f3d502f41f4a24444aa98fbf076a6bf36e2a0b3b4481b22e1c4a3acdc2"; + sha256 = "1e63f317b8fb3679d3a397920b1e8bade2d5f471f6c60c7e9bf97746f616f79e"; }; propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix index dc40101284c0..f2fb4d3614a1 100644 --- a/pkgs/development/python-modules/luftdaten/default.nix +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "luftdaten"; - version = "0.1.4"; + version = "0.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "d3e3af830ad2b731c36af223bbb5d47d68aa3786b2965411216917a7381e1179"; + sha256 = "75fb177f61904dd1a7f93c1fa6c7cd468fd4a2e04ca45a87d37c802d290d17ad"; }; propagatedBuildInputs = [ aiohttp async-timeout ]; diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index f909974db6b3..b3c43836e42d 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "marionette-harness"; - version = "4.3.0"; + version = "4.5.0"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a98bb65a0c63f60d9e3d7ef21dabc9c29676917dc2ec0d46851a3ed694c820cc"; + sha256 = "241c7f6032d01b0d78f5c0d13ea691935ddce9f8fce991319cc4fe860d61a7c4"; }; propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index 4315b08e016f..49f25e96bdca 100644 --- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "marionette_driver"; - version = "2.5.0"; + version = "2.7.0"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0axhdin9ys3i9lnwqqqw87wap9000bk6cdgrzpd2gqricc7l3v65"; + sha256 = "15c77ba548847dc05ce1b663a22c3324623f217dce5a859c3aaced31fd16707b"; }; propagatedBuildInputs = [ mozversion mozrunner ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index af26c8d071d6..3f7218a276d7 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mozdevice"; - version = "0.52"; + version = "1.0.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5b6fcbc7179c0f09bd99f7f7c42b614bce5f39543fb18b190e408488f987d6b5"; + sha256 = "c3c50219127e36c171f84b2427e8fcf3a85457f336559aead9770b2a27fbc4b6"; }; propagatedBuildInputs = [ moznetwork mozprocess ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix index a783c125af3a..0ff0461c558d 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "mozprofile"; - version = "0.29"; + version = "1.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "92af4b9f527a18997dccb60e846e1844b2428668dadf3ccb1a8cd30c706b25c1"; + sha256 = "aa7fe7248719a224dd63cdc0498c9971d07cfc62fee7a69f51d593316b6bc1d8"; }; propagatedBuildInputs = [ mozlog mozfile mozhttpd ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index 51344a8a95a5..5e5144e25402 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "mozrunner"; - version = "6.15"; + version = "7.0.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "985d4d4cf7597f09ed1b42165997d966fa35b0130a7a6bbcb2c71ecd5f4c453f"; + sha256 = "a4e3d532d1d7eb34b6332e0568612ebac3f56da849894005b3dbe68968e5d292"; }; propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 656f7f44f965..c07340987975 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; name = "${pname}-${version}"; - version = "0.13.2"; + version = "0.14.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9804ef2829f781f469a06528d107c2a763f109c687266ab8b1f000f9684184ae"; + sha256 = "32ff19350a8892b3e8dc954eeeac796576bb89356512f9e1ccd33da63f856930"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 20af252f58f6..d0b01f94b45f 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "matrix-client"; - version = "0.0.6"; + version = "0.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "15kx5px26hwr0sxpyjk4w61fjnabg1b57hwys1nyarc0jx4qjhiq"; + sha256 = "b96e87adf1bc2270166b2a4cff1320d2ef283779ea8b3c4edd0d9051fc7b7924"; }; checkInputs = [ tox pytest flake8 responses ]; diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix new file mode 100644 index 000000000000..e53098f6f232 --- /dev/null +++ b/pkgs/development/python-modules/monty/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, nose, numpy, six, ruamel_yaml, msgpack-python, coverage, coveralls, pymongo, lsof }: + +buildPythonPackage rec { + pname = "monty"; + version = "1.0.2"; + + # No tests in Pypi + src = fetchFromGitHub { + owner = "materialsvirtuallab"; + repo = pname; + rev = "v${version}"; + sha256 = "0ss70fanavqdpj56yymj06lacgnknb4ap39m2q28v9lz32cs6xdg"; + }; + + propagatedBuildInputs = [ nose numpy six ruamel_yaml msgpack-python coverage coveralls pymongo lsof ]; + + preCheck = '' + substituteInPlace tests/test_os.py \ + --replace 'def test_which(self):' '#' \ + --replace 'py = which("python")' '#' \ + --replace 'self.assertEqual(os.path.basename(py), "python")' '#' \ + --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' \ + --replace 'self.assertIs(which("non_existent_exe"), None)' '#' \ + ''; + + meta = with stdenv.lib; { + description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems"; + longDescription = " + Monty implements supplementary useful functions for Python that are not part of the + standard library. Examples include useful utilities like transparent support for zipped files, useful design + patterns such as singleton and cached_class, and many more. + "; + homepage = https://github.com/materialsvirtuallab/monty; + license = licenses.mit; + maintainers = with maintainers; [ psyanticy ]; + }; +} + diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index e618f039ebdf..6a58a6a8a281 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "4.0.1"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0cadwsr97c80k18if7qy5d8j8l1zj3yhnkm6kbngk0lpl7pxq8ax"; + sha256 = "2b6b9893337bfd9166bee6a62c2b0c9fe7735dcf85948b387ec8cba30e85d8e8"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index e268e92cc42e..e4b2bdefad20 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -17,7 +17,8 @@ buildPythonPackage rec { # regarding aws-xray-sdk: https://github.com/spulec/moto/commit/31eac49e1555c5345021a252cb0c95043197ea16 substituteInPlace setup.py \ --replace "python-dateutil<2.7.0" "python-dateutil<3.0.0" \ - --replace "aws-xray-sdk<0.96," "aws-xray-sdk" + --replace "aws-xray-sdk<0.96," "aws-xray-sdk" \ + --replace "jsondiff==1.1.1" "jsondiff>=1.1.1" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 38facc966589..f850e58570e7 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "multidict"; - version = "4.1.0"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0liazqlyk2nmr82nhiw2z72j7bjqxaisifkj476msw140d4i4i7v"; + sha256 = "5ba766433c30d703f6b2c17eb0b6826c6f898e5f58d89373e235f07764952314"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 3e4b0d1368b7..e32c712560a5 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "natsort"; - version = "5.2.0"; + version = "5.3.2"; checkInputs = [ hypothesis @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c960082d2145b04723041c4b85092546560538e29664dd197a1344d5b090bc91"; + sha256 = "94056276c41be501d9fad3ade61d4eb4edf3b37fea53829b3294b75dc1d23708"; }; # testing based on project's tox.ini diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 67df4403f980..0baa323d53c2 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -1,23 +1,25 @@ -{ stdenv, buildPythonPackage, fetchurl, isPyPy -, numpy, zlib, netcdf, hdf5, curl, libjpeg, cython +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest +, numpy, zlib, netcdf, hdf5, curl, libjpeg, cython, cftime }: buildPythonPackage rec { pname = "netCDF4"; - name = "${pname}-${version}"; - version = "1.3.1"; + version = "1.4.0"; disabled = isPyPy; - src = fetchurl { - url = "mirror://pypi/n/netCDF4/${name}.tar.gz"; - sha256 = "570ea59992aa6d98a9b672c71161d11ba5683f787da53446086077470a869957"; + src = fetchPypi { + inherit pname version; + sha256 = "a6c0b46f410f101c09d60b8cc460aafec06732f0130c6cb2730717bcc605b388"; }; + checkInputs = [ pytest ]; + buildInputs = [ cython ]; propagatedBuildInputs = [ + cftime numpy zlib netcdf @@ -26,6 +28,13 @@ buildPythonPackage rec { libjpeg ]; + checkPhase = '' + py.test test/tst_*.py + ''; + + # Tests need fixing. + doCheck = false; + # Variables used to configure the build process USE_NCCONFIG="0"; HDF5_DIR="${hdf5}"; diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index 412d42bafddd..af7e4dde59e3 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "netdisco"; - version = "1.4.0"; + version = "1.5.0"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = pname; rev = version; - sha256 = "0q1cl76a0fwxm80lkk7cpd4p23r2bvf1a45nb7n61cgzrqcv43q1"; + sha256 = "1lr0zpzdjkhcaihyxq8wv7c1wjm7xgx2sl8xmwp1kyivkgybk6n9"; }; propagatedBuildInputs = [ requests zeroconf netifaces ]; diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index ccbb59c44dc2..1adfe13dd13b 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "Nevow"; - version = "0.14.3"; + version = "0.14.4"; disabled = isPy3k; src = fetchPypi { inherit version pname; - sha256 = "0pid8dj3p8ai715n9a59cryfxrrbxidpda3f8hvgmfpcrjdmnmmb"; + sha256 = "2299a0d2a0c1312040705599d5d571acfea74df82b968c0b9264f6f45266cf6e"; }; propagatedBuildInputs = [ twisted ]; diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 7db4378a6e63..11770fa8461c 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "nibabel"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1h6nhi1s2ab7sdyyl3qjnvlw0kggcnam7vn4b3z56ay20596kvhw"; + sha256 = "bf34aeb0f7ca52dc528ae4f842607cea307b334163857ff1d64d43068f637ada"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index ef4473e4066f..93871d9a9a7e 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.4.1"; + version = "0.4.2"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "c2ef16d357d24699abced07e89a50d465c8fbaa8537f1a9d4d5cb8a612926dbc"; + sha256 = "5049363eb6da2e7c35589477dfc79bf69929ca66de2d7ed2e9dc07acf78636f4"; }; checkPhase = "nosetests --exclude with_expand_user nilearn/tests"; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 372eeeec94a2..ccfd35dc646b 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -33,11 +33,11 @@ assert !isPy3k -> configparser != null; buildPythonPackage rec { pname = "nipype"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "17850c2a34f10f93d12c994101ce86b5a0b7e939e5b854e9f9920c9513cc8e76"; + sha256 = "4c3c1eb15fc016457525d1f7eb701d1bbe595eb48a036ae8dc2d21b843f9e525"; }; # see https://github.com/nipy/nipype/issues/2240 diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 37c5774bba25..15f93878ab71 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.4.1"; + version = "5.5.0"; src = fetchPypi { inherit pname version; - sha256 = "01l6yp78sp27vns4cxh8ybr7x0pixxn97cp0i3w6s0lv1v8l6qbx"; + sha256 = "fa915c231e64a30d19cc2c70ccab6444cbaa93e44e92b5f8233dd9147ad0e664"; }; LC_ALL = "en_US.utf8"; @@ -46,6 +46,12 @@ buildPythonPackage rec { echo "" > setup.cfg ''; + postPatch = '' + # Remove selenium tests + rm -rf notebook/tests/selenium + + ''; + checkPhase = '' runHook preCheck mkdir tmp diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index e62fff7bca35..33d044c41aa0 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.37.0"; + version = "0.38.1"; pname = "numba"; src = fetchPypi { inherit pname version; - sha256 = "c62121b2d384d8b4d244ef26c1cf8bb5cb819278a80b893bf41918ad6d391258"; + sha256 = "48fb76b8dcde868d6426c7c7836b76a0b2b20861547770c27b6307f712c09bc5"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 3d64863c30d9..d6531eda2ef1 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "numpy"; - version = "1.14.3"; + version = "1.14.5"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9016692c7d390f9d378fc88b7a799dc9caa7eb938163dda5276d3f3d6f75debf"; + sha256 = "a4a433b3a264dbc9aa9c7c241e87c0358a503ea6394f8737df1683c7c9a102ac"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix index d1aaebee5c0c..6b50a2c96866 100644 --- a/pkgs/development/python-modules/openidc-client/default.nix +++ b/pkgs/development/python-modules/openidc-client/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "openidc-client"; - version = "0.5.0"; + version = "0.6.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "59d59d6fbfd26c5b57c53e582bdf2379274602f96133a163e7ff1ef39c363353"; + sha256 = "680e969cae18c30adbddd6a087ed09f6a296b4937b4c8bc69be813bdbbfa9847"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 09e3bde6f8af..0ad105a5158b 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.5.3"; + version = "2.5.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0046fca88d6731875a385bf7edd689d7c4133f829203ea615a81291de3fa48b6"; + sha256 = "9239b74faf175dc4276a5fc277655fc53c2f704ded39e680d35e6a39e1913f69"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index 370378f097a4..01f5595fea10 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -1,9 +1,9 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy3k -, bitcoinlib, GitPython, pysha3 }: +, bitcoinlib, GitPython, pysha3, git }: buildPythonPackage rec { pname = "opentimestamps"; - version = "0.3.0"; + version = "0.4.0"; disabled = (!isPy3k); # We can't use the pypi source because it doesn't include README.md which is @@ -12,15 +12,16 @@ buildPythonPackage rec { owner = "opentimestamps"; repo = "python-opentimestamps"; rev = "python-opentimestamps-v${version}"; - sha256 = "1i843mbz4h9vqc3y2x09ix6bv9wc0gzq36zhbnmf5by08iaiydks"; + sha256 = "165rj08hwmbn44ra9n0cj5vfn6p49dqfn5lz2mks962mx19c7l0m"; }; # Remove a failing test which expects the test source file to reside in the # project's Git repo - patchPhase = '' + postPatch = '' rm opentimestamps/tests/core/test_git.py ''; + checkInputs = [ git ]; propagatedBuildInputs = [ bitcoinlib GitPython pysha3 ]; meta = { diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix index 274cf1b28343..02b8211a256d 100644 --- a/pkgs/development/python-modules/pandas/0.17.1.nix +++ b/pkgs/development/python-modules/pandas/0.17.1.nix @@ -27,12 +27,12 @@ let inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; - version = "0.22.0"; + version = "0.17.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "44a94091dd71f05922eec661638ec1a35f26d573c119aa2fad964f10a2880e6c"; + sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index cb497742e47a..08fdddb73467 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -24,20 +24,23 @@ }: let - inherit (stdenv.lib) optional optionalString concatStringsSep; + inherit (stdenv.lib) optional optionals optionalString concatStringsSep; inherit (stdenv) isDarwin; + in buildPythonPackage rec { pname = "pandas"; - version = "0.22.0"; - name = "${pname}-${version}"; + version = "0.23.1"; src = fetchPypi { inherit pname version; - sha256 = "44a94091dd71f05922eec661638ec1a35f26d573c119aa2fad964f10a2880e6c"; + sha256 = "50b52af2af2e15f4aeb2fe196da073a8c131fa02e433e105d95ce40016df5690"; }; LC_ALL = "en_US.UTF-8"; - buildInputs = [ pytest glibcLocales ] ++ optional isDarwin libcxx; + + checkInputs = [ pytest glibcLocales moto ]; + + buildInputs = [] ++ optional isDarwin libcxx; propagatedBuildInputs = [ cython dateutil @@ -55,8 +58,6 @@ in buildPythonPackage rec { xlwt ]; - patches = [ ./pandas-0.22.0-pytest-3.5.1.patch ]; - # For OSX, we need to add a dependency on libcxx, which provides # `complex.h` and other libraries that pandas depends on to build. postPatch = optionalString isDarwin '' @@ -67,7 +68,24 @@ in buildPythonPackage rec { "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" ''; - checkInputs = [ moto ]; + + disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([ + # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat + # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case + "test_fallback_plural" + "test_ambiguous_flags" + "test_ambiguous_compat" + # Locale-related + "test_names" + "test_dt_accessor_datetime_name_accessors" + "test_datetime_name_accessors" + # Can't import from test folder + "test_oo_optimizable" + ] ++ optionals isDarwin [ + "test_locale" + "test_clipboard" + ]); + checkPhase = '' runHook preCheck '' @@ -80,13 +98,7 @@ in buildPythonPackage rec { chmod a+x pbcopy pbpaste export PATH=$(pwd):$PATH '' + '' - # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat - # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case - py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network \ - -k "not test_fallback_plural and \ - not test_ambiguous_flags and \ - not test_ambiguous_compat \ - ${optionalString isDarwin "and not test_locale and not test_clipboard"}" + py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network -k "$disabledTests" runHook postCheck ''; diff --git a/pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch b/pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch deleted file mode 100644 index cba71b91316a..000000000000 --- a/pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/pandas/tests/io/test_pytables.py -+++ b/pandas/tests/io/test_pytables.py -@@ -5028,8 +5028,8 @@ class TestHDFStore(Base): - with ensure_clean_path(self.path) as path: - with catch_warnings(record=True): - with pytest.raises( -- ValueError, msg=("cannot have non-object label " -- "DataIndexableCol")): -+ ValueError, message=("cannot have non-object label " -+ "DataIndexableCol")): - df.to_hdf(path, 'df', format='table', - data_columns=True) - diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 43ea5829d5a6..ae07942be127 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pbr"; - version = "4.0.3"; + version = "4.0.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "6874feb22334a1e9a515193cba797664e940b763440c88115009ec323a7f2df5"; + sha256 = "a9c27eb8f0e24e786e544b2dbaedb729c9d8546342b5a6818d8eda098ad4340d"; }; # circular dependencies with fixtures diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index 373bedaa1100..07e477b11d7b 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "0.1.13"; + version = "0.1.14"; buildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "784928038588059e00c7f97e5608047cb754b6ec8fd10e7551e7ad0f40d2cd56"; + sha256 = "2926ebbf327e909d594619e520a1986c18d0cf60ae62acc7ebc503ccdef21f0f"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index f603c98e6d87..58193590308e 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pendulum"; - version = "1.4.4"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "601e52cb0425e94b1784b6613a9085e0066ae1fa1915d18771884b67e93cac5c"; + sha256 = "544e44d8a92954e5ef4db4fa8b662d3282f2ac7b7c2cbf4227dc193ba78b9e1e"; }; propagatedBuildInputs = [ dateutil pytzdata tzlocal ]; diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix index b064b9037e90..ced7a0163d52 100644 --- a/pkgs/development/python-modules/pexpect/default.nix +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pexpect"; - version = "4.4.0"; + version = "4.6.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "67b85a1565968e3d5b5e7c9283caddc90c3947a2625bed1905be27bd5a03e47d"; + sha256 = "2a8e88259839571d1251d278476f3eec5db26deb73a70be5ed5dc5435e418aba"; }; # Wants to run pythonin a subprocess diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 12f4b76746e6..29d1866d4ea2 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.9.6"; + version = "8.9.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "eec334a7908746b675a0ba296b3a11322ed970614b62f2a6e5f086de4f3e2a84"; + sha256 = "7813a9d45f0d1386a23552072af20a3ef34fa34f76eeb9033743ff083f9551e1"; }; meta = { diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 926b625f7006..89b0d56a4016 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -28,16 +28,12 @@ buildPythonPackage rec { "test_editable_package" "test_input_file_without_extension" "test_locally_available_editable_package_is_not_archived_in_cache_dir" + "test_no_candidates" + "test_no_candidates_pre" ]; checkPhase = '' export HOME=$(mktemp -d) VIRTUAL_ENV=1 - tests_without_network_access=" - not test_realistic_complex_sub_dependencies - and not test_editable_package_vcs - and not test_generate_hashes_all_platforms - and not test_generate_hashes_without_interfering_with_each_other - " py.test -k "${disabledTests}" ''; diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix new file mode 100644 index 000000000000..b810213cce92 --- /dev/null +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, nose, pkgconfig }: + +buildPythonPackage rec { + pname = "pkgconfig"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "107x2wmchlch8saixb488cgjz9n6inl38wi7nxkb942rbaapxiqb"; + }; + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ pkgconfig ]; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + description = "Interface Python with pkg-config"; + homepage = https://github.com/matze/pkgconfig; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 09a465b96d7c..136f518beaaf 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "2.5.1"; + version = "2.7.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "9dd816c36271cf81d82c854fba866c743cbd8cc71f1c95384195307def859a69"; + sha256 = "f7305816a423fd899da20919282445703118aeece19a54fb97be4cbf302341f8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index 9d90c617fc16..fa1e75f6af87 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { name = "${pname}-${version}"; - version = "0.5"; + version = "0.7"; pname = "pluginbase"; buildInputs = [ pytest tox ]; src = fetchPypi { inherit pname version; - sha256 = "1palagrlszs4f4f5j6npzl4d195vclrlza3qr524z2h758j31y5l"; + sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 3559053481e1..c7c888f6a00e 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,20 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools_scm, tempora }: +, pytest, setuptools_scm, tempora, pytest-flake8 }: buildPythonPackage rec { pname = "portend"; - version = "2.2"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "bc48d3d99e1eaf2e9406c729f8848bfdaf87876cd3560dc3ec6c16714f529586"; + sha256 = "b7ce7d35ea262415297cbfea86226513e77b9ee5f631d3baa11992d663963719"; }; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest pytest-flake8 ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index 006b99518a88..e5ed9edc4f96 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "premailer"; name = "${pname}-${version}"; - version = "3.1.1"; + version = "3.2.0"; meta = { description = "Turns CSS blocks into style attributes "; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "fd07dadc47345f7d44a0587bd65a37c45886f19c44b3ec94904761e4b2d39124"; + sha256 = "ca97cec6115fea6590b49558c55d891996f9eb4da6490c7b60c3a8af4c8c0735"; }; buildInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index f357aec914a4..a2ce8b698b72 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.4.5"; + version = "5.4.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ebe293be36bb24b95cdefc5131635496e88b17fabbcf1e4bc9b5c01f5e489cfe"; + sha256 = "686e5a35fe4c0acc25f3466c32e716f2d498aaae7b7edc03e2305b682226bcf6"; }; # No tests in archive diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix index f5d1a9568c3e..3ff449037ea7 100644 --- a/pkgs/development/python-modules/pushover/default.nix +++ b/pkgs/development/python-modules/pushover/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-pushover"; - version = "0.3"; + version = "0.4"; src = fetchPypi { inherit pname version; - sha256 = "0xlghiqd9rsgn7jdhc8v1xh3xspssihrw1vyy85gvjzxa1ah19sk"; + sha256 = "dee1b1344fb8a5874365fc9f886d9cbc7775536629999be54dfa60177cf80810"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index 4656b99df0a0..bae2d393685f 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "py3exiv2"; - version = "0.2.1"; + version = "0.3.0"; name = "${pname}-${version}"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "06q7mlqy05c3jr61nmz93fxb6ilizfyggbh5sg0krwjap2sw1fr8"; + sha256 = "14626aaa83cae4cd3d54f51646a0fd048e8ee0e3caf205522b33020226da8c0e"; }; buildInputs = [ exiv2 boost ]; diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index 9cf9828635fb..48a14399e898 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -3,15 +3,16 @@ buildPythonPackage rec { pname = "py4j"; - version = "0.10.6"; + version = "0.10.7"; src = fetchPypi { inherit pname version; extension= "zip"; - sha256 = "10shayghsmcdr03w12a7sdm6vsxpjm8alw3ym3mr1hki45yarryk"; + sha256 = "721189616b3a7d28212dfb2e7c6a1dd5147b03105f1fc37ff2432acd0e863fa5"; }; - propagatedBuildInputs = [ ]; + # No tests in archive + doCheck = false; meta = with stdenv.lib; { description = "Py4J enables Python programs running in a Python interpreter to dynamically access Java objects in a Java Virtual Machine. Methods are called as if the Java objects resided in the Python interpreter and Java collections can be accessed through standard Python collection methods. Py4J also enables Java programs to call back Python objects."; diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index be82cc7bf026..483ad84eb664 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, stdenv, lxml, click, fetchPypi }: buildPythonPackage rec { - version = "0.3.7"; + version = "0.3.9"; pname = "pyaxmlparser"; src = fetchPypi { inherit pname version; - sha256 = "1spwr28sc6fc3cqdx2j2zq38qx889hixl4ahhf1nphpmrl39ypxr"; + sha256 = "af714d8adafcea776dd14cbd6d09f5d6d278f7ba333f540dde3b4c34f5f04784"; }; propagatedBuildInputs = [ lxml click ]; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index 0547a5d3ba04..60ab64655551 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pybase64"; - version = "0.3.1"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "c974bff394e16817596fab686a0c7deb4995a468b035b02a788b6dbfd1e6bdeb"; + sha256 = "d415057b17bd8acf65e7a2f5d25e468b5b39df3290c7d9dbb75c0785afbdf3cf"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 09cb4c2cdf98..9b5991a424c9 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; - version = "0.18.0"; + version = "0.19.0"; src = fetchPypi { inherit pname version; - sha256 = "1sl4jn8rildv6f62cab66w791cixhaaxl7gwg9labs099rl74yl6"; + sha256 = "23f2b760e352729208cd4fbadbc618bd00f95a0a24db21a4182833afcc3b5208"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index e90fc4b26366..d818df888226 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "2.1.0"; + version = "2.2.0"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pychromecast/${name}.tar.gz"; - sha256 = "a18fee9bf32f62fcb539783c3888e811015c1f6377bcdb383b13d6537691f336"; + sha256 = "7c3773c0e134e762fd65a3407e680ab4c5c656fe7c5665b2f8f5ef445c7605a4"; }; propagatedBuildInputs = [ requests six zeroconf protobuf ]; diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 35b10421f2c0..b074f9f4934e 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, numpy, isPy3k, dateutil, dateutil_1_5 }: +{ stdenv, fetchPypi, buildPythonPackage, numpy, isPy3k, dateutil }: buildPythonPackage rec { pname = "pycollada"; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 85024baa26e4..51ad4a5a5184 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, buildPythonPackage, gmp }: buildPythonPackage rec { - version = "3.5.1"; + version = "3.6.2"; pname = "pycryptodome"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; - sha256 = "b7957736f5e868416b06ff033f8525e64630c99a8880b531836605190b0cac96"; + sha256 = "b19ed0f7752a0b1ec65834c9acb02ba64a812990854e318d32a619c709b14a69"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index c5af0c91317e..6135cd75f24a 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; name = "${pname}-${version}"; - version = "3.5.1"; + version = "3.6.2"; meta = { description = "A self-contained cryptographic library for Python"; @@ -13,6 +13,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "bb60d38111ebc383a5a1c909545562926c66c846d03fc65ba7b8a3487cb23078"; + sha256 = "8ed51799f6c060b4f62459e1bd9f3b3855bec6fa68202e76639d628001fdf3b7"; }; } diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 27a9790dce0e..c437df9cd99c 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.43.0.1"; + version = "7.43.0.2"; disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - sha256 = "1ali1gjs9iliwjra7w0y5hwg79a2fd0f4ydvv6k27sgxpbr1n8s3"; + sha256 = "0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4"; }; buildInputs = [ curl openssl.out ]; diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index 6450cb7c70eb..5b5df40be6a4 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pydub"; - version = "0.21.0"; + version = "0.22.1"; src = fetchPypi { inherit pname version; - sha256 = "27acc5977b0f5220682175d44fda737bbf818143b0832c0c3863b5dde38e197a"; + sha256 = "20beff39e9959a3b2cb4392802aecb9b2417837fff635d2b00b5ef5f5326d313"; }; patches = [ diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index ea364c09b807..a8946857d88f 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.43"; + version = "0.1.44"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0b6f4f5c8ddca15e0a1df367bafdffb2f08f1e42f17c78b9470573287e5b20bc"; + sha256 = "09f928d33fefd1ef5d18325877d73d01c6811b6177fc97fc1190c20acc5e12a9"; }; # PyPI tarball does not include tests/ directory diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index e9b4db49dbd9..dc726fe928fa 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pylast"; - version = "2.1.0"; + version = "2.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b9b51dc40a7d3ac3eee17ab5b462b8efb7f2c2ff195261ea846ae4e1168e1c5b"; + sha256 = "f1e8615bac27386712ab74338e6dbd01ff7adbf6648a3debf921cef6bad80014"; }; propagatedBuildInputs = [ certifi six ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 5e053891164e..f6aec993c3c7 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pylint"; - version = "1.8.4"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "34738a82ab33cbd3bb6cd4cef823dbcabdd2b6b48a4e3a3054a2bbbf0c712be9"; + sha256 = "fff220bcb996b4f7e2b0f6812fd81507b72ca4d8c4d05daf2655c333800cb9b3"; }; buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix index 8d61c2bf9e98..600d6406405d 100644 --- a/pkgs/development/python-modules/pylti/default.nix +++ b/pkgs/development/python-modules/pylti/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "PyLTI"; - version = "0.5.1"; + version = "0.6.0"; disabled = !isPy27; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "32093d961bf95e508bf27667289155da1e082ed9989bb84a76c54c6974c941e1"; + sha256 = "b3203c5d0d8a527c092518d82d312757c036055ff628023985ab615ef471e602"; }; meta = { diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 308958abb6d0..015233fba8e6 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.2"; + version = "3.4.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0hpzhkpv7sbwkcva7x914yvzcf1d1a952ynbcx6mvlgv5lqghc39"; + sha256 = "b8fe2a1ca142674f1b5cbed05a0a54ce9dade5998370005ddcea349472e7fe2d"; }; # No need for coverage stats in Nix builds diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index ea557938d20f..ae89d4dfe204 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyobjc"; - version = "4.2.1"; + version = "4.2.2"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b156abab60da3f3c4bc65a919eabb2c98539a94163a277efba5828358396d23e"; + sha256 = "24be63e394e8e66c1131e2b8e67e44f6c28ceb4329af01e9c10824044be8adbc"; }; meta = { diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index f3054e3e4dd4..035c70f3995a 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pyOpenSSL"; - version = "17.5.0"; + version = "18.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2c10cfba46a52c0b0950118981d61e72c1e5b1aac451ca1bc77de1a679456773"; + sha256 = "6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 26606a580a4d..8175ef2b1725 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -11,6 +11,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; + # This may actually break the package. + postPatch = '' + substituteInPlace setup.py --replace "requests>=2.18.2,<2.19" "requests" + ''; + + # No tests in archive + doCheck = false; + meta = with lib; { description = "A Python wrapper around the OpenWeatherMap web API"; homepage = https://pyowm.readthedocs.io/; diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix index ae48eb629942..0a972d4864bb 100644 --- a/pkgs/development/python-modules/pyperclip/default.nix +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.6.1"; + version = "1.6.2"; pname = "pyperclip"; src = fetchPypi { inherit pname version; - sha256 = "03ce3e66e2a26a085f0e043236dedd78aaabf53a64dab9a216671f74ee272845"; + sha256 = "43496f0a1f363a5ecfc4cda5eba6a2a3d5056fe6c7ffb9a99fbb1c5a3c7dea05"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 6b33f7746f96..fad9f872add8 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.1"; + version = "0.5.2"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "e69dc81dc3f10ccb33186ddcce910e116b4e77304e93af4092567130bcd6df5c"; + sha256 = "42bf74495d95a0196a74dd171357f660175aba2bfc23f9b5f63e3830ccbef9ac"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 0a98ee02e581..72782c1c0291 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, buildPythonPackage, swig, pcsclite, PCSC }: buildPythonPackage rec { - version = "1.9.6"; + version = "1.9.7"; pname = "pyscard"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyscard/${name}.tar.gz"; - sha256 = "6e28143c623e2b34200d2fa9178dbc80a39b9c068b693b2e6527cdae784c6c12"; + sha256 = "412c74c83e7401566e9d3d7b8b5ca965e74582a1f33179b3c1fabf1da73ebf80"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix index 95ab0f339b06..e8de912c3754 100644 --- a/pkgs/development/python-modules/pyserial/default.nix +++ b/pkgs/development/python-modules/pyserial/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage, hostPlatform }: buildPythonPackage rec { pname = "pyserial"; @@ -11,6 +11,7 @@ buildPythonPackage rec { }; checkPhase = "python -m unittest discover -s test"; + doInstallCheck = !hostPlatform.isDarwin; # broken on darwin meta = with lib; { homepage = "https://github.com/pyserial/pyserial"; diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix new file mode 100644 index 000000000000..9e5097bafad8 --- /dev/null +++ b/pkgs/development/python-modules/pysolr/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, requests, mock }: + +buildPythonPackage rec { + pname = "pysolr"; + version = "3.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b2c5f920d1cabaff8b465447ee152c6985f120b5895f091cf7bf15ff71ade1dc"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ mock ]; + + doCheck = false; # requires network access + + meta = with lib; { + description = "Lightweight Python wrapper for Apache Solr"; + homepage = "http://github.com/toastdriven/pysolr/"; + license = licenses.bsd3; + }; +} + diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 3447c64cf6b8..b333ca27143c 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0vlq07yqy6c7ayg401i0qynnliqz405bmw1r8alkck0m1s8kcd8b"; + sha256 = "52d77a7ef43088b0235742cfcafc83435d0d98c5fdded1d8c600f1887e9e0213"; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix index 7fbda048ca33..5f0084a36b65 100644 --- a/pkgs/development/python-modules/pyspread/default.nix +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyspread"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "b90edb92c7fce3b8332cdddd3dd1c72ba14440ab39a10ca89c9888ad973a8862"; + sha256 = "ffdfd219450f5f22ee51eb633c04941d1d608e1ceb4d3357d07683b7e5b84f83"; }; propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ]; diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix index ed408feec811..675bd47481eb 100644 --- a/pkgs/development/python-modules/pyte/default.nix +++ b/pkgs/development/python-modules/pyte/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "pyte"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "1an54hvyjm8gncx8cgabz9mkpgjkdb0bkyjlkh7g7f94nr3wnfl7"; + sha256 = "7e71d03e972d6f262cbe8704ff70039855f05ee6f7ad9d7129df9c977b5a88c5"; }; propagatedBuildInputs = [ wcwidth ]; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 0918b5db1db2..e1ff0998396b 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,18 +1,20 @@ -{ stdenv, buildPythonPackage, fetchurl, pytest, isPy3k }: +{ stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pytest-asyncio"; version = "0.8.0"; disabled = !isPy3k; - src = fetchurl { - url = "mirror://pypi/p/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "f32804bb58a66e13a3eda11f8942a71b1b6a30466b0d2ffe9214787aab0e172e"; }; buildInputs = [ pytest ]; + # No tests in archive + doCheck = false; + meta = with stdenv.lib; { description = "library for testing asyncio code with pytest"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index 83fcdaf1b776..c8ae9882a1e7 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-flakes"; - version = "2.0.0"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "3e880927fd2a77d31715eaab3876196e76d779726c9c24fe32ee5bab23281f82"; + sha256 = "763ec290b89e2dc8f25f49d71cb9b869b8df843697b730233f61c78f847f2e57"; }; buildInputs = [ pytestpep8 pytest ]; diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index c1866f174ea2..758a2f194b25 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "0.1.0"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e92798127e21d22513c62070989f0fb3b712650e48a4db13e5b8e8034d367cfe"; + sha256 = "d4d195ecfe33d81e258d251b2679b32216bad84131fb41984da22d9d0328a6fe"; }; propagatedBuildInputs = [ pytestcache pytest isort ]; diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 9c906fe2fa4a..5931afa37e20 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "4.0"; + version = "4.1"; src = fetchPypi { inherit pname version; - sha256 = "18lpy6d9b4ck8j3jwh4vmxj54is0fwanpmpg70qg4y0fycdqzwks"; + sha256 = "be6bf93ed618c8899aeb6721c24f8009c769879a3b4931e05650f3c173ec17c5"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index d3a4e375ec3a..d1e40e5037e3 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pytest-timeout"; - version = "1.2.1"; + version = "1.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8"; + sha256 = "08b550b498b9251901a3747f02aa2624ed53a9c8285ca482551346c85b47d641"; }; buildInputs = [ pytest ]; checkInputs = [ pytest pexpect ]; diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index 596bae68ed07..ccb9ae782aa9 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-tornado"; - version = "0.4.5"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0b1r5im7qmbpmxhfvq13a6rp78sjjrrpysfnjkd9hggavgc75dr8"; + sha256 = "214fc59d06fb81696fce3028b56dff522168ac1cfc784cfc0077b7b1e425b4cd"; }; # package has no tests diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 8e6b73b9c5e1..d8d22ced974e 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,8 +1,9 @@ { stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools +, atomicwrites, mock }: buildPythonPackage rec { - version = "3.5.1"; + version = "3.6.2"; pname = "pytest"; preCheck = '' @@ -12,15 +13,21 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "54713b26c97538db6ff0703a12b19aeaeb60b5e599de542e7fca0ec83b9038e8"; + sha256 = "8ea01fc4fcc8e1b1e305252b4bc80a1528019ab99fd3b88666c9dc38d754406c"; }; - checkInputs = [ hypothesis ]; + checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools ] + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] ++ (stdenv.lib.optional (!isPy3k) funcsigs) ++ (stdenv.lib.optional isPy26 argparse); + checkPhase = '' + runHook preCheck + $out/bin/py.test -x testing/ + runHook postCheck + ''; + meta = with stdenv.lib; { maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 12b6bf929187..86e58d489a61 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "python-gnupg"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "0wzvx8y4ii1y1vch28a0m6f2y4px9r7qd8fpimsx6y5z4pfscm2s"; + sha256 = "2d158dfc6b54927752b945ebe57e6a0c45da27747fa3b9ae66eccc0d2147ac0d"; }; propagatedBuildInputs = [ gnupg1 ]; diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix new file mode 100644 index 000000000000..b2b103858cce --- /dev/null +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "python-periphery"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "fe8f351934edce72cd919b4eb070878ebff551db5e21aea61e0f446101f0a79f"; + }; + + # Some tests require physical probing and additional physical setup + doCheck = false; + + meta = { + homepage = https://github.com/vsergeev/python-periphery; + description = "Linux Peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) with Python 2 & 3"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bandresen ]; + }; +} diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 44a6b522a4ee..8e68570c5bfe 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, buildPythonPackage, isPy3k }: buildPythonPackage rec { - version = "1.8.1"; + version = "1.9"; pname = "python-stdnum"; name = "${pname}-${version}"; # Failing tests and dependency issue on Py3k disabled = isPy3k; src = fetchurl { url = "mirror://pypi/p/python-stdnum/${name}.tar.gz"; - sha256 = "d7162fdb29337aebed65700cc7297016f6cd32cae4ad7aed8f7e7531f0217943"; + sha256 = "d587a520182f9d8aef7659cca429f4382881589c8883a0a55322b2f94970bdb3"; }; meta = { homepage = http://arthurdejong.org/python-stdnum/; diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index a34924374819..31092705d0ff 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytools"; - version = "2018.3"; + version = "2018.4"; src = fetchPypi { inherit pname version; - sha256 = "26143e4ce415919272a5a8d05727bf5e026faa6536fe0ba85302e5b88ebae9f5"; + sha256 = "f9746ef763ce4d7d59ee8506ee83dd684884e4b520244b67f253095decc8a876"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 65f3d80bdaa7..734fbbba7179 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2018.3"; + version = "2018.4"; src = fetchPypi { inherit pname version; - sha256 = "410bcd1d6409026fbaa65d9ed33bf6dd8b1e94a499e32168acfc7b332e4095c0"; + sha256 = "c06425302f2cf668f1bba7a0a03f3c1d34d4ebeef2c72003da308b3947c7f749"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index a7c6b6db6b25..091b42115bf3 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytzdata"; - version = "2018.3"; + version = "2018.5"; src = fetchPypi { inherit pname version; - sha256 = "4e2cceb54335cd6c28caea46b15cd592e2aec5e8b05b0241cbccfb1b23c02ae7"; + sha256 = "e4ef42e82b0b493c5849eed98b5ab49d6767caf982127e9a33167f1153b36cc5"; }; # No tests diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 090358152e79..1eda590a864f 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "qiskit"; - version = "0.4.15"; + version = "0.5.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bd126a35189f8303df41cb7b7f26b0d06e1fabf61f4fd567b8ec356d31170141"; + sha256 = "a86014da4ea8fe057ad3b953b44e2342f2bae3e1f9ac0d5f5d51dd659c33accf"; }; buildInputs = [ cmake ] diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index aa3928db8911..4690dcc89bc8 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "readme_renderer"; - version = "18.1"; + version = "21.0"; src = fetchPypi { inherit pname version; - sha256 = "e18cab7f1b07412990df1b59e1be04e1538f514a5bba53ec8777bfc5aac27563"; + sha256 = "422404013378f0267ee128956021a47457db8eb487908b70b8a7de5fa935781a"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 234088d1f519..660f56e1660e 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2018.02.21"; + version = "2018.06.21"; src = fetchPypi { inherit pname version; - sha256 = "b44624a38d07d3c954c84ad302c29f7930f4bf01443beef5589e9157b14e2a29"; + sha256 = "b172583f0c5f104e059a30dd6a1f9d20693031b156558590a745d6cc3192e283"; }; postCheck = '' diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index ef87c4f10195..6bd294671dee 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "requests-mock"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "2931887853c42e1d73879983d5bf03041109472991c5b4b8dba5d11ed23b9d0b"; + sha256 = "a029fe6c5244963ef042c6224ff787049bfc5bab958a1b7e5b632ef0bbb05de4"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index 8674a05af38c..83a3590518c6 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -2,13 +2,13 @@ , oauthlib, requests }: buildPythonPackage rec { - version = "0.8.0"; + version = "1.0.0"; pname = "requests-oauthlib"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0s7lh5q661gjza1czlmibkrwf8dcj9qfqm3hs39sdbbyflbc8fl8"; + sha256 = "8886bfec5ad7afb391ed5443b1f697c6f4ae98d0e5620839d8b4499c032ada3f"; }; doCheck = false; # Internet tests fail when building in chroot diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index aeca2abf17cf..99d4b56b2b19 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "requests"; - version = "2.18.4"; + version = "2.19.1"; src = fetchPypi { inherit pname version; - sha256 = "0zi3v9nsmv9j27d0c0m1dvqyvaxz53g8m0aa1h3qanxs4irkwi4w"; + sha256 = "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index a13df64cd03e..08930ed4d460 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "restview"; name = "${pname}-${version}"; - version = "2.8.1"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "45320b4e52945d23b3f1aeacc7ff97a3b798204fe625f8b81ed5322326d5bcd1"; + sha256 = "de87c84f19526bd4a76505f6d40b51b7bb03ca43b6067c93f82f1c7237ac9e84"; }; propagatedBuildInputs = [ docutils readme_renderer pygments ]; diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index 6443a4e2bbfe..87a59cf73975 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -1,7 +1,6 @@ { lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "rlp"; version = "0.6.0"; @@ -10,7 +9,8 @@ buildPythonPackage rec { sha256 = "0d3gx4mp8q4z369s5yk1n9c55sgfw9fidbwqxq67d6s7l45rm1w7"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ ]; meta = { description = "A package for encoding and decoding data in and from Recursive Length Prefix notation"; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index c689bd482404..c6ece5f03038 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -16,12 +16,12 @@ }: buildPythonPackage rec { - version = "2.8.6"; + version = "2.9.3"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "004d13734a7b9a85cbc1e7a93ec87df741e28db1273ab5b0d9efaac04a9c5f98"; + sha256 = "1b72958e683339ea0c3bd9f73738e9ece2da8da8008a10e2e0c68fc7864e9361"; }; buildInputs = [ readline diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 37c7b157ea58..19ddbca4d03a 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "salmon-mail"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1smggsnkwiqy8zjq604dkm5g0np27pdnj3szsbn8v4ja84nncq18"; + sha256 = "452557172901d6227a325bbc72fcf61002a53c2342d935457b729303dce71f7e"; }; checkInputs = [ nose jinja2 mock ]; diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 2c8e63e5ed2f..2b40dfd42482 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "schema"; - version = "0.6.7"; + version = "0.6.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "410f44cb025384959d20deef00b4e1595397fa30959947a4f0d92e9c84616f35"; + sha256 = "fa1a53fe5f3b6929725a4e81688c250f46838e25d8c1885a10a590c8c01a7b74"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 9adac49bdcc8..5a0bf981684f 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "8739c67842ed9a1c34c62d6cca6301d0ade40d50ef14ba292bd331f0d6c940ba"; + sha256 = "878352408424dffaa695ffedf2f9f92844e116686923ed9aa8626fc30d32cfd1"; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index a612528d47ab..45db62db8e55 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.10.2"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "18f59e48df67fac0b069591609a0f4d50d781a101ddb8ec705f0c2e3501a8386"; + sha256 = "ea095dd1d0e131874bc9930c3965bce3d1d70be5adb2a30d811fcaea4708a9ee"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix new file mode 100644 index 000000000000..de17e65d2bfb --- /dev/null +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, numpy, future, spglib, glibcLocales }: + +buildPythonPackage rec { + pname = "seekpath"; + version = "1.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bdc0400c96952525b1165894807e4bec90aaedb11cfeb27a57414e6091eb026"; + }; + + LC_ALL = "en_US.utf-8"; + + propagatedBuildInputs = [ numpy spglib future ]; + + nativeBuildInputs = [ glibcLocales ]; + + meta = with stdenv.lib; { + description = "A module to obtain and visualize band paths in the Brillouin zone of crystal structures."; + homepage = https://github.com/giovannipizzi/seekpath; + license = licenses.mit; + maintainers = with maintainers; [ psyanticy ]; + }; +} + diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 972d8e90bf63..ea4781097220 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "39.0.1"; + version = "39.2.0"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bec7badf0f60e7fc8153fac47836edc41b74e5d541d7692e614e635720d6a7c7"; + sha256 = "f7cddbb5f5c640311eb00eab6e849f7701fa70bf6a183fc8a2c33dd1d1672fb2"; }; nativeBuildInputs = [ unzip wrapPython ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Utilities to facilitate the installation of Python packages"; homepage = https://pypi.python.org/pypi/setuptools; license = with licenses; [ psfl zpl20 ]; - platforms = platforms.all; + platforms = python.meta.platforms; priority = 10; }; } diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index 3e78c9b45bf6..137457e33c12 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "setuptools_scm"; name = "${pname}-${version}"; - version = "1.17.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "70a4cf5584e966ae92f54a764e6437af992ba42ac4bca7eb37cc5d02b98ec40a"; + sha256 = "a767141fecdab1c0b3c8e4c788ac912d7c94a0d6c452d40777ba84f918316379"; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 25dbecac9497..ccec686142ff 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.13.2"; + version = "3.15.0"; name = "${pname}-${version}"; doCheck = !stdenv.isDarwin; src = fetchPypi { inherit pname version; - sha256 = "4c4ecf20e054716cc1e5a81cadc44d3f4027108d8dd0861d8b1e3bd7a32d4f0a"; + sha256 = "ad332f65d9551ceffc132d0a683f4ffd12e4bc7538681100190d577ced3473fb"; }; meta = { diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 1596b276b0af..0c45592fc219 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -26,10 +26,10 @@ buildPythonPackage rec { pname = "Sphinx"; - version = "1.7.4"; + version = "1.7.5"; src = fetchPypi { inherit pname version; - sha256 = "e9b1a75a3eae05dded19c80eb17325be675e0698975baae976df603b6ed1eb10"; + sha256 = "d45480a229edf70d84ca9fae3784162b1bc75ee47e480ffe04a4b7f21a95d76d"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 4911c982cd06..8f3724e97cab 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "0.3.6"; + version = "0.4.0"; pname = "sphinxcontrib-bibtex"; src = fetchPypi { inherit pname version; - sha256 = "1mfl3k6axq6rzqwq62fj8y9gabim2zcvydjpqmjj27f8v1qw0kpc"; + sha256 = "cb9fb4526642fc080204fccd5cd8f41e9e95387278e17b1d6969b1e27c2d3e0c"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index fa308dc37bb0..2d778017a07a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-websupport"; - version = "1.0.1"; + version = "1.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7a85961326aa3a400cd4ad3c816d70ed6f7c740acd7ce5d78cd0a67825072eb9"; + sha256 = "9de47f375baf1ea07cdb3436ff39d7a9c76042c10a769c52353ec46e4e8fc3b9"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index abd9bd230d40..91a94a6e8419 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.7.7"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "f97119f84d339067169451d56043f37f6b0a504a17a7ac6e48c91c012be72af6"; + sha256 = "463e98135a85ff98f6c0084cb34cea1fe07827444958d224c087a84093a65281"; }; propagatedBuildInputs = [ selenium ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 882574aa675a..e8492843254b 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; name = "${pname}-${version}"; - version = "1.2.7"; + version = "1.2.8"; src = fetchPypi { inherit pname version; - sha256 = "d6cda03b0187d6ed796ff70e87c9a7dce2c2c9650a7bc3c022cd331416853c31"; + sha256 = "2d5f08f714a886a1382c18be501e614bce50d362384dc089474019ce0768151c"; }; checkInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { ] ++ lib.optional (!isPy3k) pysqlite; checkPhase = '' - py.test + py.test -k "not test_round_trip_direct_type_affinity" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 9a2aaeaa5538..c3780e6a7c7d 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.2.5"; + version = "1.2.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "93fe37e535f4aabd05a7456295f39c0af73cbcd0511750663fc7a718c5915919"; + sha256 = "a3649f9b5219b7336b82d3a1bf6e91c8d649171b96747b927a92ac075947d619"; }; # No tests in archive diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index f4c74cfccf81..b3beb404e754 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.8.0"; + version = "0.9.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "26431ab706fbae896db7870a0892743bfbb9f5c83231644692166a31d2d86048"; + sha256 = "6461f93a842c649922c2c9a9bc9d9c4834110b89de8c4af196a791ab8f42ba3b"; }; checkInputs = with self; [ nose ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 95da0ec9b4f8..07849b0f30c1 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "1.79.1"; + version = "1.82.2"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2ec19bf8ad588ec04b36c35f359196fa1991f9ad911b1686ac2a12651a154947"; + sha256 = "9d0443d772d176faba8c8e8a2ddc3a507861dd7d882b4a88cf6062b20fa5f224"; }; checkInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/subprocess32/default.nix b/pkgs/development/python-modules/subprocess32/default.nix index cb7a6fe2e868..e3fae7179c83 100644 --- a/pkgs/development/python-modules/subprocess32/default.nix +++ b/pkgs/development/python-modules/subprocess32/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "subprocess32"; - version = "3.2.7"; + version = "3.5.2"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1e450a4a4c53bf197ad6402c564b9f7a53539385918ef8f12bdf430a61036590"; + sha256 = "eb2b989cf03ffc7166339eb34f1aa26c5ace255243337b1e22dab7caa1166687"; }; buildInputs = [ bash ]; diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index 35600357d2cc..e647696c02b7 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "supervise_api"; - version = "0.5.3"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0dakc1h2ih1bw67y137wp0vph8d3y2lx5d70b8dgggy1zbpqxl1m"; + sha256 = "1230f42294910e83421b7d3b08a968d27d510a4a709e966507ed70db5da1b9de"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index d2346b7addbd..cc0336218341 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -2,13 +2,13 @@ , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc }: buildPythonPackage rec { - version = "3.4.3"; + version = "3.4.4"; pname = "tables"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/t/tables/${name}.tar.gz"; - sha256 = "b6aafe47154e2140c0a91bb38ebdb6ba67a24dd86263f1c294af8c11cb7deed4"; + sha256 = "bdc5c073712af2a43babd139c4855fc99496bb2c3f3f5d1b4770a985e6f9ce29"; }; buildInputs = [ hdf5 cython bzip2 lzo c-blosc ]; diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 2b9ef2e24a16..628be2e946af 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.0.2"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "f8827cfc91e5cc9ac669727fdd48a85880f391b935a0a212b5cedb807879feec"; + sha256 = "7e4df89a8bf8b8905464160f08aff131a36f0b33654fe4f9e4387afe546eae25"; }; checkInputs = [ mock manuel pytest sybil zope_component ]; diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index fc97297c0106..277d70cba6a4 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.2.1"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "c89dc0148ae29645917aab7e970a30d1af565b3ca276cef8ab1a60469f0d8100"; + sha256 = "0f75f5838b775bddc19f72c5bf50eb74be3815eb505ed3084e4666ce2e6c3259"; }; meta = { diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 62e0d28959a2..b58128200238 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -27,11 +27,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "6.10.2"; + version = "6.11.2"; src = fetchPypi { inherit pname version; - sha256 = "0xia81wvfrhyriywab184s49g8rpl42vcf5fy3x6xxw50a2yn7cs"; + sha256 = "028a014192e1914c151222794781d14e1c9fddf47a859aa36077f07871d0c30a"; }; postPatch = '' diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix index 94261b10e3d0..37d8f3a51343 100644 --- a/pkgs/development/python-modules/thumbor/default.nix +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -1,26 +1,19 @@ { buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz , pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors -, piexif, futures, statsd, thumborPexif, fetchPypi, fetchpatch, isPy3k, lib +, piexif, futures, statsd, thumborPexif, fetchPypi, isPy3k, lib }: buildPythonPackage rec { pname = "thumbor"; - version = "6.4.2"; + version = "6.5.1"; disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004 src = fetchPypi { inherit pname version; - sha256 = "0y9mf78j80vjh4y0xvgnybc1wqfcwm5s19xhsfgkn12hh8pmh14d"; + sha256 = "0yalqwpxb6m0dz2qfnyv1pqqd5dd020wl7hc0n0bvsvxg1ib9if0"; }; - patches = [ - (fetchpatch { - url = "https://github.com/thumbor/thumbor/commit/4f2bc99451409e404f7fa0f3e4a3bdaea7b49869.patch"; - sha256 = "0qqw1n1pfd8f8cn168718gzwf4b35j2j9ajyw643xpf92s0iq2cc"; - }) - ]; - postPatch = '' substituteInPlace "setup.py" \ --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''} diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 23ad1bc2624d..fb93339dfbf8 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.21.0"; + version = "4.23.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b94af236084ceaad93a6ada00bd9976900b172ec9b821828ed0d4b53f7431170"; + sha256 = "77b8424d41b31e68f437c6dd9cd567aebc9a860507cb42fbd880a5f822d966fe"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index a064a7c98b41..4a23a1b88cba 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "Twisted"; name = "${pname}-${version}"; - version = "17.9.0"; + version = "18.4.0"; src = fetchurl { url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; - sha256 = "0da1a7e35d5fcae37bc9c7978970b5feb3bc82822155b8654ec63925c05af75c"; + sha256 = "a4cc164a781859c74de47f17f0e85f4bce8a3321a9d0892c015c8f80c4158ad9"; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ]; diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 4abd97d24362..5558a7e339ad 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "txaio"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "dfc3a7d04b4b484ae5ff241affab5bb01306b1e950dd6f54fd036cfca94345d0"; + sha256 = "4797f9f6a9866fe887c96abc0110a226dd5744c894dc3630870542597ad30853"; }; checkInputs = [ pytest mock ]; @@ -22,6 +22,5 @@ buildPythonPackage rec { homepage = "https://github.com/crossbario/txaio"; license = licenses.mit; maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index 1b397f6c7379..cd004c59d4a4 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ua-parser"; - version = "0.7.3"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "1p8siba0rnb5nsl354fd5fc4751d5ybw7hgnd56yn8dncxdb1bqa"; + sha256 = "97bbcfc9321a3151d96bb5d62e54270247b0e3be0590a6f2ff12329851718dcb"; }; buildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index 129ad0ded6c7..34ff3a30b787 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "unittest-xml-reporting"; - version = "2.1.1"; + version = "2.2.0"; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1jwkqx5gfphkymp3xwqvlb94ng22gpbqh36vbbnsrpk1a0mammm6"; + sha256 = "3ba27af788bddb4403ee72561bfd3df2deb27a926a5426aa9beeb354c59b9c44"; }; meta = with lib; { homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 774de4d278ce..45c1428c6064 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "2.8.25"; + version = "2.8.33"; src = fetchPypi { inherit pname version; - sha256 = "8f790cb8a704b44ffd5efe5a9cb46204a042b55a9cddeb61434193cfd534275c"; + sha256 = "42b6482d085b699a534f0a3ec352e96d4653e31c8839855c8a852618f54e27d8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index 7cefccc5db0a..6835f8c48e0a 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "uritools"; - version = "2.1.1"; + version = "2.2.0"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "64369ece6f5c6ab18cba2cd0b199da40ffb9390493da1ff5c1d94b6ed107b401"; + sha256 = "80e8e23cafad54fd85811b5d9ba0fc595d933f5727c61c3937945eec09f99e2b"; }; propagatedBuildInputs = [ ipaddress ]; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 10021e14f126..6f8563ff155d 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.22"; + version = "1.23"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0kyvc9zdlxr5r96bng5rhm9a6sfqidrbvvkz64s76qs5267dli6c"; + sha256 = "a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf"; }; NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix index 6b14eebb310f..07cbdc57ef9e 100644 --- a/pkgs/development/python-modules/user-agents/default.nix +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -14,6 +14,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ ua-parser ]; + doCheck = false; # some tests fail due to ua-parser bump to 0.8.0 + meta = with stdenv.lib; { description = "A Python library to identify devices by parsing user agent strings"; homepage = https://github.com/selwin/python-user-agents; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 9387c7de792b..c47c67b9f657 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "1.11.1"; + version = "1.12.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f434fe7e05d940d576ac850709ae57a738ba40e7f317076ea8d359ced5b32320"; + sha256 = "13c6a835a6dc1ac96d7e6cae03587525eb260d7a46c6e5dd7a25416655eecb3a"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index beed65449148..8bd1cfd089e6 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "vega"; - version = "0.5.0"; + version = "1.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "9871bce3a00bb775d9f7f8212aa237f99f11ca7cfe6ecf246773f5559f20c38c"; + sha256 = "2c5561238fbd4a0669aea457decb47c5155e9741b47a41f23cc030387f725edc"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index ffb2bb761900..b53d3759cd8b 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "15.2.0"; + version = "16.0.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1d7e241b431e7afce47e77f8843a276f652699d1fa4f93b9d8ce0076fd7b0b54"; + sha256 = "ca07b4c0b54e14a91af9f34d0919790b016923d157afda5efdde55c96718f752"; }; # Doubt this is needed - FRidh 2017-07-07 diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index f24f10675f80..99de3ff35911 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -6,13 +6,13 @@ let pname = "websockets"; - version = "4.0.1"; + version = "5.0.1"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "da4d4fbe059b0453e726d6d993760065d69b823a27efc3040402a6fcfe6a1ed9"; + sha256 = "a49d315db5a7a19d55422e1678e8a1c3b9661d7296bef3179fa620cf80b12674"; }; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/websockets_client/default.nix b/pkgs/development/python-modules/websockets_client/default.nix index dd6e9200db52..846e9a2a0f53 100644 --- a/pkgs/development/python-modules/websockets_client/default.nix +++ b/pkgs/development/python-modules/websockets_client/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "websocket_client"; - version = "0.47.0"; + version = "0.48.0"; src = fetchPypi { inherit version pname; - sha256 = "0jb1446053ryp5p25wsr1hjfdzwfm04a6f3pzpcb63bfz96xqlx4"; + sha256 = "18f1170e6a1b5463986739d9fd45c4308b0d025c1b2f9b88788d8f69e8a5eb4a"; }; prePatch = '' diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index aeb267dd1dd7..039a751a5e14 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.10.4"; + version = "0.10.7"; src = fetchPypi { inherit pname version; - sha256 = "64c2d07b75b8ea1320cba521818a2f09107f5f46514d50ff5ef1c4d5da90aaf1"; + sha256 = "d87241580e3eccb961dfc16e804e1b92b3d6a8000ffee82ceb076767934342cc"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index c1914a034586..c8ba29fd8acd 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.21.0"; + version = "0.22.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7d8ae3567f3fb2d288f127d35e4decb3348c96cd091001e02e818465da618f90"; + sha256 = "a98a6eacca64d2b920558f4a2f78150db9474de821227e60deaa29f186121c63"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 1953b1610ceb..3425d915f45a 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "yarl"; - version = "1.1.1"; + version = "1.2.6"; src = fetchPypi { inherit pname version; - sha256 = "a69dd7e262cdb265ac7d5e929d55f2f3d07baaadd158c8f19caebf8dde08dfe8"; + sha256 = "c8cbc21bbfa1dd7d5386d48cc814fe3d35b80f60299cdde9279046f399c3b0d8"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index 4ffd0e94c611..a69f50c8c795 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "zc.lockfile"; - version = "1.2.1"; + version = "1.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e"; + sha256 = "96cb13769e042988ea25d23d44cf09342ea0f887083d0f9736968f3617665853"; }; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 64b2874ef627..ccc49db9bc3c 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -25,13 +25,13 @@ let pname = "zeep"; - version = "2.5.0"; + version = "3.0.0"; in buildPythonPackage { name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "4f9db52c7d269813fc6251da4cb050869158858aeea75a055b4550f19e52ac84"; + sha256 = "faab59d57275ce35845f42371cca83b3957982cdca9621228153fb99c770c4fc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index 32f756a3cdd6..a63713ef043e 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "4.4.3"; + version = "4.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "d6d26d5dfbfd60c65152938fcb82f949e8dada37c041f72916fef6621ba5c5ce"; + sha256 = "57c38470d9f57e37afb460c399eb254e7193ac7fb8042bd09bdc001981a9c74c"; }; propagatedBuildInputs = [ zope_event ]; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 35822fa78bd4..996e3932d2a2 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -397,6 +397,7 @@ let RPushbullet = [ pkgs.which ]; qtpaint = [ pkgs.cmake ]; qtbase = [ pkgs.cmake pkgs.perl ]; + RcppEigen = [ pkgs.libiconv ]; RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkgconfig ]; rggobi = [ pkgs.pkgconfig ]; @@ -438,6 +439,7 @@ let nlme = [ pkgs.libiconv ]; Matrix = [ pkgs.libiconv ]; mgcv = [ pkgs.libiconv ]; + igraph = [ pkgs.libiconv ]; }; packagesRequireingX = [ diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix index ce650adb7ef2..c30c3555100a 100644 --- a/pkgs/development/tools/analysis/autoflake/default.nix +++ b/pkgs/development/tools/analysis/autoflake/default.nix @@ -3,12 +3,12 @@ with python3Packages; buildPythonApplication rec { pname = "autoflake"; - version = "1.1"; + version = "1.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a74d684a7a02654f74582addc24a3016c06809316cc140457a4fe93a1e6ed131"; + sha256 = "c103e63466f11db3617167a2c68ff6a0cda35b940222920631c6eeec6b67e807"; }; propagatedBuildInputs = [ pyflakes ]; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 85307d58704d..e33d6b26b12b 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -2,21 +2,21 @@ , python }: -with python; +with python.pkgs; -pkgs.buildPythonApplication rec { +buildPythonApplication rec { pname = "aws-sam-cli"; - version = "0.3.0"; + version = "0.4.0"; - src = pkgs.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "7e7275a34e7e9d926198fd9516404310faa2a9681b7a8b0c8b2f9aa31aeb1bfb"; + sha256 = "4740bfa23f39880d807aa75a2143259f7f15eec34c5fa5dde8fc04d8563ef521"; }; # Tests are not included in the PyPI package doCheck = false; - propagatedBuildInputs = with pkgs; [ + propagatedBuildInputs = [ aws-sam-translator boto3 click diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 941004234011..8cb137aeda35 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { - version = "0.12.0"; + version = "0.13.0"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; - maintainers = [ maintainers.philandstuff ]; + maintainers = [ maintainers.mboes ]; platforms = platforms.linux ++ platforms.darwin; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "3b3e7dc76d145046fdc78db7cac9a82bc8939d3b291e53a7ce85315feb827754"; + sha256 = "143nd9dmw2x88azf8spinl2qnvw9m8lqlqc765l9q2v6hi807sc2"; }; sourceRoot = "."; @@ -64,14 +64,17 @@ stdenv.mkDerivation rec { --replace /bin/bash ${customBash}/bin/bash \ --replace /usr/bin/env ${coreutils}/bin/env done + # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. + substituteInPlace scripts/bootstrap/compile.sh \ + --replace /bin/sh ${customBash}/bin/bash echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "348 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "348 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "348 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "348 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh patchShebangs . ''; @@ -111,11 +114,10 @@ stdenv.mkDerivation rec { examples/java-native/src/test/java/com/example/myproject:hello ''; - # Bazel expects gcc and java to be in the path. installPhase = '' mkdir -p $out/bin mv output/bazel $out/bin - wrapProgram "$out/bin/bazel" --prefix PATH : "${lib.makeBinPath [ stdenv.cc jdk ]}" + wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}" mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions mv output/bazel-complete.bash $out/share/bash-completion/completions/ cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix index e0f1be8351a9..11f5be4e98e9 100644 --- a/pkgs/development/tools/build-managers/buildbot/pkg.nix +++ b/pkgs/development/tools/build-managers/buildbot/pkg.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "1.1.2"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0f14453e2f2f357f44edd79df2d3b3901b4e03f4746693c209b71e226ed238cd"; + sha256 = "70f429311c5812ffd334f023f4f50b904be5c672c8674ee6d28a11a7c096f18a"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 3aab715e4d9e..46433233992b 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -20,14 +20,19 @@ let newPython = python.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.4.4"; + version = "1.4.5"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "1g03f8rw9l198w9ph0gi0q3g84ilp1dxxc9nmj0dgnymcfgpf89n"; + sha256 = "1mjakrv1d7la3lrxsv6jjqprqwmslpjmfxkw3z7pk56rzlp99nv2"; }; + postPatch = '' + # Remove pylint constraint + substituteInPlace conans/requirements.txt --replace ", <1.9.0" "" + ''; + checkInputs = with newPython.pkgs; [ nose parameterized diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index b99bc4f6b758..38a197aa900b 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; with pythonPackages; let - version = "1.6.0"; + version = "1.7.0"; in buildPythonApplication rec { inherit version; pname = "pantsbuild.pants"; @@ -12,7 +12,7 @@ in buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "0ahvcj33xribypgyh515mb3ack1djr0cq27nlyk0qhwgwv6acfnj"; + sha256 = "1d7ff1383287c8e72f2c9855cfef982d362274a64e2707a93c070f988ba80a37"; }; prePatch = '' diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 286190436bff..9fb7c0e64b80 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shards-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz"; - sha256 = "02v69xl7x6sn0ddn29mjx3srwk4fyz0hz2pwaqa25fwwyhxvyn3p"; + sha256 = "198768izbsqqp063847r2x9ddcf4qfxx7vx7c6gwbmgjmjv4mivm"; }; buildInputs = [ crystal libyaml which ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 7fc0ecd1b2b4..33dc7c80c17a 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.8.0"; + version = "11.0.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "1cdc0p3gq6q324p087qv335y224bv61fbr8xar4kza7lcqblb41d"; + sha256 = "1wi2wza991hhys60c8f3rhad8dqargnb6i7xwfsxrjd26dsbif2b"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0xj0ym6mprrknxqrxqj3ydgabqgfdxrw3h1r0q8sggfxqrrs8y08"; + sha256 = "1y67zxxad2jy1rvfhdlp194fi0qgwrnlcs24zh5lzwvsnwvc13bg"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0j8xkwfxvmg1bqrmalqvl6k45yn54m16r3af5ckgr717xylywqb6"; + sha256 = "06p8fggnxn2afy0k4wjh44d1qby9n2j0mq6cl206cckzh2gfsknp"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 351ec2c77dba..5552bdcc5e6c 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -19,6 +19,7 @@ , bzip2 , coreutils , cpio +, curl , elfutils , flatpak , gitMinimal @@ -35,7 +36,7 @@ }: let - version = "0.10.10"; + version = "0.99.1"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -43,7 +44,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "0b0c2rmf2vj596600blbhsiv2dg7qwpr33lgdcn0bnqc4ddri6f2"; + sha256 = "0xgywl4qsxq7lw1v7hmvczzv3pl12bzz3jv59y8s5gbk54rzbyi5"; }; nativeBuildInputs = [ @@ -62,6 +63,7 @@ in stdenv.mkDerivation rec { buildInputs = [ acl bzip2 + curl elfutils flatpak glib diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 88ea499d28cf..d3ed7624b7a1 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { name = "godot-${version}"; - version = "3.0.2"; + version = "3.0.4"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "1ca1zznb7qqn4vf2nfwb8nww5x0k8fc4lwjvgydr6nr2mn70xka4"; + sha256 = "0i4ssfb6igga9zwvsmahrnasx9cyqrsd6mlmssjgc482fy9q2kz4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index c4f6e2565f67..daa3713a8d16 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,17 +2,17 @@ buildGoPackage rec { name = "hcloud-${version}"; - version = "1.4.0"; + version = "1.5.0"; goPackagePath = "github.com/hetznercloud/cli"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "1mysw091ddi3abijvciyy73ff31vqq7zb37w30sp3vhm5vq38nn2"; + sha256 = "1pbfa977ihqn7j3ynyqghxjw0wmq0vgha4lsshdpf5xr2n3w0r8l"; }; - buildFlagsArray = [ "-ldflags=" "-X github.com/hetznercloud/cli.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; meta = { description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 39677ba719e2..4beef3de2723 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cfr-${version}"; - version = "0.128"; + version = "0.130"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "09mx1f6d1p57q5r05nvgm1xrhqv34n7v7rwq875whb441h1dnsix"; + sha256 = "0zy63jxl05f0wm9s344y846hzqn0zk34w6qpbf48a98si5ciwsmn"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix index 37b76c50e902..f1c6e1f8ca6e 100644 --- a/pkgs/development/tools/jira_cli/default.nix +++ b/pkgs/development/tools/jira_cli/default.nix @@ -25,7 +25,7 @@ in meta = with stdenv.lib; { description = "A command line interface to Jira"; - homepage = http://github.com/alisaifee/jira-cli; + homepage = https://github.com/alisaifee/jira-cli; maintainers = with maintainers; [ nyarly ]; license = licenses.mit; }; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index de316d0e5e7f..0b71c6719dc4 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -103,6 +103,8 @@ stdenv.mkDerivation rec { then "-Wno-string-plus-int -Wno-deprecated-declarations" else "-static-libgcc"; + hardeningDisable = [ "format" ]; + # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 928f12602909..9b35d2960a4d 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, python}: stdenv.mkDerivation { - name = "doclifter-2.17"; + name = "doclifter-2.18"; src = fetchurl { - url = http://www.catb.org/~esr/doclifter/doclifter-2.17.tar.gz; - sha256 = "1m8yfjbl8wzcml9q4k7m1crwid0a14r07fqf33bmmgx1zpjk8kmv"; + url = http://www.catb.org/~esr/doclifter/doclifter-2.18.tar.gz; + sha256 = "0g39lbml7dclm2nb20j4ffzhq28226qiwxq1w37p7mpqijm7x3hw"; }; buildInputs = [ python ]; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index a0d6e49c0258..2eda1f044ce8 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = http://editorconfig.org/; + homepage = https://editorconfig.org/; description = "EditorConfig core library written in C"; longDescription = '' EditorConfig makes it easy to maintain the correct coding style when diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index e89aba67999e..04a300c56f44 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -3,11 +3,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { name = "elfutils-${version}"; - version = "0.170"; + version = "0.172"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2"; - sha256 = "0rp0r54z44is49c594qy7hr211nhb00aa5y7z74vsybbaxslg10z"; + sha256 = "090fmbnvd9jblkwhb2bm3hanim63rrvd5f30mfxq4jac6kk9k73p"; }; patches = ./debug-info-from-env.patch; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 8e2953839b71..f09dbfdb1653 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { version = "0.12.3"; src = fetchurl { - url = "http://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; + url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then "1i5ipn5x188cx54pbbmjj1bz89vvcfx5z1c7pqy2xzglkyb2xsyg" else "117gx6yjbcya64yg2vybcfyp591sid209pg8a33k9afbsmgz684c"; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 6a2995b2bbe0..90aec83be986 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An app runtime based on Chromium and node.js"; - homepage = http://nwjs.io/; + homepage = https://nwjs.io/; platforms = ["i686-linux" "x86_64-linux"]; maintainers = [ maintainers.offline ]; license = licenses.bsd3; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index e778337ca5ca..d7d086e74f97 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -1,30 +1,43 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder }: let pname = "cppo"; - version = "1.5.0"; webpage = "http://mjambon.com/${pname}.html"; in assert stdenv.lib.versionAtLeast ocaml.version "3.12"; -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + version = "1.6.4"; + sha256 = "16mlwck0wngr5pmlr8dxc471zzhhcja3mv4xf4n8jm9nhb3iikvh"; + buildInputs = [ jbuilder ]; + extra = { + inherit (jbuilder) installPhase; + }; + } else { + version = "1.5.0"; + sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8"; + extra = { + createFindlibDestdir = true; + makeFlags = "PREFIX=$(out)"; + preBuild = '' + mkdir $out/bin + ''; + }; + } +; in + +stdenv.mkDerivation (rec { + + name = "${pname}-${param.version}"; src = fetchFromGitHub { owner = "mjambon"; repo = pname; - rev = "v${version}"; - sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8"; + rev = "v${param.version}"; + inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - - createFindlibDestdir = true; - - makeFlags = "PREFIX=$(out)"; - - preBuild = '' - mkdir $out/bin - ''; + buildInputs = [ ocaml findlib ocamlbuild ] ++ (param.buildInputs or []); meta = with stdenv.lib; { description = "The C preprocessor for OCaml"; @@ -35,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; }; -} +} // param.extra) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index d09f06623a7e..4ad1bfb3234d 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.02"; let - version = "3.0.5"; + version = "3.1.0"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; - sha256 = "06h0klzzvb62rzb6m0pq8aa207fz7z54mjr05vky4wv8195bbjiy"; + sha256 = "1vf0c2mmflp94r8hshb44lsvnfdy03ld6mld2n79cdxr3zl24ci2"; }; buildInputs = [ ocaml findlib yojson ] diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 153c0f76a405..e58cc44884c8 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "11.9.0"; + version = "2018.5.18"; src = fetchPypi { inherit pname version; - sha256 = "7b3c52fb57e17ca61b6141b75c8f5ba61a95c713ca470754240f7f1dbd0a4968"; + sha256 = "1knyknmykjj7gixdpfyns77sv4mizl68addk09ajmw9z5aqaif84"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index f28fe187e6cf..a01d7dd42906 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -1,6 +1,7 @@ { stdenv , desktop-file-utils , fetchurl +, fetchpatch , gettext , glib , gtk3 @@ -28,6 +29,15 @@ in stdenv.mkDerivation rec { sha256 = "05534dvwrzrmryb4y2m1sb2q0r8i6nr88pzjg7xs5nr9zq8a87p3"; }; + patches = [ + # fix includedir in pkgconfig + # https://gitlab.gnome.org/GNOME/sysprof/merge_requests/2 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/sysprof/commit/d19a496bb55b8646e866df8bb07bc6ad3c55eaf2.patch; + sha256 = "15w6di9c4n1gsymkpk413f5f9gd3iq23wdkzs01y9xrxwqpm7hm4"; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext itstool libxml2 meson ninja pkgconfig shared-mime-info wrapGAppsHook ]; buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ]; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index a0d8a0b84bac..e5e6f639b95d 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "grails-${version}"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "0796jbcblr3vxdf6sngzcfs1m24d1ra1n8jc7cnfrfxpf8r0z15m"; + sha256 = "0q3rbz47lp2zh2794aycf85vnic77dg3sclrqbizfpdijma87iy7"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 6d91007e4860..4b04f70a2c2e 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "kcgi"; - version = "0.10.5"; + version = "0.10.6"; underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version; name = "${pname}-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "kristapsdz"; repo = pname; rev = "VERSION_${underscoreVersion}"; - sha256 = "0ksdjqibkj7h1a99i84i6y0949c0vwx789q0sslzdkkgqvjnw3xw"; + sha256 = "0vaqz7krlvkjlc0189pkcj1al1p5ic577dn6bb4ivca1bss1i3m2"; }; patchPhase = ''substituteInPlace configure \ --replace /usr/local / diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 07f8e3b60002..8997dbda7284 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "10.4.1"; - sha256 = "0i40mn8g71z7wildhnjp64j7fnlld32dibyq677bd4pra95migx5"; + version = "10.5.0"; + sha256 = "1g1kdcrhahdsrkazfl9wj25abgjvkncgwwcm2ppgj3avfi1wam3v"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ]; } diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 737f31d6e105..91959a1c942b 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Hardcore 3D space shooter with spaceship upgrade possibilities"; - homepage = http://www.viewizard.com/; + homepage = https://www.viewizard.com/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index dbd2814a6fb6..1391ca70223a 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -38,5 +38,7 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.unix; + + hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 37176750763f..56a926e63f6d 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; + hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 28d273ad5cc4..2fe76649d552 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { description = "A reimplementation of the Ultima VII game engine"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; + hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out }; } diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index ee93d162396d..8003468f50fa 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ pierron ]; platforms = platforms.unix; + hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index c1bfda9e2f2f..d5efe2b3ebd9 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -54,5 +54,6 @@ in stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; + hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 50b9f03d4bc9..3431be5359ea 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ivan-${version}"; - version = "052"; + version = "053"; src = fetchFromGitHub { owner = "Attnam"; repo = "ivan"; rev = "v${version}"; - sha256 = "1vvwb33jw4ppwsqlvaxq3b8npdzh9j9jfangyzszp5sfnnd7fj5b"; + sha256 = "1r3fcccgpjmzzkg0lfmq76igjapr01kh97vz671z60jg7gyh301b"; }; buildInputs = [SDL2 SDL2_mixer libpng pcre]; diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix index 5ab9954739b2..b5f858b99ad7 100644 --- a/pkgs/games/lbreakout2/default.nix +++ b/pkgs/games/lbreakout2/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.ciil ]; platforms = platforms.unix; + hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index c6697f5806d4..6be5c9ee2474 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -4,12 +4,14 @@ let libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in stdenv.mkDerivation rec { name = "multimc-${version}"; - version = "0.6.2"; + # Current release as of 2018-06-23 (v0.6.2) breaks under Qt 5.11—see + # https://github.com/NixOS/nixpkgs/issues/42387 + version = "unstable-2018-06-04"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = version; - sha256 = "07jrr6si8nzfqwf073zhgw47y6snib23ad3imh1ik1nn5r7wqy3c"; + rev = "19bb50b872da2702b8e0b65f3f7b6b54c1c5b071"; + sha256 = "01frkk2klm1axr7ywnj23ikxn5pkgj8q6w8vqbslsvmh8bni8rk0"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; @@ -22,6 +24,12 @@ in stdenv.mkDerivation rec { cp ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps cp ../application/package/linux/multimc.desktop $out/share/applications wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/ + + # As of https://github.com/MultiMC/MultiMC5/blob/7ea1d68244fdae1e7672fb84199ee71e168b31ca/application/package/linux/multimc.desktop, + # the desktop icon refers to `multimc`, but the executable actually gets + # installed as `MultiMC`. Create compatibility symlink to fix the desktop + # icon. + ln -sf $out/bin/MultiMC $out/bin/multimc ''; meta = with stdenv.lib; { diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 30470e98c58d..a936ca134122 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Open source clone of UFO: Enemy Unknown"; - homepage = http://openxcom.org; + homepage = https://openxcom.org; repositories.git = https://github.com/SupSuper/OpenXcom.git; maintainers = [ stdenv.lib.maintainers.cpages ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix deleted file mode 100644 index 5ea84b9ef41f..000000000000 --- a/pkgs/games/unvanquished/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, cmake, libGLU_combined, SDL, libjpeg, libpng, glew, libwebp, ncurses -, gmp, curl, nettle, openal, speex, libogg, libvorbis, libtheora, xvidcore -, makeWrapper }: -stdenv.mkDerivation rec { - name = "unvanquished-${version}"; - version = "0.13.1"; - src = fetchurl { - url = "https://github.com/Unvanquished/Unvanquished/archive/v${version}.tar.gz"; - sha256 = "1k7mlpwalimn6xb2s760f124xncpg455qvls6z3x0ii5x0wc1mp2"; - }; - buildInputs = [ cmake libGLU_combined SDL libjpeg libpng glew libwebp ncurses gmp curl - nettle openal speex libogg libvorbis libtheora xvidcore - makeWrapper ]; - preConfigure = ''prefix="$prefix/opt"''; - postInstall = '' - # cp -r ../main "$prefix/Unvanquished/" - mkdir -p "$out/bin" - substituteInPlace download-pk3.sh --replace /bin/bash ${stdenv.shell} - cp -v download-pk3.sh "$out/bin/unvanquished-download-pk3" - makeWrapper "$prefix/Unvanquished/daemon" "$out/bin/unvanquished" \ - --run '[ -f ~/.Unvanquished/main/md5sums ] && - cd ~/.Unvanquished/main/ && - md5sum --quiet -c md5sums || - unvanquished-download-pk3' \ - --run "cd '$prefix/Unvanquished'" - makeWrapper "$prefix/Unvanquished/daemonded" "$out/bin/unvanquished-ded" \ - --run '[ -f ~/.Unvanquished/main/md5sums ] && - cd ~/.Unvanquished/main/ && - md5sum --quiet -c md5sums || - unvanquished-download-pk3' \ - --run "cd '$prefix/Unvanquished'" - ''; - - meta = { - description = "FPS game set in a futuristic, sci-fi setting"; - longDescription = '' - Unvanquished is a free, open-source first-person shooter - combining real-time strategy elements with a futuristic, sci-fi - setting. It is available for Windows, Linux, and macOS. - - Features: - - * Two teams - Play as either the technologically advanced humans or the highly - adaptable aliens, with a fresh gameplay experience on both - sides. - - * Build a base - Construct and maintain your base with a variety of useful - structures, or group up with teammates to take on the other - team. - - * Level up - Earn rewards for victories against the other team, whether it's - a deadly new weapon or access to a whole new alien form. - - * Customize - Compatibility with Quake 3 file formats and modification tools - allows for extensive customization of the game and its - setting. - ''; - homepage = http://unvanquished.net; - #license = "unknown"; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.linux; - # This package can take a lot of disk space, so unavailable from channel - hydraPlatforms = []; - }; -} diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 12fb0bd60b0b..45b4e5a5891e 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.2"; + version = "1.14.3"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1xhnhxjc8zjv89xmrbffa54fa4ybw6x0p34k14n9lrz1y18vaar8"; + sha256 = "06648041nr77sgzr7jpmcn37cma3hp41qynp50xzddx28l17zwg9"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 2798306c3002..3bfbc2565f35 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,56 +1,74 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, makeWrapper, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib -, pcre, gettext, libpthreadstubs, libXrandr, libXext, libXxf86vm, libXinerama, libSM, readline -, openal, libXdmcp, portaudio, libusb, libevdev, curl, qt5 +{ stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5 +, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib, pcre, gettext, libXrandr +, libpthreadstubs, libusb, libXext, libXxf86vm, libXinerama, libSM, libXdmcp +, readline, openal, libevdev, portaudio, curl , vulkan-loader ? null , libpulseaudio ? null + # - Inputs used for Darwin -, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL -, wxGTK -, libpng -, hidapi +, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL, wxGTK, libpng, hidapi # options , dolphin-wxgui ? true -, dolphin-qtgui ? false -}: +, dolphin-qtgui ? false }: + # XOR: ensure only wx XOR qt are enabled assert dolphin-wxgui || dolphin-qtgui; assert !(dolphin-wxgui && dolphin-qtgui); -stdenv.mkDerivation rec { - name = "dolphin-emu-20180609"; +let + desktopItem = makeDesktopItem { + name = "dolphin-emu-master"; + exec = stdenv.lib.optionalString dolphin-wxgui "dolphin-emu-wx" + + stdenv.lib.optionalString dolphin-qtgui "dolphin-emu-qt"; + icon = "dolphin-emu"; + comment = "A Wii/GameCube Emulator"; + desktopName = "Dolphin Emulator (master)"; + genericName = "Wii/GameCube Emulator"; + categories = "Game;Emulator;"; + startupNotify = "false"; + }; +in stdenv.mkDerivation rec { + name = "dolphin-emu-${version}"; + version = "2018-06-22"; + src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "1d87584d69e3fdd730502127274fcbd85cebd591"; - sha256 = "0sxzmmv8gvfsy96p1x1aya1cpq0237gip3zkl4bks4grgxf8958b"; + rev = "971972069cc2813ee7fa5b630c67baab2b35d12d"; + sha256 = "0kf6dzvwmvhqb1iy15ldap0mmfbyyzl5f14jc65a110vwv5sww7n"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkgconfig ] + ++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ]; + + buildInputs = [ + curl ffmpeg libao libGLU_combined gtk2 glib pcre gettext libpthreadstubs + libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp + portaudio libusb libpulseaudio libpng hidapi + ] ++ stdenv.lib.optionals dolphin-qtgui [ qt5.qtbase ] + ++ stdenv.lib.optionals stdenv.isLinux [ bluez libevdev vulkan-loader ] + ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private + ForceFeedback IOKit OpenGL ]; + cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" "-DENABLE_LTO=True" ] ++ stdenv.lib.optionals (!dolphin-qtgui) [ "-DENABLE_QT2=False" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ cmake pkgconfig ] - ++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ]; - - buildInputs = [ curl ffmpeg libao libGLU_combined gtk2 glib pcre - gettext libpthreadstubs libXrandr libXext libXxf86vm libXinerama libSM readline openal - libXdmcp portaudio libusb libpulseaudio libpng hidapi - ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ] - ++ stdenv.lib.optionals stdenv.isLinux [ bluez libevdev vulkan-loader ] - ++ stdenv.lib.optionals dolphin-qtgui [ qt5.qtbase ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DOSX_USE_DEFAULT_SEARCH_PATH=True" + ]; # - Change install path to Applications relative to $out # - Allow Dolphin to use nix-provided libraries instead of building them preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i -e 's,/Applications,Applications,g' Source/Core/DolphinWX/CMakeLists.txt - sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' CMakeLists.txt + sed -i -e 's,/Applications,Applications,g' \ + Source/Core/DolphinWX/CMakeLists.txt + sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' \ + CMakeLists.txt sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt ''; @@ -58,16 +76,24 @@ stdenv.mkDerivation rec { mkdir -p "$out/Applications" ''; - postInstall = stdenv.lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/dolphin-emu-nogui --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - wrapProgram $out/bin/dolphin-emu-wx --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + postInstall = '' + cp -r ${desktopItem}/share/applications $out/share + '' + stdenv.lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/dolphin-emu-nogui \ + --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + wrapProgram $out/bin/dolphin-emu-wx \ + --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + '' + stdenv.lib.optionalString (dolphin-qtgui && stdenv.isLinux) '' + wrapProgram $out/bin/dolphin-emu \ + --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-qt ''; - meta = { - homepage = http://dolphin-emu.org/; + meta = with stdenv.lib; { + homepage = "http://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = licenses.gpl2; + maintainers = with maintainers; [ MP2E ]; branch = "master"; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 6d462c0e3797..9856c93eda2d 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { create customized Amigas. ''; license = licenses.gpl2Plus; - homepage = http://fs-uae.net; + homepage = https://fs-uae.net; maintainers = with stdenv.lib; [ maintainers.AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 755e2a2d72ba..7fb804d31e41 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,7 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cmake, libzip, epoxy, ffmpeg -, imagemagick, SDL2, qtbase, qtmultimedia, qttools, libedit, minizip }: +{ stdenv, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper, pkgconfig +, cmake, epoxy, libzip, ffmpeg, imagemagick, SDL2, qtbase, qtmultimedia, libedit +, qttools, minizip }: -stdenv.mkDerivation rec { +let + desktopItem = makeDesktopItem { + name = "mgba"; + exec = "mgba-qt"; + icon = "mgba"; + comment = "A Game Boy Advance Emulator"; + desktopName = "mgba"; + genericName = "Game Boy Advance Emulator"; + categories = "Game;Emulator;"; + startupNotify = "false"; + }; +in stdenv.mkDerivation rec { name = "mgba-${version}"; version = "0.6.3"; @@ -13,7 +25,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ makeWrapper pkgconfig cmake ]; buildInputs = [ libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia libedit minizip @@ -25,6 +37,12 @@ stdenv.mkDerivation rec { sha256 = "0j334v8wf594kg8s1hngmh58wv1pi003z8avy6fjhj5qpjmbbavh"; })]; + postInstall = '' + cp -r ${desktopItem}/share/applications $out/share + wrapProgram $out/bin/mgba-qt --suffix QT_PLUGIN_PATH : \ + ${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; + meta = with stdenv.lib; { homepage = https://mgba.io; description = "A modern GBA emulator with a focus on accuracy"; diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 2e28fd297ec0..95e94eeaff51 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { states and PS2 system memory. This allows you to play PS2 games on your PC, with many additional features and benefits. ''; - homepage = http://pcsx2.net; + homepage = https://pcsx2.net; maintainers = with maintainers; [ hrdinka ]; # PCSX2's source code is released under LGPLv3+. It However ships diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 140149bde495..732a5971ed3c 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,19 +1,31 @@ -{ stdenv, lib, fetchgit, cmake, pkgconfig -, qtbase, openal, glew, llvm_4, vulkan-loader, libpng, ffmpeg, libevdev -, pulseaudioSupport ? true, libpulseaudio -, waylandSupport ? true, wayland -, alsaSupport ? true, alsaLib -}: - -stdenv.mkDerivation rec { - name = "rpcs3-${version}"; - version = "2018-02-23"; - - src = fetchgit { - url = "https://github.com/RPCS3/rpcs3"; - rev = "41bd07274f15b8f1be2475d73c3c75ada913dabb"; - sha256 = "1v28m64ahakzj4jzjkmdd7y8q75pn9wjs03vprbnl0z6wqavqn0x"; - }; +{ stdenv, lib, fetchgit, cmake, pkgconfig, git +, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27 +, pulseaudioSupport ? true, libpulseaudio +, waylandSupport ? true, wayland +, alsaSupport ? true, alsaLib +}: + +let + majorVersion = "0.0.5"; + gitVersion = "6980-81e5f3b7f"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) +in +stdenv.mkDerivation rec { + name = "rpcs3-${version}"; + version = "${majorVersion}-${gitVersion}"; + + src = fetchgit { + url = "https://github.com/RPCS3/rpcs3"; + rev = "81e5f3b7f299942f56bcfdde54edd09c722b32d8"; + sha256 = "0czj6ga1nccqgcvi58sjnv1cc4k7qvwijp4warml463hpsmbd9r0"; + }; + + preConfigure = '' + cat > ./rpcs3/git-version.h <<EOF + #define RPCS3_GIT_VERSION "${gitVersion}" + #define RPCS3_GIT_BRANCH "HEAD" + #define RPCS3_GIT_VERSION_NO_UPDATE 1 + EOF + ''; cmakeFlags = [ "-DUSE_SYSTEM_LIBPNG=ON" @@ -21,10 +33,10 @@ stdenv.mkDerivation rec { "-DUSE_NATIVE_INSTRUCTIONS=OFF" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig git ]; buildInputs = [ - qtbase openal glew llvm_4 vulkan-loader libpng ffmpeg libevdev + qt5.qtbase qt5.qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python27 ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional alsaSupport alsaLib ++ lib.optional waylandSupport wayland; @@ -34,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar nocent ]; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 17cf99d8b00c..6b28c39f7679 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; - homepage = http://electricsheep.org/; + homepage = https://electricsheep.org/; maintainers = with maintainers; [ nand0p fpletz ]; platforms = platforms.linux; license = licenses.gpl1; diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 372efec785d3..c7033bba4b67 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.93.1.18"; + version = "3.93.1.22"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "1jaayfj2h0miaalmgk0i26py4b6750iq3kis2jnm54g2gxyw3ipw"; + sha256 = "1i74vpf7fv1r6074lv8f9515hzrhcbi2wg069vmc10ihwpml391r"; }; preferLocalBuild = true; diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 7f6f0cdd0c48..a62182f1d347 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xar, xz, cpio, pkgs, python }: +{ stdenv, fetchurl, xar, xz, cpio, pkgs, python, lib }: let # TODO: make this available to other packages and generalize the unpacking a bit @@ -27,6 +27,7 @@ let buildInputs = [ xar xz cpio python ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + outputs = [ "out" "dev" "man" ]; unpackPhase = '' xar -x -f $src @@ -87,13 +88,13 @@ let # ApplicationServices in the 10.9 SDK local isChild - if [ -d "${sdk}/Library/Frameworks/$path/Versions/$current/Headers" ]; then + if [ -d "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" ]; then isChild=1 - cp -R "${sdk}/Library/Frameworks/$path/Versions/$current/Headers" . + cp -R "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" . else isChild=0 current="$(readlink "/System/Library/Frameworks/$name.framework/Versions/Current")" - cp -R "${sdk}/Library/Frameworks/$name.framework/Versions/$current/Headers" . + cp -R "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" . fi ln -s -L "/System/Library/Frameworks/$path/Versions/$current/$name" ln -s -L "/System/Library/Frameworks/$path/Versions/$current/Resources" @@ -103,9 +104,9 @@ let fi if [ $isChild -eq 1 ]; then - pushd "${sdk}/Library/Frameworks/$path/Versions/$current" >/dev/null + pushd "${sdk.out}/Library/Frameworks/$path/Versions/$current" >/dev/null else - pushd "${sdk}/Library/Frameworks/$name.framework/Versions/$current" >/dev/null + pushd "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current" >/dev/null fi local children=$(echo Frameworks/*.framework) if [ "$name" == "ApplicationServices" ]; then @@ -159,8 +160,8 @@ in rec { installPhase = '' mkdir -p $out/include pushd $out/include >/dev/null - ln -s "${sdk}/include/xpc" - ln -s "${sdk}/include/launch.h" + ln -s "${lib.getDev sdk}/include/xpc" + ln -s "${lib.getDev sdk}/include/launch.h" popd >/dev/null ''; }; @@ -178,7 +179,7 @@ in rec { installPhase = '' mkdir -p $out/include $out/lib - ln -s "${sdk}/include/Xplugin.h" $out/include/Xplugin.h + ln -s "${lib.getDev sdk}/include/Xplugin.h" $out/include/Xplugin.h ln -s "/usr/lib/libXplugin.1.dylib" $out/lib/libXplugin.dylib ''; }; @@ -190,8 +191,8 @@ in rec { installPhase = '' mkdir -p $out/include pushd $out/include >/dev/null - ln -s "${sdk}/include/utmp.h" - ln -s "${sdk}/include/utmpx.h" + ln -s "${lib.getDev sdk}/include/utmp.h" + ln -s "${lib.getDev sdk}/include/utmpx.h" popd >/dev/null ''; }; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix index 1018100ba9c5..639d377d1b64 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix @@ -13,7 +13,7 @@ appleDerivation { lib/RawSigner.h lib/MD2Object.h lib/HMACSHA1.h lib/bfContext.h lib/rc4Context.h; do substituteInPlace ''$file --replace \ '"CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h"' \ - '"${apple_sdk.sdk}/include/MacTypes.h"' + '"${stdenv.lib.getDev apple_sdk.sdk}/include/MacTypes.h"' done for file in lib/castContext.h lib/gladmanContext.h lib/desContext.h lib/rc4Context.h; do diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix index 2a05855bd521..f5035a06f1e8 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix @@ -25,7 +25,7 @@ appleDerivation { mkdir -p include/securityd_client cp Security-*/libsecurityd/lib/*.h include/securityd_client mkdir -p include/xpc - cp ${apple_sdk.sdk}/include/xpc/*.h include/xpc + cp ${apple_sdk.sdk.out}/include/xpc/*.h include/xpc sed -i '1i #define bool int' lib/security_codesigning.d dtrace -h -C -s lib/security_codesigning.d -o codesigning_dtrace.h diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix index fb1ea2509d76..435cd0f069f2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation, apple_sdk, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }: +{ appleDerivation, apple_sdk, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk, lib }: appleDerivation { buildInputs = [ libsecurity_utilities @@ -7,7 +7,7 @@ appleDerivation { ]; patchPhase = '' cp ${osx_private_sdk}/include/sandbox_private.h . - substituteInPlace sandbox_private.h --replace '<sandbox.h>' '"${apple_sdk.sdk}/include/sandbox.h"' + substituteInPlace sandbox_private.h --replace '<sandbox.h>' '"${lib.getDev apple_sdk.sdk}/include/sandbox.h"' substituteInPlace lib/AtomicFile.cpp --replace '<sandbox.h>' '"sandbox_private.h"' ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index 93857ea792c2..2783e4edb437 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -15,13 +15,13 @@ name: version: sha256: args: let grep -Rl MacErrors.h . | while read file; do substituteInPlace "''$file" --replace \ '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \ - '"${pkgs.darwin.apple_sdk.sdk}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"' + '"${pkgs.darwin.apple_sdk.sdk.out}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"' done || true # grep returns 1 if it can't find the string - + grep -Rl MacTypes.h . | while read file; do substituteInPlace "''$file" --replace \ '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>' \ - '"${pkgs.darwin.apple_sdk.sdk}/include/MacTypes.h"' + '"${pkgs.darwin.apple_sdk.sdk.out}/include/MacTypes.h"' done || true # grep returns 1 if it can't find the string ''; preBuild = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix index 06137879410d..07a3186caeec 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix @@ -1,4 +1,4 @@ -{ CF, Security, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp }: +{ CF, Security, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp, lib }: appleDerivation { buildInputs = [ libsecurity_utilities @@ -19,7 +19,7 @@ appleDerivation { substituteInPlace lib/SecCertificate.cpp --replace '#include <Security/SecCertificatePriv.h>' "" cp ${osx_private_sdk}/include/xpc/private.h xpc - cp ${apple_sdk.sdk}/include/xpc/*.h xpc + cp ${lib.getDev apple_sdk.sdk}/include/xpc/*.h xpc cp ${osx_private_sdk}/include/sandbox_private.h lib/sandbox.h substituteInPlace lib/SecItemPriv.h \ @@ -29,7 +29,7 @@ appleDerivation { substituteInPlace lib/Keychains.cpp --replace \ '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \ - '"${apple_sdk.sdk}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"' + '"${apple_sdk.sdk.out}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"' substituteInPlace lib/CertificateValues.cpp --replace \ '#include <Security/SecCertificatePriv.h>' "" @@ -42,6 +42,6 @@ appleDerivation { substituteInPlace lib/KCEventNotifier.h --replace \ 'CoreFoundation/CFNotificationCenter.h' \ - '${apple_sdk.sdk}/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFNotificationCenter.h' + '${apple_sdk.sdk.out}/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFNotificationCenter.h' ''; } diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index 2b8c7718aee8..e6846aef7507 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { substituteInPlace cmsutil.c --replace \ '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \ - '"${apple_sdk.sdk}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"' + '"${apple_sdk.sdk.out}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"' substituteInPlace createFVMaster.c --replace \ '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \ - '"${apple_sdk.sdk}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"' + '"${apple_sdk.sdk.out}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"' ''; postUnpack = '' diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 46f6f03b90a7..d153ef16c14e 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -40,9 +40,11 @@ let requireXcode = version: sha256: in app.overrideAttrs ( oldAttrs: oldAttrs // { inherit meta; }); -in { +in rec { xcode_8_1 = requireXcode "8.1" "18xjvfipwzia66gm3r9p770xdd4r375vak7chw5vgqnv9yyjiq2n"; xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2"; xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; + xcode_9_4 = requireXcode "9.4" "6731381785075602a52489f7ea47ece8f6daf225007ba3ffae1fd59b1c0b5f01"; + xcode = xcode_9_4; } diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index 73ae6801bc2b..c2e950b4ba48 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { stripLen = 2; extraPrefix = "1.0.0.rc16/"; }) + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/007-fix-loff_t-musl.patch"; + sha256 = "0msnq39qnzg3b1pdksnz1dgqwa3ak03g41pqh0lw3h7w5rjc016k"; + stripLen = 2; + extraPrefix = "1.0.0.rc16/"; + }) ]; postPatch = '' diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index e2647112f1b2..8d96a503c766 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "eventstat-${version}"; - version = "0.04.03"; + version = "0.04.04"; src = fetchzip { url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "0yv7rpdg07rihw8iilvigib963nxf16mn26hzlb6qd1wv54k6dbr"; + sha256 = "034xpdr3ip4w9k713wjc45x66k3nz6wg9wkzmchrjifxk4dldbd8"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index d49d01158229..eb87d8aa7251 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "fnotifystat-${version}"; - version = "0.02.00"; + version = "0.02.01"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "0sfzmggfhhhp3vxn1s61b5bacr2hz6r7y699n3nysdciaa2scgdq"; + sha256 = "18p6rqb3bhs2ih6mnp57j0cyawjm0iwky6y3ays54alkxqaz8gmx"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 8ccb0c203803..3f5ed788bb23 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iproute2-${version}"; - version = "4.16.0"; + version = "4.17.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "02pfalg319jpbjz273ph725br8dnkzpfvi98azi9yd6p1w128p0c"; + sha256 = "0vmynikcamfhakvwyk5dsffy0ymgi5mdqiwybdvqfn1ijaq93abg"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d469867ecb49..4f0308d14922 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.50"; + version = "4.14.51"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1b529qp5cixvp47h8jhincnc40n7l27qawkgjf6l5p157c0qsfkh"; + sha256 = "0awpvyigj28j8ibjm5362xnlcaiqcn7lwd9wkf7k8i14m8ml1cns"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 120639814da1..61eb394f6ee0 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.16"; + version = "4.16.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0wcinqf5m1zzj747k86yxvm3acpa50vbzbjhd4hikl1jfidss31h"; + sha256 = "1302pjxrwpdvmnpisgsgv41brj52y3ppkwi0cyd4c1q8mc5qsgf9"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix new file mode 100644 index 000000000000..6855c5c5f903 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: + +buildLinux (args // rec { + version = "4.14.47-139"; + + # modDirVersion needs to be x.y.z. + modDirVersion = "4.14.47"; + + # branchVersion needs to be x.y. + extraMeta.branch = "4.14"; + + src = fetchFromGitHub { + owner = "hardkernel"; + repo = "linux"; + rev = version; + sha256 = "0jjgrmvi1h8zs8snnvghnjd422yfmn7jv9y1n7xikmfv4nvwqrkv"; + }; + +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index ff408b6a6248..bead5f84eac9 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Data Plane optimized for DPDK"; - homepage = http://www.opendataplane.org; + homepage = https://www.opendataplane.org; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.abuibrahim ]; diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index 99caa813b2ea..6429c19f2b5c 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pagemon-${version}"; - version = "0.01.12"; + version = "0.01.13"; src = fetchFromGitHub { - sha256 = "0bddn22daf33dbghwfjxxgsn4gmr5knr6h9sbqhs7g7p85dla6wa"; + sha256 = "055qniys5xv0ivdvdws5vwdgfyj6iyq02v5nn945l1x59rwnb541"; rev = "V${version}"; repo = "pagemon"; owner = "ColinIanKing"; diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index b4b8606197e8..c4d699c395e4 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "smemstat-${version}"; - version = "0.01.18"; + version = "0.02.00"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz"; - sha256 = "0g262gilj2jk365wj4yl93ifppgvc9rx7dmlw6ychbv72v2pbv6w"; + sha256 = "16in8bzsrrcz7mc5qvyvjkxgpzz4bnq8zvkb7vsv6qfgyd3xr1dp"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e2acee87d1ab..7bf7d6237488 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.69.1"; + version = "0.72.0"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -91,11 +91,14 @@ "binary_sensor.hikvision" = ps: with ps; [ ]; "binary_sensor.hive" = ps: with ps; [ ]; "binary_sensor.homematic" = ps: with ps; [ pyhomematic ]; + "binary_sensor.homematicip_cloud" = ps: with ps; [ ]; + "binary_sensor.hydrawise" = ps: with ps; [ ]; "binary_sensor.ihc" = ps: with ps; [ ]; "binary_sensor.insteon_plm" = ps: with ps; [ ]; "binary_sensor.iss" = ps: with ps; [ ]; "binary_sensor.isy994" = ps: with ps; [ ]; "binary_sensor.knx" = ps: with ps; [ ]; + "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "binary_sensor.linode" = ps: with ps; [ linode-api ]; "binary_sensor.maxcube" = ps: with ps; [ ]; "binary_sensor.modbus" = ps: with ps; [ ]; @@ -111,6 +114,7 @@ "binary_sensor.ping" = ps: with ps; [ ]; "binary_sensor.qwikswitch" = ps: with ps; [ ]; "binary_sensor.raincloud" = ps: with ps; [ ]; + "binary_sensor.rainmachine" = ps: with ps; [ ]; "binary_sensor.random" = ps: with ps; [ ]; "binary_sensor.raspihats" = ps: with ps; [ ]; "binary_sensor.rest" = ps: with ps; [ ]; @@ -130,6 +134,7 @@ "binary_sensor.threshold" = ps: with ps; [ ]; "binary_sensor.trend" = ps: with ps; [ numpy ]; "binary_sensor.upcloud" = ps: with ps; [ ]; + "binary_sensor.uptimerobot" = ps: with ps; [ ]; "binary_sensor.velbus" = ps: with ps; [ ]; "binary_sensor.vera" = ps: with ps; [ ]; "binary_sensor.verisure" = ps: with ps; [ ]; @@ -137,6 +142,7 @@ "binary_sensor.vultr" = ps: with ps; [ vultr ]; "binary_sensor.wemo" = ps: with ps; [ ]; "binary_sensor.wink" = ps: with ps; [ ]; + "binary_sensor.wirelesstag" = ps: with ps; [ ]; "binary_sensor.workday" = ps: with ps; [ ]; "binary_sensor.xiaomi_aqara" = ps: with ps; [ ]; "binary_sensor.zha" = ps: with ps; [ ]; @@ -146,7 +152,7 @@ "bloomsky" = ps: with ps; [ ]; "bmw_connected_drive" = ps: with ps; [ ]; "browser" = ps: with ps; [ ]; - "calendar" = ps: with ps; [ ]; + "calendar" = ps: with ps; [ aiohttp-cors ]; "calendar.caldav" = ps: with ps; [ ]; "calendar.demo" = ps: with ps; [ ]; "calendar.google" = ps: with ps; [ ]; @@ -162,6 +168,7 @@ "camera.canary" = ps: with ps; [ ha-ffmpeg ]; "camera.demo" = ps: with ps; [ ]; "camera.doorbird" = ps: with ps; [ ]; + "camera.familyhub" = ps: with ps; [ ]; "camera.ffmpeg" = ps: with ps; [ ha-ffmpeg ]; "camera.foscam" = ps: with ps; [ ]; "camera.generic" = ps: with ps; [ ]; @@ -181,9 +188,11 @@ "camera.uvc" = ps: with ps; [ ]; "camera.verisure" = ps: with ps; [ ]; "camera.xeoma" = ps: with ps; [ ]; + "camera.xiaomi" = ps: with ps; [ ha-ffmpeg ]; "camera.yi" = ps: with ps; [ ha-ffmpeg ]; "camera.zoneminder" = ps: with ps; [ ]; "canary" = ps: with ps; [ ]; + "cast" = ps: with ps; [ PyChromecast ]; "climate" = ps: with ps; [ ]; "climate.daikin" = ps: with ps; [ ]; "climate.demo" = ps: with ps; [ ]; @@ -197,6 +206,7 @@ "climate.heatmiser" = ps: with ps; [ ]; "climate.hive" = ps: with ps; [ ]; "climate.homematic" = ps: with ps; [ pyhomematic ]; + "climate.homematicip_cloud" = ps: with ps; [ ]; "climate.honeywell" = ps: with ps; [ ]; "climate.knx" = ps: with ps; [ ]; "climate.maxcube" = ps: with ps; [ ]; @@ -218,6 +228,7 @@ "climate.venstar" = ps: with ps; [ ]; "climate.vera" = ps: with ps; [ ]; "climate.wink" = ps: with ps; [ ]; + "climate.zhong_hong" = ps: with ps; [ ]; "climate.zwave" = ps: with ps; [ ]; "cloud" = ps: with ps; [ aiohttp-cors warrant ]; "cloud.auth_api" = ps: with ps; [ ]; @@ -231,7 +242,7 @@ "config.config_entries" = ps: with ps; [ voluptuous-serialize ]; "config.core" = ps: with ps; [ ]; "config.customize" = ps: with ps; [ ]; - "config.entity_registry" = ps: with ps; [ ]; + "config.entity_registry" = ps: with ps; [ aiohttp-cors ]; "config.group" = ps: with ps; [ ]; "config.hassbian" = ps: with ps; [ ]; "config.script" = ps: with ps; [ ]; @@ -258,6 +269,7 @@ "cover.rflink" = ps: with ps; [ ]; "cover.rfxtrx" = ps: with ps; [ ]; "cover.rpi_gpio" = ps: with ps; [ ]; + "cover.ryobi_gdo" = ps: with ps; [ ]; "cover.scsgate" = ps: with ps; [ ]; "cover.tahoma" = ps: with ps; [ ]; "cover.tellduslive" = ps: with ps; [ ]; @@ -288,6 +300,7 @@ "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; "device_tracker.ddwrt" = ps: with ps; [ ]; "device_tracker.demo" = ps: with ps; [ ]; + "device_tracker.freebox" = ps: with ps; [ ]; "device_tracker.fritz" = ps: with ps; [ fritzconnection ]; "device_tracker.geofency" = ps: with ps; [ aiohttp-cors ]; "device_tracker.google_maps" = ps: with ps; [ ]; @@ -407,6 +420,7 @@ "hue.config_flow" = ps: with ps; [ ]; "hue.const" = ps: with ps; [ ]; "hue.errors" = ps: with ps; [ ]; + "hydrawise" = ps: with ps; [ ]; "ifttt" = ps: with ps; [ ]; "ihc" = ps: with ps; [ ]; "ihc.const" = ps: with ps; [ ]; @@ -415,6 +429,7 @@ "image_processing.demo" = ps: with ps; [ ]; "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ]; "image_processing.dlib_face_identify" = ps: with ps; [ face_recognition ]; + "image_processing.facebox" = ps: with ps; [ ]; "image_processing.microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; "image_processing.microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; "image_processing.openalpr_cloud" = ps: with ps; [ ]; @@ -440,6 +455,7 @@ "keyboard_remote" = ps: with ps; [ evdev ]; "kira" = ps: with ps; [ ]; "knx" = ps: with ps; [ ]; + "konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "lametric" = ps: with ps; [ ]; "light" = ps: with ps; [ ]; "light.abode" = ps: with ps; [ ]; @@ -459,6 +475,7 @@ "light.hive" = ps: with ps; [ ]; "light.homekit_controller" = ps: with ps; [ ]; "light.homematic" = ps: with ps; [ pyhomematic ]; + "light.homematicip_cloud" = ps: with ps; [ ]; "light.hue" = ps: with ps; [ aiohue ]; "light.hyperion" = ps: with ps; [ ]; "light.iglo" = ps: with ps; [ ]; @@ -473,6 +490,7 @@ "light.litejet" = ps: with ps; [ ]; "light.lutron" = ps: with ps; [ ]; "light.lutron_caseta" = ps: with ps; [ ]; + "light.lw12wifi" = ps: with ps; [ ]; "light.mochad" = ps: with ps; [ ]; "light.mqtt" = ps: with ps; [ paho-mqtt ]; "light.mqtt_json" = ps: with ps; [ paho-mqtt ]; @@ -518,6 +536,7 @@ "lock.demo" = ps: with ps; [ ]; "lock.homematic" = ps: with ps; [ pyhomematic ]; "lock.isy994" = ps: with ps; [ ]; + "lock.kiwi" = ps: with ps; [ ]; "lock.lockitron" = ps: with ps; [ ]; "lock.mqtt" = ps: with ps; [ paho-mqtt ]; "lock.nello" = ps: with ps; [ ]; @@ -528,6 +547,7 @@ "lock.verisure" = ps: with ps; [ ]; "lock.volvooncall" = ps: with ps; [ ]; "lock.wink" = ps: with ps; [ ]; + "lock.xiaomi_aqara" = ps: with ps; [ ]; "lock.zwave" = ps: with ps; [ ]; "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "logentries" = ps: with ps; [ ]; @@ -559,11 +579,13 @@ "media_player.directv" = ps: with ps; [ ]; "media_player.dunehd" = ps: with ps; [ ]; "media_player.emby" = ps: with ps; [ ]; + "media_player.epson" = ps: with ps; [ ]; "media_player.firetv" = ps: with ps; [ ]; "media_player.frontier_silicon" = ps: with ps; [ ]; "media_player.gpmdp" = ps: with ps; [ websocket_client ]; "media_player.gstreamer" = ps: with ps; [ ]; "media_player.hdmi_cec" = ps: with ps; [ ]; + "media_player.horizon" = ps: with ps; [ ]; "media_player.itunes" = ps: with ps; [ ]; "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; "media_player.lg_netcast" = ps: with ps; [ ]; @@ -589,7 +611,7 @@ "media_player.songpal" = ps: with ps; [ ]; "media_player.sonos" = ps: with ps; [ ]; "media_player.soundtouch" = ps: with ps; [ libsoundtouch ]; - "media_player.spotify" = ps: with ps; [ aiohttp-cors spotipy ]; + "media_player.spotify" = ps: with ps; [ aiohttp-cors ]; "media_player.squeezebox" = ps: with ps; [ ]; "media_player.ue_smart_radio" = ps: with ps; [ ]; "media_player.universal" = ps: with ps; [ ]; @@ -616,7 +638,11 @@ "namecheapdns" = ps: with ps; [ ]; "neato" = ps: with ps; [ ]; "nest" = ps: with ps; [ ]; + "nest.config_flow" = ps: with ps; [ ]; + "nest.const" = ps: with ps; [ ]; + "nest.local_auth" = ps: with ps; [ ]; "netatmo" = ps: with ps; [ ]; + "netgear_lte" = ps: with ps; [ ]; "no_ip" = ps: with ps; [ ]; "notify" = ps: with ps; [ ]; "notify.apns" = ps: with ps; [ ]; @@ -633,6 +659,7 @@ "notify.ecobee" = ps: with ps; [ ]; "notify.facebook" = ps: with ps; [ ]; "notify.file" = ps: with ps; [ ]; + "notify.flock" = ps: with ps; [ ]; "notify.free_mobile" = ps: with ps; [ ]; "notify.gntp" = ps: with ps; [ ]; "notify.group" = ps: with ps; [ ]; @@ -652,8 +679,8 @@ "notify.message_bird" = ps: with ps; [ ]; "notify.mycroft" = ps: with ps; [ ]; "notify.mysensors" = ps: with ps; [ ]; + "notify.netgear_lte" = ps: with ps; [ ]; "notify.nfandroidtv" = ps: with ps; [ ]; - "notify.nma" = ps: with ps; [ ]; "notify.prowl" = ps: with ps; [ ]; "notify.pushbullet" = ps: with ps; [ pushbullet ]; "notify.pushetta" = ps: with ps; [ ]; @@ -712,6 +739,7 @@ "rpi_gpio" = ps: with ps; [ ]; "rpi_pfio" = ps: with ps; [ ]; "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; + "sabnzbd" = ps: with ps; [ ]; "satel_integra" = ps: with ps; [ ]; "scene" = ps: with ps; [ ]; "scene.deconz" = ps: with ps; [ ]; @@ -799,6 +827,7 @@ "sensor.file" = ps: with ps; [ ]; "sensor.filesize" = ps: with ps; [ ]; "sensor.filter" = ps: with ps; [ ]; + "sensor.fints" = ps: with ps; [ ]; "sensor.fitbit" = ps: with ps; [ aiohttp-cors ]; "sensor.fixer" = ps: with ps; [ ]; "sensor.folder" = ps: with ps; [ ]; @@ -822,6 +851,7 @@ "sensor.homematicip_cloud" = ps: with ps; [ ]; "sensor.hp_ilo" = ps: with ps; [ ]; "sensor.htu21d" = ps: with ps; [ ]; + "sensor.hydrawise" = ps: with ps; [ ]; "sensor.hydroquebec" = ps: with ps; [ ]; "sensor.ihc" = ps: with ps; [ ]; "sensor.imap" = ps: with ps; [ aioimaplib ]; @@ -830,6 +860,7 @@ "sensor.insteon_plm" = ps: with ps; [ ]; "sensor.ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "sensor.iota" = ps: with ps; [ ]; + "sensor.iperf3" = ps: with ps; [ ]; "sensor.irish_rail_transport" = ps: with ps; [ ]; "sensor.isy994" = ps: with ps; [ ]; "sensor.juicenet" = ps: with ps; [ ]; @@ -865,7 +896,9 @@ "sensor.nest" = ps: with ps; [ ]; "sensor.netatmo" = ps: with ps; [ ]; "sensor.netdata" = ps: with ps; [ ]; + "sensor.netgear_lte" = ps: with ps; [ ]; "sensor.neurio_energy" = ps: with ps; [ ]; + "sensor.nsw_fuel_station" = ps: with ps; [ ]; "sensor.nut" = ps: with ps; [ ]; "sensor.nzbget" = ps: with ps; [ ]; "sensor.octoprint" = ps: with ps; [ ]; @@ -891,6 +924,7 @@ "sensor.radarr" = ps: with ps; [ ]; "sensor.rainbird" = ps: with ps; [ ]; "sensor.raincloud" = ps: with ps; [ ]; + "sensor.rainmachine" = ps: with ps; [ ]; "sensor.random" = ps: with ps; [ ]; "sensor.rest" = ps: with ps; [ ]; "sensor.rflink" = ps: with ps; [ ]; @@ -971,6 +1005,7 @@ "sensor.waze_travel_time" = ps: with ps; [ ]; "sensor.whois" = ps: with ps; [ ]; "sensor.wink" = ps: with ps; [ ]; + "sensor.wirelesstag" = ps: with ps; [ ]; "sensor.worldclock" = ps: with ps; [ ]; "sensor.worldtidesinfo" = ps: with ps; [ ]; "sensor.worxlandroid" = ps: with ps; [ ]; @@ -996,6 +1031,8 @@ "sleepiq" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; "snips" = ps: with ps; [ paho-mqtt ]; + "sonos" = ps: with ps; [ ]; + "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ websockets ]; "splunk" = ps: with ps; [ ]; "statsd" = ps: with ps; [ statsd ]; @@ -1030,13 +1067,16 @@ "switch.hive" = ps: with ps; [ ]; "switch.homekit_controller" = ps: with ps; [ ]; "switch.homematic" = ps: with ps; [ pyhomematic ]; + "switch.homematicip_cloud" = ps: with ps; [ ]; "switch.hook" = ps: with ps; [ ]; + "switch.hydrawise" = ps: with ps; [ ]; "switch.ihc" = ps: with ps; [ ]; "switch.insteon_local" = ps: with ps; [ ]; "switch.insteon_plm" = ps: with ps; [ ]; "switch.isy994" = ps: with ps; [ ]; "switch.kankun" = ps: with ps; [ ]; "switch.knx" = ps: with ps; [ ]; + "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "switch.linode" = ps: with ps; [ linode-api ]; "switch.litejet" = ps: with ps; [ ]; "switch.lutron_caseta" = ps: with ps; [ ]; @@ -1087,6 +1127,7 @@ "switch.wake_on_lan" = ps: with ps; [ wakeonlan ]; "switch.wemo" = ps: with ps; [ ]; "switch.wink" = ps: with ps; [ ]; + "switch.wirelesstag" = ps: with ps; [ ]; "switch.xiaomi_aqara" = ps: with ps; [ ]; "switch.xiaomi_miio" = ps: with ps; [ construct ]; "switch.zha" = ps: with ps; [ ]; @@ -1138,12 +1179,14 @@ "vultr" = ps: with ps; [ vultr ]; "wake_on_lan" = ps: with ps; [ wakeonlan ]; "waterfurnace" = ps: with ps; [ ]; + "watson_iot" = ps: with ps; [ ]; "weather" = ps: with ps; [ ]; "weather.bom" = ps: with ps; [ ]; "weather.buienradar" = ps: with ps; [ ]; "weather.darksky" = ps: with ps; [ ]; "weather.demo" = ps: with ps; [ ]; "weather.ecobee" = ps: with ps; [ ]; + "weather.ipma" = ps: with ps; [ ]; "weather.metoffice" = ps: with ps; [ ]; "weather.openweathermap" = ps: with ps; [ pyowm ]; "weather.yweather" = ps: with ps; [ yahooweather ]; @@ -1152,6 +1195,7 @@ "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; "wink" = ps: with ps; [ ]; + "wirelesstag" = ps: with ps; [ ]; "xiaomi_aqara" = ps: with ps; [ ]; "zabbix" = ps: with ps; [ ]; "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index fbc233398735..d1315611157a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -7,18 +7,25 @@ let py = python3.override { packageOverrides = self: super: { - aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "3.1.3"; + requests = super.requests.overridePythonAttrs (oldAttrs: rec { + version = "2.18.4"; src = oldAttrs.src.override { inherit version; - sha256 = "9fcef0489e3335b200d31a9c1fb6ba80fdafe14cd82b971168c2f9fa1e4508ad"; + sha256 = "0zi3v9nsmv9j27d0c0m1dvqyvaxz53g8m0aa1h3qanxs4irkwi4w"; }; }); - pytest = super.pytest.overridePythonAttrs (oldAttrs: rec { - version = "3.4.2"; + urllib3 = super.urllib3.overridePythonAttrs (oldAttrs: rec { + version = "1.22"; src = oldAttrs.src.override { inherit version; - sha256 = "117bad36c1a787e1a8a659df35de53ba05f9f3398fb9e4ac17e80ad5903eb8c5"; + sha256 = "0kyvc9zdlxr5r96bng5rhm9a6sfqidrbvvkz64s76qs5267dli6c"; + }; + }); + idna = super.idna.overridePythonAttrs (oldAttrs: rec { + version = "2.6"; + src = oldAttrs.src.override { + inherit version; + sha256 = "13qaab6d0s15gknz8v3zbcfmbj6v86hn9pjxgkdf62ch13imssic"; }; }); voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec { @@ -42,13 +49,6 @@ let sha256 = "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d"; }; }); - async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { - version = "2.0.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0"; - }; - }); # used by check_config script # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved colorlog = super.colorlog.overridePythonAttrs (oldAttrs: rec { @@ -74,7 +74,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.69.1"; + hassVersion = "0.72.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -89,7 +89,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1y74zq1nah9k6rif8k384ri11h1f23ggr613f7qnn0107b23asr4"; + sha256 = "1jz16ikxdh8bkscjs5pczvjqbfllz8avs11gkw8a97c2lds8la76"; }; propagatedBuildInputs = [ @@ -109,7 +109,7 @@ in with py.pkgs; buildPythonApplication rec { # Some basic components should be tested however py.test \ tests/components/{group,http} \ - tests/components/test_{api,configurator,demo,discovery,frontend,init,introduction,logger,script,shell_command,system_log,websocket_api}.py + tests/components/test_{api,configurator,demo,discovery,init,introduction,logger,script,shell_command,system_log,websocket_api}.py ''; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 168a1ec3b9dd..665c9e2867d0 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180509.0"; + version = "20180622.1"; src = fetchPypi { inherit pname version; - sha256 = "11d9c4a07565358e6ee001f5c57c8393b4aaadac0d993a0a39a0387a33644fba"; + sha256 = "1kzz1cmnpmsnrbc9amjcg8rb4a544xx2mpq4g23si6rk46b7n0x7"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index bdd88db09844..f3b67741c191 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Next Generation IRC Daemon"; - homepage = http://ngircd.barton.de; + homepage = https://ngircd.barton.de; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 9943c0b9ab03..305ee174bf3c 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: let - version = "4.10.0"; + version = "5.0.0"; mattermost-server = buildGoPackage rec { name = "mattermost-server-${version}"; @@ -10,7 +10,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "02isw8qapp35pgriy4w1ar1ppvgc5a10j550hjbc1mylnhzkg1jf"; + sha256 = "12wiw8k5is78ppazrf26y2xq73kwbafa9w75wjnb1839v2k9sark"; }; goPackagePath = "github.com/mattermost/mattermost-server"; @@ -20,11 +20,6 @@ let -X ${goPackagePath}/model.BuildNumber=nixpkgs-${version} ''; - postInstall = '' - ln -s $bin/bin/mattermost-server $bin/bin/platform - ln -s $bin/bin/mattermost-server $bin/bin/mattermost-platform - ''; - }; mattermost-webapp = stdenv.mkDerivation { @@ -32,7 +27,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "0pfj2dxl4qrv4w6yj0385nw0fa4flcg95kkahs0arwhan5bgifl5"; + sha256 = "1pal65di6w9idf3rwxh77la1v816h8kama1ilkbs40cpp2vazw3b"; }; installPhase = '' diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 646401ce02f9..5e3d118b2f3d 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.1.3"; + version = "5.1.4"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "09q4xrh4j02b8nrkskndahs039rhmcs8hrcgvnnpg36qqyvs1x0g"; + sha256 = "09bpijjm7cm4p5ci04ihq55fy5zwpdcld791vdpk6m91ixpab2zc"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "131dxpjnzhsjh6c0fp48jhxf5piy6wh287pfm2s7pm4ywq9m0q46"; + sha256 = "0ygfq4my3bdqs942l31w0695a6rwyrwq7jr23g0vgaqadamgbgkg"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index b7879cc763aa..031ba423cc40 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.6.1"; + version = "1.7.0"; goPackagePath = "github.com/influxdata/telegraf"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "0zc3bgs1ad392lqv72rkppxmk33b404b8jfx3wbzll7fklwxa8g2"; + sha256 = "1jinvncbn1srfmclhys6khvaczawy243vgmj2gsgm9szrnrf7klv"; }; buildFlagsArray = [ ''-ldflags= diff --git a/pkgs/servers/monitoring/telegraf/deps-1.6.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.7.0.nix index fb98b8686cc2..57a5ffd21b00 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.6.1.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.7.0.nix @@ -1,6 +1,15 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { + goPackagePath = "code.cloudfoundry.org/clock"; + fetch = { + type = "git"; + url = "https://github.com/cloudfoundry/clock"; + rev = "e9dc86bbf0e5bbe6bf7ff5a6f71e048959b61f71"; + sha256 = "1mwckqpg9qi5macfbx7lpc5frbd0dz8bzq78dl570j9j2aqp9hkf"; + }; + } + { goPackagePath = "collectd.org"; fetch = { type = "git"; @@ -10,6 +19,15 @@ }; } { + goPackagePath = "github.com/Microsoft/ApplicationInsights-Go"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/ApplicationInsights-Go"; + rev = "3612f58550c1de70f1a110c78c830e55f29aa65d"; + sha256 = "11znwr0787171yv80r5jmdks6i0i3rwa03ir1kapm0ycwr8h4nvy"; + }; + } + { goPackagePath = "github.com/Shopify/sarama"; fetch = { type = "git"; @@ -55,6 +73,15 @@ }; } { + goPackagePath = "github.com/armon/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-metrics"; + rev = "783273d703149aaeb9897cf58613d5af48861c25"; + sha256 = "1ci4kh35zdh5gyjhci5gi324iqcq04nb3qh89h9w6spwqb91w0ln"; + }; + } + { goPackagePath = "github.com/aws/aws-sdk-go"; fetch = { type = "git"; @@ -136,6 +163,15 @@ }; } { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "749f6afb4572201e3c37325d0ffedb6f32be8950"; + sha256 = "05jn2wvikyw0pbmi74w5axr0zgxn5y3ynn9rhsq87rmwqj7raxhd"; + }; + } + { goPackagePath = "github.com/docker/docker"; fetch = { type = "git"; @@ -154,6 +190,15 @@ }; } { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "47565b4f722fb6ceae66b95f853feed578a4a51c"; + sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; + }; + } + { goPackagePath = "github.com/eapache/go-resiliency"; fetch = { type = "git"; @@ -190,6 +235,15 @@ }; } { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "9144852efba7c4daf409943ee90767da62d55438"; + sha256 = "08jvki9id1wdca0j6kqb4fmipwvgmakg9yfavnbpyn3vsbx9vpbp"; + }; + } + { goPackagePath = "github.com/go-redis/redis"; fetch = { type = "git"; @@ -239,8 +293,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/mux"; - rev = "392c28fe23e1c45ddba891b0320b3b5df220beea"; - sha256 = "0dmihkq34ls23by08r8p92qpf77imibjd9m9qvw344j4r2z7bd4d"; + rev = "53c1911da2b537f792e7cafcb446b05ffe33b996"; + sha256 = "10cvljpjgvkq1zqj82hr46dnddfcpmm18wabbv4pkxjrmvb9xkf7"; }; } { @@ -257,8 +311,62 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/consul"; - rev = "63d2fc68239b996096a1c55a0d4b400ea4c2583f"; - sha256 = "0vx7jpi2a9374mlhn37b33780n7g950zh482z2sd4lsf29n4c580"; + rev = "5174058f0d2bda63fa5198ab96c33d9a909c58ed"; + sha256 = "0xm3gl8i7pgsbsc2397bwh9hp2dwnk4cmw5y05acqn3zpyp84sbv"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; + sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-immutable-radix"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-immutable-radix"; + rev = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf"; + sha256 = "13nv1dac6i2mjdy8vsd4vwawwja78vggdjcnj1xfykg2k8jbkphv"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-rootcerts"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-rootcerts"; + rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"; + sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"; + sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2"; + }; + } + { + goPackagePath = "github.com/hashicorp/serf"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/serf"; + rev = "984a73625de3138f44deb38d00878fab39eb6447"; + sha256 = "1sk9sw7q9knp7yi4r5kcr8cgyi9jzvgb0kzbwa38p8h3w394izkk"; + }; + } + { + goPackagePath = "github.com/influxdata/go-syslog"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/go-syslog"; + rev = "eecd51df3ad85464a2bab9b7d3a45bc1e299059e"; + sha256 = "0zw8wswr3afb48mi510mql58gz818dp0mzq3vllqqhrz3x8w580r"; }; } { @@ -275,8 +383,8 @@ fetch = { type = "git"; url = "https://github.com/influxdata/toml"; - rev = "5d1d907f22ead1cd47adde17ceec5bda9cacaf8f"; - sha256 = "1faf51s89sk1z41qfsazmddgwll7jq9xna67k3h3vry86c4vs2j4"; + rev = "2a2e3012f7cfbef64091cc79776311e65dfa211b"; + sha256 = "1dyzsg79rgl5bcvq7i7cnwhxr7racyhfhmqdq2701zgv77v3rab3"; }; } { @@ -298,6 +406,15 @@ }; } { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d"; + sha256 = "1kgzwiyqn24ba9kgpjxlq1h746gnyby0psbjj9mp2yx0h1i0kc4z"; + }; + } + { goPackagePath = "github.com/kardianos/osext"; fetch = { type = "git"; @@ -388,15 +505,6 @@ }; } { - goPackagePath = "github.com/nats-io/nats"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nats"; - rev = "ea9585611a4ab58a205b9b125ebd74c389a6b898"; - sha256 = "0i2whh6c8grzi9slrk2clh3dhykxzid4zn395wgysg6gfjrbd5i5"; - }; - } - { goPackagePath = "github.com/nats-io/nuid"; fetch = { type = "git"; @@ -415,6 +523,15 @@ }; } { + goPackagePath = "github.com/opencontainers/go-digest"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/go-digest"; + rev = "c9281466c8b2f606084ac71339773efd177436e7"; + sha256 = "1djdazssy27xn91pjhx3dgb0f11bnlzzbwkh7f8zwnpz011anasi"; + }; + } + { goPackagePath = "github.com/opencontainers/runc"; fetch = { type = "git"; @@ -460,6 +577,15 @@ }; } { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { goPackagePath = "github.com/prometheus/client_golang"; fetch = { type = "git"; @@ -527,8 +653,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "a5c2888e464b14fa882c2a059e0f95716bd45cf1"; - sha256 = "1czzl00lxcyhmf6x7wmw3dxmnyqij8lcahn5mv325csgyym4vm4w"; + rev = "c95755e4bcd7a62bb8bd33f3a597a7c7f35e2cf3"; + sha256 = "0rzfwhvwh58w1isr6jxq222xih578dsscdsfbh6bg1bxgbkz0x1m"; }; } { @@ -550,6 +676,15 @@ }; } { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "facf9a85c22f48d2f52f2380e4efce1768749a89"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + }; + } + { goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; @@ -635,8 +770,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f2499483f923065a842d38eb4c7f1927e6fc6e6d"; - sha256 = "0q1ps8igfczfafk39hkp8gs57s6qxjvf2c48hiq00p873agz0x7s"; + rev = "a337091b0525af65de94df2eb7e98bd9962dcbe2"; + sha256 = "11a6a3ah1f3jj6530q4hjqf79bv9fy62s5wgxpp28g8b3vlxxsyp"; }; } { @@ -658,6 +793,24 @@ }; } { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "11c7f9e547da6db876260ce49ea7536985904c9b"; + sha256 = "1qdda2b31qhli71xc2rscm7hf219gr2mals3n24kgv9svmw1cxkq"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "de2209a968d48e8970546c8a710189f7461370f7"; + sha256 = "0jby05p1qhm4gik0ya9n14vhf9x83mxysd917k53x59jrwrkh9gr"; + }; + } + { goPackagePath = "gopkg.in/asn1-ber.v1"; fetch = { type = "git"; @@ -676,6 +829,15 @@ }; } { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb"; + sha256 = "0912q06l6mrrrc7jj7hlrsbglklxyp67z1vnmvmcm04ck6hx8dlm"; + }; + } + { goPackagePath = "gopkg.in/gorethink/gorethink.v3"; fetch = { type = "git"; @@ -712,6 +874,15 @@ }; } { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } + { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 972bd53d95ee..0c549e2b7e9e 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -27,6 +27,5 @@ buildGoPackage rec { license = licenses.mit; homepage = https://influxdb.com/; maintainers = with maintainers; [ offline zimbatm ]; - platforms = platforms.linux; }; } diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 022a1a9ba10f..fe4d285713f6 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "1pccw3av72qqpyfsdyz72ab1lvc7fqraw14vi3hq67n96rsj017a"; + sha256 = "1hgpgkmz0rgdppk1rl41017369qp9lfbrdk7j3qc5dq54x8rxbjp"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 40472c59a873..241ed17d2a11 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "smcroute-${version}"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; rev = version; - sha256 = "12xwdwvl9h269armwak7grm4g944j2c89srha4lqx2zndx1ycg1r"; + sha256 = "0wh7c15lglcgiap9pplqpd5abnxhfx3vh0nqjzvfnl82hwhnld1z"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fee35a623330..d12621a4608a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -25,7 +25,10 @@ common = rec { # attributes common to both builds version = "10.2.15"; src = fetchurl { - url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"; + urls = [ + "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" + "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" + ]; sha256 = "04ds6vkb7k2lqpcdz663z4ll1jx1zz2hqxz5nj7gs8pwb18j1pik"; name = "mariadb-${version}.tar.gz"; }; @@ -177,11 +180,11 @@ everything = stdenv.mkDerivation (common // { connector-c = stdenv.mkDerivation rec { name = "mariadb-connector-c-${version}"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "0vvlfs56hxin130vh8pcs5w7jpv1yc6g76bhpzg88hnp4v1z8frg"; + url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//nyc2.mirrors.digitalocean.com/mariadb/"; + sha256 = "15iy5iqp0njbwbn086x2dq8qnbkaci7ydvi84cf5z8fxvljis9vb"; name = "mariadb-connector-c-${version}-src.tar.gz"; }; diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 6067d4983865..c32dcf475c5c 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -3,14 +3,14 @@ }: let - version = "11.29.3"; + version = "11.29.7"; in stdenv.mkDerivation rec { name = "monetdb-${version}"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "18l4jkkryki5az5n7gnalfdxz6ibnkg3q2z4cwh1010b313wqi8s"; + sha256 = "19f9zfg94k8hr9qc7jp1iwl8av08mibzgmid0gbqplyhf6x1j0r7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 6de53faf7710..4c728d2e3e79 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,9 +1,8 @@ - { stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }: with stdenv.lib; -overrideDerivation xorgserver (oldAttrs: { +xorgserver.overrideAttrs (oldAttrs: { name = "xwayland-${xorgserver.version}"; propagatedBuildInputs = oldAttrs.propagatedBuildInputs @@ -28,14 +27,10 @@ overrideDerivation xorgserver (oldAttrs: { rm -fr $out/share/X11/xkb/compiled ''; -}) // { meta = { description = "An X server for interfacing X11 apps with the Wayland protocol"; homepage = http://wayland.freedesktop.org/xserver.html; license = licenses.mit; platforms = platforms.linux; }; -} - - - +}) diff --git a/pkgs/shells/bash/bash-4.4-patches.nix b/pkgs/shells/bash/bash-4.4-patches.nix index 2d5128120295..a79ec90213a0 100644 --- a/pkgs/shells/bash/bash-4.4-patches.nix +++ b/pkgs/shells/bash/bash-4.4-patches.nix @@ -20,4 +20,8 @@ patch: [ (patch "017" "0w6jpj2giakji1ir83rpkx1y7n7xqppah3j748m6dm38hywr0gvp") (patch "018" "1k58h4wxbsg7r4rwhrvzx5hfbapba2nxjysbhh6qp6ki5ys99i2v") (patch "019" "07n1i5610lbs672x1s8g82qn3qfj06s0ip3z80sri0g8vxp0s5r7") +(patch "020" "0b2jk5n1af1vh590qfc52hv65mafb4vl1xv26s8j5a3byb5y4h0q") +(patch "021" "1hblcd2xmqqlp0idnavw66570n7m0yv5rbbr873c2gkn982mk3xx") +(patch "022" "0yfbjzr79vzjs2hyi5m8iy2b38fq7vikdfa4zqdvjsp36q4iycs5") +(patch "023" "1dlism6qdx60nvzj0v7ndr7lfahl4a8zmzckp13hqgdx7xpj7v2g") ] diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 41b5fd99504d..ab42dd319a62 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -41,10 +41,8 @@ in lib.init bootStages ++ [ targetPlatform = crossSystem; cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang - else if (crossSystem.useAndroidPrebuilt && crossSystem.is32bit) - then buildPackages.androidenv.androidndkPkgs_10e.gcc - else if (crossSystem.useAndroidPrebuilt && crossSystem.is64bit) - then buildPackages.androidenv.androidndkPkgs.gcc + else if crossSystem.useAndroidPrebuilt + then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc else buildPackages.gcc; }; }) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 71de45bb1d72..366be3915802 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -239,9 +239,11 @@ in rec { openssh sqlite sed serf openldap db cyrus-sasl expat apr-util findfreetype libssh curl cmake autoconf automake libtool cpio; - llvmPackages_5 = super.llvmPackages_5 // { - inherit (llvmPackages_5) libcxx libcxxabi; - }; + llvmPackages_5 = super.llvmPackages_5 // (let + libraries = super.llvmPackages_5.libraries.extend (_: _: { + inherit (llvmPackages_5) libcxx libcxxabi; + }); + in { inherit libraries; } // libraries); darwin = super.darwin // { inherit (darwin) @@ -280,12 +282,11 @@ in rec { coreutils findutils diffutils patchutils; llvmPackages_5 = super.llvmPackages_5 // (let - tools = super.llvmPackages_5.tools.extend (_: _: { - llvm = llvmPackages_5.llvm.override { inherit libcxxabi; }; - clang-unwrapped = llvmPackages_5.clang-unwrapped.override { llvm = self.llvmPackages_5.llvm; }; + tools = super.llvmPackages_5.tools.extend (llvmSelf: _: { + inherit (llvmPackages_5) llvm clang-unwrapped; }); - libraries = super.llvmPackages_5.libraries.extend (_: _: { - inherit (llvmPackages_5) libcxx libcxxabi; + libraries = super.llvmPackages_5.libraries.extend (llvmSelf: _: { + inherit (llvmPackages_5) libcxx libcxxabi compiler-rt; }); in { inherit tools libraries; } // tools // libraries); @@ -335,7 +336,7 @@ in rec { llvmPackages_5.clang-unwrapped; }); libraries = super.llvmPackages_5.libraries.extend (_: _: { - inherit (llvmPackages_5) libcxx libcxxabi; + inherit (llvmPackages_5) compiler-rt libcxx libcxxabi; }); in { inherit tools libraries; } // tools // libraries); @@ -369,20 +370,9 @@ in rec { initialPath = import ../common-path.nix { inherit pkgs; }; shell = "${pkgs.bash}/bin/bash"; - cc = lib.callPackageWith {} ../../build-support/cc-wrapper { - inherit (pkgs) stdenvNoCC; - inherit shell; - nativeTools = false; - nativeLibc = false; - buildPackages = { - inherit (prevStage) stdenv; - }; - inherit (pkgs) coreutils gnugrep; - # Hack to avoid man pages in stdenv to avoid mass rebuild - cc = builtins.removeAttrs pkgs.llvmPackages.clang-unwrapped [ "man" ]; - bintools = pkgs.darwin.binutils; - libc = pkgs.darwin.Libsystem; - extraPackages = [ pkgs.libcxx ]; + # Hack to avoid man pages in stdenv, building bootstrap python + cc = pkgs.llvmPackages.libcxxClang.override { + cc = builtins.removeAttrs pkgs.llvmPackages.clang-unwrapped [ "man" ]; }; extraNativeBuildInputs = []; @@ -399,7 +389,8 @@ in rec { allowedRequisites = (with pkgs; [ xz.out xz.bin libcxx libcxxabi gmp.out gnumake findutils bzip2.out - bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar + bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib llvmPackages.compiler-rt llvmPackages.compiler-rt.dev + zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext binutils.bintools darwin.binutils darwin.binutils.bintools diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index f9c6e9e77796..7bd82b4ab2a5 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -4,7 +4,7 @@ let # Sanitizers are not supported on Darwin. # Sanitizer headers aren't available in older libc++ stdenvs due to a bug sanitizersWorking = - (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "6.0.0") + (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0") || (stdenv.cc.isGNU && stdenv.isLinux); in stdenv.mkDerivation { name = "cc-wrapper-test"; diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 23e528297eef..1e7b4e58c171 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generate X11 mouse clicks from keyboard"; - homepage = http://www.semicomplete.com/projects/keynav/; + homepage = https://www.semicomplete.com/projects/keynav/; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index b109a835635b..c3d6faeac527 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -19,18 +19,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0c4jj580f7z6phiw4zhd32dlf4inkrxy3cig6ng66fi4zi6vnpc9"; + sha256 = "0fdcd5d63e231443b9e032de4e2c2be9e4f1c766a25054ad93410f5213e45645"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0rblb0akwdzr5i8al0dcz482xmx1xdnjnzgqywjvwd8fzdyzq7bp"; + sha256 = "d39293914b2e969bfe18dd19eb77ba96d283995f8cf1e5d7ba6ac712a3c9479a"; }; }.${system}; in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "190.0.1"; + version = "206.0.0"; src = fetchurl (sources name stdenv.system); diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index a0e7b1f906c9..46b4ada3d573 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.05.02"; + version = "2018.06.13"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "0pva0kwkwdrq4mfgiz389dhaqv66csqjaddirzxmhvvi6qji5d24"; + sha256 = "0mmr0wfdwx9vfz17gp0arspv835l5gka78hm5hkri4h3cvxpflfy"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 758146fcc00b..021f783e0fdd 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { using existing libraries, e.g. e2fslibs is used to read and write the ext2 partition. ''; - homepage = http://partclone.org; + homepage = https://partclone.org; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 9f9714e6d99a..a7f90b3b3037 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "restic-${version}"; - version = "0.9.0"; + version = "0.9.1"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "09520ggr98w7nn6kl3yx0nrx4f79q4vhg4q1hiv2nlwxd0jz1p6y"; + sha256 = "116dc86fjmflmk0n2nywvv2f6z1jig3czqxz0cx0z77n8rmj9npv"; }; buildPhase = '' diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 1a3352676b15..50ab7d85c5ac 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }: +{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules +, fetchpatch +}: stdenv.mkDerivation rec { name = "fcitx-qt5-${version}"; @@ -9,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0z8ax0dxk88byic41mfaiahjdv1k8ciwn97xfjkkgr4ijgscdr8c"; }; + patches = [ + # Fix build with Qt 5.11 + # https://github.com/fcitx/fcitx-qt5/issues/34 + (fetchpatch { + url = https://github.com/fcitx/fcitx-qt5/commit/af033e3d5305108eecc568adff7f8b2da5831ed6.diff; + sha256 = "14vfz1fw2k362wnqpglw766fg3d3mc8cmfgic2p96yyipjh9xx3b"; + }) + ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; buildInputs = [ fcitx qtbase ]; diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index 2f442a7a9c10..54a6fac17a3c 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "clex-${version}"; - version = "4.6.patch6"; + version = "4.6.patch9"; src = fetchurl { - sha256 = "0bqa2hc9721d62cfsy5c7a5pzgh9b4px7g4q60xlybkwll19qbbp"; + sha256 = "1qj5yp8k90wag5sb3zrm2pn90qqx3zbrgf2gqpqpdqmlgffnv1jc"; url = "${meta.homepage}/download/${name}.tar.gz"; }; diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix index b20e493a5855..3d6d2328da1e 100644 --- a/pkgs/tools/misc/cutecom/default.nix +++ b/pkgs/tools/misc/cutecom/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "cutecom-${version}"; - version = "0.40.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "neundorf"; repo = "CuteCom"; rev = "v${version}"; - sha256 = "1bn6vndqlvn73riq6p0nanmcl35ja9gsil5hvfpf509r7i8gx4ds"; + sha256 = "07h1r7bcz86fvcvxq6g5zyh7fsginx27jbp81a7hjhhhn6v0dsmh"; }; preConfigure = '' diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index bf4319759fb6..715996e8f61a 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.101"; + version = "1.0.103"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1p1a81s8hq73byd7256iljdls389x2q7w6srgrgfmx5bl1csnzp3"; + sha256 = "07qqbm50ji1j04hgv1fmy7y1jwl4rjh8q57znh9g3rr4j6fmax7q"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 15d8647ff823..e22bce7c6989 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.15.1"; + version = "2.17.0"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "07kzfkv5ssys788j0f1bp73gd7b53vwv2jsxkd85zwb3kby1145v"; + sha256 = "1dmanqpifx27cz41yc3ijpij0wrbgw9qny2d4n6jppfwf2qzyq4s"; }; postConfigure = '' diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index b8791f5f32a2..9301ce12a055 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "4.0"; + version = "4.1"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "12vc3xp0z0abmsy5kbix0wmn0sca39c8miyga6cijydi128zxm2a"; + sha256 = "0y7gvyf0iykpf3gfw09m21hy51m6qn4cpkbrm4nnn7pwrwycj0y5"; }; postPatch = '' diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 62c782b26fec..0e0bc37ad537 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ethtool-${version}"; - version = "4.16"; + version = "4.17"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "00ss07jc7p276d83f6jpafgwyc9yiribciyqcgx9j86v49kpm5py"; + sha256 = "11f5503mgcwjn1q4dvhjiqwnw3zmp2gbhirjvgfr71y72ys1wsy4"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 3903fde3302e..77ec5bcb86bb 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "1jhl50yj5h6wl3fx1hcqi4vb7633srmbbcpsgajprc5fxscjgapm"; + sha256 = "14a3bd84bnnxdrf1x80w860mhm3x4cy9jp9sf9643svq4bky4i41"; }; doCheck = true; diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index 613fdc0f4555..84d3239729f5 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" "$out/share/gams" cp -a * "$out/share/gams" - cp ${licenseFile} $out/share/gamslice.txt + cp ${licenseFile} $out/share/gams/gamslice.txt '' + stdenv.lib.optionalString (optgamsFile != null) '' - cp ${optgamsFile} $out/share/optgams.def + cp ${optgamsFile} $out/share/gams/optgams.def ln -s $out/share/gams/optgams.def $out/bin/optgams.def ''; diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 4410d1e3cd4e..acd58c9bcbd5 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jdupes-${version}"; - version = "1.9"; + version = "1.10.2"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "0z6hb4jva0pnk5fb1p59qwyglgrpxgpnz4djq3g00y5yxv3sj9z9"; + sha256 = "0msp68h1gaipwpvdylpwd6w9al5gcmawj9cmvi7nw8ihh184g3m7"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isLinux "ENABLE_BTRFS=1"; + enableParallelBuilding = true; + + postInstall = '' + install -Dm644 -t $out/share/doc/jdupes CHANGES LICENSE README + + ''; + meta = with stdenv.lib; { description = "A powerful duplicate file finder and an enhanced fork of 'fdupes'"; longDescription = '' @@ -26,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/jbruchon/jdupes; license = licenses.mit; + maintainers = with maintainers; [ romildo ]; platforms = platforms.all; - maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix new file mode 100644 index 000000000000..58c9ee770b7f --- /dev/null +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl, systemd }: + +rustPlatform.buildRustPackage rec { + name = "journaldriver-${version}"; + version = "1.0.0"; + cargoSha256 = "04llhriwsrjqnkbjgd22nhci6zmhadclnd8r2bw5092gwdamf49k"; + + src = fetchFromGitHub { + owner = "aprilabank"; + repo = "journaldriver"; + rev = "v${version}"; + sha256 = "1163ghf7dxxchyawdaa7zdi8ly2pxmc005c2k549larbirjjbmgc"; + }; + + buildInputs = [ openssl systemd ]; + nativeBuildInputs = [ pkgconfig ]; + + meta = with lib; { + description = "Log forwarder from journald to Stackdriver Logging"; + homepage = "https://github.com/aprilabank/journaldriver"; + license = licenses.gpl3; + maintainers = [ maintainers.tazjin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 11759cc6d408..3089d6cace90 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -38,7 +38,7 @@ buildGoPackage rec { ''; homepage = https://godoc.org/github.com/gokcehan/lf; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 410ab4543123..5941b8056b19 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -1,10 +1,5 @@ -{ stdenv -, fetchFromGitHub -, libtool -, automake -, autoconf -, python2 # Needed for tests -}: +{ stdenv, fetchFromGitHub, autoreconfHook }: + stdenv.mkDerivation rec { name = "libcpuid-${version}"; version = "0.4.0"; @@ -16,51 +11,18 @@ stdenv.mkDerivation rec { sha256 = "136kv6m666f7s18mim0vdbzqvs4s0wvixa12brj9p3kmfbx48bw7"; }; - patchPhase = '' - libtoolize - autoreconf --install - ''; - - configurePhase = '' - mkdir -p Install - ./configure --prefix=$(pwd)/Install - substituteInPlace Makefile --replace "/usr/local" "$out" - ''; - - buildPhase = '' - make all - ''; - - postInstall = '' - pushd Install - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/lib ${python2.interpreter} ../tests/run_tests.py ./bin/cpuid_tool ../tests/ - popd - - function fixRunPath { - p0=$(patchelf --print-rpath $1) - p1=$(echo $p0 | sed -re 's#.*Install/lib:##g') - patchelf --set-rpath $p1 $1 - } - - fixRunPath Install/bin/cpuid_tool - - mkdir -p $out - sed -i -re "s#(prefix=).*Install#\1$out#g" Install/lib/pkgconfig/libcpuid.pc - - cp -r Install/* $out - cp -r tests $out - ''; - - nativeBuildInputs = [ - libtool - automake - autoconf + patches = [ + # Work around https://github.com/anrieff/libcpuid/pull/102. + ./stdint.patch ]; + nativeBuildInputs = [ autoreconfHook ]; + meta = with stdenv.lib; { homepage = http://libcpuid.sourceforge.net/; - description = "a small C library for x86 CPU detection and feature extraction"; - license = licenses.bsd3; - maintainers = with maintainers; [ artuuge ]; + description = "A small C library for x86 CPU detection and feature extraction"; + license = licenses.bsd2; + maintainers = with maintainers; [ orivej artuuge ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/libcpuid/stdint.patch b/pkgs/tools/misc/libcpuid/stdint.patch new file mode 100644 index 000000000000..beb8890c5a28 --- /dev/null +++ b/pkgs/tools/misc/libcpuid/stdint.patch @@ -0,0 +1,5 @@ +--- a/libcpuid/libcpuid.h ++++ b/libcpuid/libcpuid.h +@@ -88 +88 @@ +-#include "libcpuid_types.h" ++#include <stdint.h> diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index a437eba49574..98154d9d5628 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,40 +1,56 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection -, libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse -, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk-doc, gobjectIntrospection, gnome3 +, glib, systemd, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse, utillinuxMinimal, libselinux +, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42, python3 }: let + version = "2018.6"; + libglnx-src = fetchFromGitHub { - owner = "GNOME"; - repo = "libglnx"; - rev = "0c82203cd459a35cc3f471e3205355e9fb79160f"; - sha256 = "0xbrv7q6b2ygrbr0yr7p01zpryw45643qfwnlw0z2yv515qs7isc"; + owner = "GNOME"; + repo = "libglnx"; + rev = "e1a78cf2f5351d5394ccfb79f3f5a7b4917f73f3"; + sha256 = "10kzyjbrmr98i65hlz8jc1v5bijyqwwfp6qqjbd5g3y0n520iaxc"; }; bsdiff-src = fetchFromGitHub { - owner = "mendsley"; - repo = "bsdiff"; - rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; + owner = "mendsley"; + repo = "bsdiff"; + rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1"; }; - - version = "2018.4"; in stdenv.mkDerivation { name = "ostree-${version}"; + outputs = [ "out" "dev" "man" "installedTests" ]; + src = fetchFromGitHub { - rev = "v${version}"; - owner = "ostreedev"; - repo = "ostree"; - sha256 = "00jgj6vcjpz1akfbmf82q1bcs3njrmvdgy4c2gnn24vkmh9yr0lr"; + rev = "v${version}"; + owner = "ostreedev"; + repo = "ostree"; + sha256 = "0kk04pznk6m6fqdz609m2zcnkalcw9q8fsx8wm42k6dhf6cw7l3g"; }; + patches = [ + # Tests access the helper using relative path + # https://github.com/ostreedev/ostree/issues/1593 + (fetchpatch { + url = https://github.com/ostreedev/ostree/pull/1633.patch; + sha256 = "07xiw1dr7j4yw3w92qhw37f9crlglibflcqj2kf0v5gfrl9i6g4j"; + }) + ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig gtk-doc gobjectIntrospection which yacc libxslt docbook_xsl docbook_xml_dtd_42 ]; - buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libarchive libcap bzip2 ]; + buildInputs = [ + glib systemd e2fsprogs libsoup gpgme fuse libselinux libcap + libarchive bzip2 xz + utillinuxMinimal # for libmount + (python3.withPackages (p: with p; [ pyyaml ])) gnome3.gjs # for tests + ]; prePatch = '' rmdir libglnx bsdiff @@ -44,16 +60,24 @@ in stdenv.mkDerivation { preConfigure = '' env NOCONFIGURE=1 ./autogen.sh - - configureFlags+="--with-systemdsystemunitdir=$out/lib/systemd/system" ''; + configureFlags = [ + "--with-systemdsystemunitdir=$(out)/lib/systemd/system" + "--with-systemdsystemgeneratordir=$(out)/lib/systemd/system-generators" + "--enable-installed-tests" + ]; + + makeFlags = [ + "installed_testdir=$(installedTests)/libexec/installed-tests/libostree" + "installed_test_metadir=$(installedTests)/share/installed-tests/libostree" + ]; + meta = with stdenv.lib; { description = "Git for operating system binaries"; - homepage = https://ostree.readthedocs.io/en/latest/; - license = licenses.lgpl2Plus; - platforms = platforms.linux; + homepage = https://ostree.readthedocs.io/en/latest/; + license = licenses.lgpl2Plus; + platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; }; } - diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 75be4efe7d1b..b884a23ca7bc 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20180522"; + name = "parallel-20180622"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1khcz9pm7rjnq4gw8pn30k1d40x337a204dxj4y4qijpx8m7w0gb"; + sha256 = "1n91dnnl8d8pman20hr03l9qrpc9wm5hw32ph45xjs0bgp1nmk7j"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 8c2845dc8ebd..75b9dd15fb7f 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,40 +1,57 @@ -{ stdenv, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, - libcap, glib, libgsystem, json-glib, libarchive, libsolv, librepo, gtk-doc, elfutils, - gperf, cmake, pcre, check, python, libxslt, docbook_xsl, docbook_xml_dtd_42, acl }: +{ stdenv, fetchpatch, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, + gobjectIntrospection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, gperf, cmake, + libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit, + bubblewrap, pcre, check, python }: let libglnx-src = fetchFromGitHub { - owner = "GNOME"; - repo = "libglnx"; - rev = "4ae5e3beaaa674abfabf7404ab6fafcc4ec547db"; - sha256 = "1npb9zbyb4bl0nxqf0pcqankcwzs3k1x8i2wkdwhgak4qcvxvfqn"; + owner = "GNOME"; + repo = "libglnx"; + rev = "97b5c08d2f93dc93ba296a84bbd2a5ab9bd8fc97"; + sha256 = "0cz4x63f6ys7dln54g6mrr7hksvqwz78wdc8qb7zr1h2cp1azcvs"; }; libdnf-src = fetchFromGitHub { - owner = "rpm-software-management"; - repo = "libhif"; - rev = "b69552b3b3a42fd41698a925d5f5f623667bac63"; - sha256 = "0h6k09rb4imzbmsn7mspwl0js2awqdpb4ysdqq550vw2nr0dzszr"; + owner = "rpm-software-management"; + repo = "libdnf"; + rev = "b3fcc53f6f3baf4f51f836f5e1eb54eb82d5df49"; + sha256 = "15nl9x4blyc9922rvz7iq56yy8hxhpsf31cs3ag7aypqpfx3czci"; }; - version = "2016.10"; + version = "2018.5"; in stdenv.mkDerivation { name = "rpm-ostree-${version}"; + outputs = [ "out" "dev" "man" "devdoc" ]; + src = fetchFromGitHub { - rev = "v${version}"; - owner = "projectatomic"; - repo = "rpm-ostree"; - sha256 = "0a0wwklzk1kvk3bbxxfvxgk4ck5dn7a7v32shqidb674fr2d5pvb"; + rev = "v${version}"; + owner = "projectatomic"; + repo = "rpm-ostree"; + sha256 = "0y37hr8mmrsww4ka2hlqmz7wp57ibzhah4j87yg8q8dks5hxcbsx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig which autoconf automake libtool cmake gperf + gobjectIntrospection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42 + ]; buildInputs = [ - which autoconf automake libtool libcap ostree rpm glib libgsystem gperf - json-glib libarchive libsolv librepo gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 - cmake pcre check python - # FIXME: get rid of this once libarchive properly propagates this - acl + libcap ostree rpm glib systemd polkit bubblewrap + json-glib libarchive libsolv librepo + pcre check python + ]; + + patches = [ + # Use gdbus-codegen from PATH + (fetchpatch { + url = https://github.com/projectatomic/rpm-ostree/commit/315406d8cd0937e786723986e88d376c88806c60.patch; + sha256 = "073yfa62515kyf58s0sz56w0a40062lh761y2y4assqipybwxbvp"; + }) + ]; + + configureFlags = [ + "--enable-gtk-doc" + "--with-bubblewrap=${bubblewrap}/bin/bwrap" ]; dontUseCmakeConfigure = true; @@ -47,14 +64,11 @@ in stdenv.mkDerivation { # According to #cmake on freenode, libdnf should bundle the FindLibSolv.cmake module cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake libdnf/cmake/modules/ - # See https://github.com/projectatomic/rpm-ostree/issues/480 - substituteInPlace src/libpriv/rpmostree-unpacker.c --replace 'include <selinux/selinux.h>' "" - # libdnf normally wants sphinx to build its hawkey manpages, but we don't care about those manpages since we don't use hawkey substituteInPlace configure.ac --replace 'cmake \' 'cmake -DWITH_MAN=off \' # Let's not hardcode the rpm-gpg path... - substituteInPlace libdnf/libdnf/dnf-keyring.c \ + substituteInPlace libdnf/libdnf/dnf-keyring.cpp \ --replace '"/etc/pki/rpm-gpg"' 'getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") ? getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") : "/etc/pki/rpm-gpg"' ''; @@ -64,10 +78,10 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; - homepage = "https://rpm-ostree.readthedocs.io/en/latest/"; - license = licenses.lgpl2Plus; - platforms = platforms.linux; + homepage = https://rpm-ostree.readthedocs.io/en/latest/; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index 938092c23872..1f50eef0ed00 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "0.10.1"; - source.sha256 = "0rjy2glqwbz07ci0snycq19myfczd2pry2iw4g0nqsw37wclm1vi"; + version = "0.11.3"; + source.sha256 = "1l9pnfmfxjrszzqbw8w2r6akdi7g52q9iga01bxmy2nm27mbv2q1"; erubis = buildRubyGem rec { inherit ruby; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 9899e38c854e..6d71a4072397 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { name = "wakatime-${version}"; - version = "10.1.0"; + version = "10.2.1"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime"; rev = version; - sha256 = "0mq1b5hwm03jz1mhlfiwi8k5r6556r1nfv9h7qs3y32zrj9mvifv"; + sha256 = "14b87x6pd80qdf2dxj9dd53k3a61i793cnrm4nqycn3d7vq2akqx"; }; # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix new file mode 100644 index 000000000000..8a2d32e543b0 --- /dev/null +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -0,0 +1,50 @@ +{stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}: +let +version = "2.2.1"; +apk = stdenv.mkDerivation { + name = "gnirehtet.apk-${version}"; + src = fetchzip { + url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip"; + sha256 = "1rz2wdjc1y7n8fhskmki1nj0ak80ylxspcsrcdnjkk9r7jbq0kan"; + }; + installPhase = '' + mkdir $out + mv gnirehtet.apk $out + ''; +}; +in +rustPlatform.buildRustPackage rec { + name = "gnirehtet-${version}"; + + src = fetchFromGitHub { + owner = "Genymobile"; + repo = "gnirehtet"; + rev = "v${version}"; + sha256 = "1mv8nq4422k2d766qjqqnqp47qzzbbvlwhdni0k6w4nmd3m5cnd9"; + }; + sourceRoot = "source/relay-rust"; + cargoSha256 = "11qf9n6h6akvb0rbmsgdlfmypkbnas8ss1cs7i8w19mh7524n0v5"; + + patchFlags = [ "-p2" ]; + patches = [ + (substituteAll { + src = ./paths.patch; + adb = "${androidenv.platformTools}/bin/adb"; + inherit apk; + }) + ]; + + meta = with stdenv.lib; { + description = "Reverse tethering over adb for Android"; + longDescription = '' + This project provides reverse tethering over adb for Android: it allows devices to use the internet connection of the computer they are plugged on. It does not require any root access (neither on the device nor on the computer). + + This relies on adb, make sure you have the required permissions/udev rules. + ''; + homepage = https://github.com/Genymobile/gnirehtet; + license = licenses.asl20; + maintainers = with maintainers; [ symphorien ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/tools/networking/gnirehtet/paths.patch b/pkgs/tools/networking/gnirehtet/paths.patch new file mode 100644 index 000000000000..72a8445d83b9 --- /dev/null +++ b/pkgs/tools/networking/gnirehtet/paths.patch @@ -0,0 +1,35 @@ +diff --git a/relay-rust/src/main.rs b/relay-rust/src/main.rs +index 4f1be53..96d2e78 100644 +--- a/relay-rust/src/main.rs ++++ b/relay-rust/src/main.rs +@@ -299,7 +299,7 @@ impl Command for RelayCommand { + + fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> { + info!(target: TAG, "Installing gnirehtet client..."); +- exec_adb(serial, vec!["install", "-r", "gnirehtet.apk"]) ++ exec_adb(serial, vec!["install", "-r", "@apk@/gnirehtet.apk"]) + } + + fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> { +@@ -467,8 +467,8 @@ fn exec_adb<S: Into<String>>( + args: Vec<S>, + ) -> Result<(), CommandExecutionError> { + let adb_args = create_adb_args(serial, args); +- debug!(target: TAG, "Execute: adb {:?}", adb_args); +- match process::Command::new("adb").args(&adb_args[..]).status() { ++ debug!(target: TAG, "Execute: @adb@ {:?}", adb_args); ++ match process::Command::new("@adb@").args(&adb_args[..]).status() { + Ok(exit_status) => { + if exit_status.success() { + Ok(()) +@@ -490,8 +490,8 @@ fn must_install_client(serial: Option<&String>) -> Result<bool, CommandExecution + serial, + vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"], + ); +- debug!(target: TAG, "Execute: adb {:?}", args); +- match process::Command::new("adb").args(&args[..]).output() { ++ debug!(target: TAG, "Execute: @adb@ {:?}", args); ++ match process::Command::new("@adb@").args(&args[..]).output() { + Ok(output) => { + if output.status.success() { + // the "regex" crate makes the binary far bigger, so just parse the versionCode diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index 82e105c3a3be..6fd4ab361630 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { the situation that your Internet access is firewalled, but pings are allowed. ''; - homepage = http://code.gerade.org/hans/; + homepage = https://code.gerade.org/hans/; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index c1d00dba2b46..c7d153186986 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,7 +2,7 @@ asciidoc, libxml2, libxslt, docbook_xml_xslt }: pythonPackages.buildPythonApplication rec { - version = "7.2.0"; + version = "7.2.1"; name = "offlineimap-${version}"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "0xyvqgy36n0bb41c4ffldyrcnaja5gpwx2ngbnk3qs22ldb2n1sb"; + sha256 = "1m5i74baazwazqp98ssma968rnwzfl1nywb7icf0swc8447ps97q"; }; postPatch = '' diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index b265cdb4c326..5512db9fe760 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.7.0"; + version = "1.7.1"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1qfz5igry7fhrkz5iyzqpffldhpdvcw98k06yb6acwc1jyv87nh0"; + sha256 = "01nsgmmh72qk0aq2zdjh8qqn256mmvz1w2gl0wi7g29d82y2hdfm"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 8e05e49962cd..5258d53a18ae 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -3,18 +3,17 @@ with python3Packages; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "pirate-get"; - version = "0.2.13"; + version = "0.3.1"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "c5b159e02067136d3157d56061958a50e997a078510e4403bb7de40217833f3f"; + sha256 = "9d7cc4b15dd8c6a82f9e03a666372e38613ccafdc846ad4c1226ba936beea68d"; }; - propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ]; + propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 pyperclip ]; meta = with stdenv.lib; { description = "A command line interface for The Pirate Bay"; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index d7ef54a2497d..a009e76d9e0a 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.7.1"; + version = "1.7.3"; src = fetchurl { url = "https://unbound.net/downloads/${name}.tar.gz"; - sha256 = "13b210hd200xxvaffyzqb4g58knv1sfigph70ai74lrcb3pqbq2n"; + sha256 = "c11de115d928a6b48b2165e0214402a7a7da313cd479203a7ce7a8b62cba602d"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # get rid of runtime dependencies on $dev outputs + ''substituteInPlace "$lib/lib/libunbound.la" '' + stdenv.lib.concatMapStrings - (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' ") + (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") buildInputs; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix new file mode 100644 index 000000000000..f6c4c25559e2 --- /dev/null +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -0,0 +1,146 @@ +{ stdenv, writeScript, buildFHSUserEnv, coreutils +, extraPkgs ? pkgs: [] }: + +buildFHSUserEnv { + name = "appimage-run"; + + # Most of the packages were taken from the Steam chroot + targetPkgs = pkgs: with pkgs; [ + gtk3 + bashInteractive + gnome3.zenity + python2 + xorg.xrandr + which + perl + xdg_utils + iana-etc + ] ++ extraPkgs pkgs; + + multiPkgs = pkgs: with pkgs; [ + desktop-file-utils + xorg.libXcomposite + xorg.libXtst + xorg.libXrandr + xorg.libXext + xorg.libX11 + xorg.libXfixes + libGL + + gst_all_1.gstreamer + gst_all_1.gst-plugins-ugly + libdrm + xorg.xkeyboardconfig + xorg.libpciaccess + + glib + gtk2 + bzip2 + zlib + gdk_pixbuf + + xorg.libXinerama + xorg.libXdamage + xorg.libXcursor + xorg.libXrender + xorg.libXScrnSaver + xorg.libXxf86vm + xorg.libXi + xorg.libSM + xorg.libICE + gnome2.GConf + freetype + (curl.override { gnutlsSupport = true; sslSupport = false; }) + nspr + nss + fontconfig + cairo + pango + expat + dbus + cups + libcap + SDL2 + libusb1 + dbus-glib + libav + atk + libudev0-shim + networkmanager098 + + xorg.libXt + xorg.libXmu + xorg.libxcb + libGLU + libuuid + libogg + libvorbis + SDL + SDL2_image + glew110 + openssl + libidn + tbb + wayland + mesa_noglu + libxkbcommon + + flac + freeglut + libjpeg + libpng12 + libsamplerate + libmikmod + libtheora + libtiff + pixman + speex + SDL_image + SDL_ttf + SDL_mixer + SDL2_ttf + SDL2_mixer + gstreamer + gst-plugins-base + libappindicator-gtk2 + libcaca + libcanberra + libgcrypt + libvpx + librsvg + xorg.libXft + libvdpau + alsaLib + strace + ]; + + runScript = writeScript "appimage-exec" '' + #!${stdenv.shell} + APPIMAGE="$(realpath "$1")" + + if [ ! -x "$APPIMAGE" ]; then + echo "fatal: $APPIMAGE is not executable" + exit 1 + fi + + SHA256="$(${coreutils}/bin/sha256sum "$APPIMAGE" | cut -d ' ' -f 1)" + SQUASHFS_ROOT="''${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256/" + mkdir -p "$SQUASHFS_ROOT" + + export APPDIR="$SQUASHFS_ROOT/squashfs-root" + if [ ! -x "$APPDIR" ]; then + cd "$SQUASHFS_ROOT" + "$APPIMAGE" --appimage-extract 2>/dev/null + fi + + cd "$APPDIR" + export PATH="$PATH:$PWD/usr/bin" + export APPIMAGE_SILENT_INSTALL=1 + + if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then + exec "$APPIMAGE_DEBUG_EXEC" + fi + + exec ./AppRun + ''; +} diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 8eb266a9e654..44b67ae4dccd 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "home-manager-${version}"; - version = "2017-12-7"; + version = "2018-06-14"; src = fetchFromGitHub{ owner = "rycee"; repo = "home-manager"; - rev = "0be32c9d42e3a8739263ae7886dc2448c833c19c"; - sha256 = "06lmnzlf5fmiicbgai27ad9m3bj980xf8ifdpc5lzbsy77pfcfap"; + rev = "5641ee3f942e700de35b28fc879b0d8a10a7a1fe"; + sha256 = "0bqzwczbr5c2y3ms7m7ly0as9zsnqwljq61ci2y2gbqzw3md1x2j"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index 893429537050..10afb1d90976 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -1,12 +1,12 @@ { lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }: let self = stdenv.mkDerivation rec { name = "nix-pin-${version}"; - version = "0.3.1"; + version = "0.3.4"; src = fetchFromGitHub { owner = "timbertson"; repo = "nix-pin"; - rev = "version-0.3.1"; - sha256 = "1sldbrz33wz30d3vv3d2clyqyd6x1y6h6xjz1xv55fa97ig1h481"; + rev = "version-0.3.4"; + sha256 = "03wdxai3hpv2v9jp7r91x8y36ryz6v1cczmx3d26g1bf0ij5svb8"; }; buildInputs = [ python3 mypy makeWrapper ]; checkPhase = '' diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix index fe3cf33b46c8..e7eb497b4b9f 100644 --- a/pkgs/tools/package-management/nix-update-source/default.nix +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -1,12 +1,12 @@ { lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }: python3Packages.buildPythonApplication rec { - version = "0.5.0"; + version = "0.6.3"; name = "nix-update-source-${version}"; src = fetchFromGitHub { owner = "timbertson"; repo = "nix-update-source"; - rev = "version-0.5.0"; - sha256 = "13icwk249frddsmn9albasikwp8asmgvp3jf9xj9adzh63wzh1i7"; + rev = "version-0.6.3"; + sha256 = "157wvv9vnaszzwbj68jpdc0imcm1hdab3z760bx2axbsgfpqqilz"; }; propagatedBuildInputs = [ nix-prefetch-scripts ]; passthru = { diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index fe7d50602628..25102fd07303 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,18 +1,18 @@ { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }: buildGoPackage rec { - version = "1.7.1"; + version = "1.8.1"; name = "gopass-${version}"; - goPackagePath = "github.com/justwatchcom/gopass"; + goPackagePath = "github.com/gopasspw/gopass"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { - owner = "justwatchcom"; + owner = "gopasspw"; repo = "gopass"; rev = "v${version}"; - sha256 = "01cif6a2xa3c8nki0pas9mywdxs8d9niv8z13mii5hcfqvm0s7aw"; + sha256 = "1b3caydxz3zf1ky6qvkx0dgidlalvpmga6cjh3gqc269n00lwh6w"; }; wrapperPath = with stdenv.lib; makeBinPath ([ @@ -26,6 +26,9 @@ buildGoPackage rec { $bin/share/bash-completion/completions \ $bin/share/zsh/site-functions \ $bin/share/fish/vendor_completions.d + # by default, gopass tries to write configuration to /homeless-shelter + # during startup, which lands in stdout + export GOPASS_CONFIG=/dev/null $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass $bin/bin/gopass completion zsh > $bin/share/zsh/site-functions/_gopass $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish @@ -38,7 +41,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; - homepage = https://www.justwatch.com/gopass/; + homepage = https://www.gopass.pw/; license = licenses.mit; maintainers = with maintainers; [ andir ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index 5eb659f40c3a..d858ed3fd6d3 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { The package is based on the debian package libacr38u. ''; - homepage = http://www.acs.com.hk; + homepage = https://www.acs.com.hk; license = licenses.lgpl2Plus; maintainers = with maintainers; [ berce ]; platforms = with platforms; unix; diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 82b7110189c7..b74905b6e7e2 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "REINER SCT cyberJack USB chipcard reader user space driver"; - homepage = http://www.reiner-sct.com/; + homepage = https://www.reiner-sct.com/; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ aszlig ]; diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/tools/system/ddrescueview/default.nix new file mode 100644 index 000000000000..517cefb6a2b3 --- /dev/null +++ b/pkgs/tools/system/ddrescueview/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk_pixbuf, glib, gtk2, libX11, pango }: + +stdenv.mkDerivation rec { + name = "ddrescueview-0.4alpha3"; + + src = fetchurl { + name = "${name}.tar.xz"; + url = "mirror://sourceforge/ddrescueview/ddrescueview-source-0.4%7Ealpha3.tar.xz"; + sha256 = "0603jisxkswfyh93s3i20f8ns4yf83dmgmy0lg5001rvaw9mkw9j"; + }; + + nativeBuildInputs = [ fpc lazarus ]; + + buildInputs = [ atk cairo gdk_pixbuf glib gtk2 libX11 pango ]; + + sourceRoot = "source"; + + NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + + buildPhase = '' + lazbuild --lazarusdir=${lazarus}/share/lazarus ddrescueview.lpi + ''; + + installPhase = '' + install -Dt $out/bin ddrescueview + cd ../resources/linux + install -Dt $out/share/applications ddrescueview.desktop + install -Dt $out/share/icons/hicolor/32x32/apps ddrescueview.xpm + install -Dt $out/share/man/man1 ddrescueview.1 + ''; + + meta = with lib; { + description = "A tool to graphically examine ddrescue mapfiles"; + homepage = https://sourceforge.net/projects/ddrescueview/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix new file mode 100644 index 000000000000..f8a6dac81976 --- /dev/null +++ b/pkgs/tools/system/ddrutility/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "ddrutility-${version}"; + version = "2.8"; + + src = fetchurl { + url = "mirror://sourceforge/ddrutility/${name}.tar.gz"; + sha256 = "023g7f2sfv5cqk3iyss4awrw3b913sy5423mn5zvlyrri5hi2cac"; + }; + + postPatch = '' + substituteInPlace makefile --replace /usr/local "" + ''; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = with stdenv.lib; { + description = "A set of utilities for hard drive data rescue"; + homepage = https://sourceforge.net/projects/ddrutility/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 6c0bcb406218..8f1367d3fdce 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "efivar-${version}"; - version = "35"; + version = "36"; outputs = [ "bin" "out" "dev" "man" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "rhinstaller"; repo = "efivar"; rev = version; - sha256 = "0hc7l5z0hw5472bm6p4d9n24bbggv9lgw7px1hqrdkfjghqfnlxh"; + sha256 = "0r39kx6sqgpk8rz19g1sil4dp7r82d5g1wlkbw1czwas95s50y7n"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 22c25bfd567a..a88cca41fa63 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.11.1"; + version = "3.11.2"; src = fetchFromGitHub { - sha256 = "10ai59vyx1ssb3jyfwnmi4y5kchlnbi7vn7wbax36pa90l1j7jqk"; + sha256 = "0sxxd05r7ika2m4p76kld1xclyi8yf4b79gb86084m1rcv692ap1"; rev = version; repo = "facter"; owner = "puppetlabs"; diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix new file mode 100644 index 000000000000..2ca515358a67 --- /dev/null +++ b/pkgs/tools/text/esh/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, asciidoctor, gawk, gnused }: + +stdenv.mkDerivation rec { + name = "esh-${version}"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "jirutka"; + repo = "esh"; + rev = "v${version}"; + sha256 = "1ddaji5nplf1dyvgkrhqjy8m5djaycqcfhjv30yprj1avjymlj6w"; + }; + + nativeBuildInputs = [ asciidoctor ]; + + buildInputs = [ gawk gnused ]; + + makeFlags = [ "prefix=$(out)" "DESTDIR=" ]; + + postPatch = '' + patchShebangs . + substituteInPlace esh \ + --replace '"/bin/sh"' '"${stdenv.shell}"' \ + --replace '"awk"' '"${gawk}/bin/awk"' \ + --replace 'sed' '${gnused}/bin/sed' + substituteInPlace tests/test-dump.exp \ + --replace '#!/bin/sh' '#!${stdenv.shell}' + ''; + + doCheck = true; + checkTarget = "test"; + + meta = with stdenv.lib; { + description = "Simple templating engine based on shell"; + homepage = https://github.com/jirutka/esh; + license = licenses.mit; + maintainers = with maintainers; [ mnacamura ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 47e6766d21fa..4ebe62ef9a5f 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "mpage-2.5.6"; src = fetchurl { - url = "http://www.libGLU_combined.nl/pub/mpage/${name}.tgz"; + url = "http://www.mesa.nl/pub/mpage/${name}.tgz"; sha256 = "016w9sm06sn1d2lim4p8fzl6wbmad3wigxhflsybzi7p4zy6vrjg"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = "liberal"; # a non-copyleft license, see `Copyright' file - homepage = http://www.libGLU_combined.nl/pub/mpage/; + homepage = http://www.mesa.nl/pub/mpage/; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix index 8db3d4eea2b6..8aadbb0b8062 100644 --- a/pkgs/tools/text/rst2html5/default.nix +++ b/pkgs/tools/text/rst2html5/default.nix @@ -4,11 +4,11 @@ pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "rst2html5"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "1js90asy7s0278b4p28inkkp0r7ajr5fk5pcdgcdw628a30vl3i6"; + sha256 = "d044589d30eeaf7336986078b7bd175510fd649a212b01a457d7806b279e6c73"; }; propagatedBuildInputs = with pythonPackages; diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index f3f0a60b4802..8ce2a6b0aa3c 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { name = "tectonic-${version}"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "v${version}"; - sha256 = "007l0l9xnyayiqiap22zlsp8l9afdw803064cj8inr3q7ckzfcpb"; + sha256 = "1bm3s2zkyy44xrc804c65hrbc6ixzcr95na671b0dannjrikrx1x"; }; - cargoSha256 = "0kjy9zrjlrlkr2il62nz35hm1nndyym9dbnas43hzz7y8hdf859k"; + cargoSha256 = "1pyaw72h85ydq794mpgfjfq7dcq3a1dg4infh770swfaycyll6h6"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/typesetting/xml2rfc/default.nix b/pkgs/tools/typesetting/xml2rfc/default.nix index d1f01ccd8677..7fe0396ae440 100644 --- a/pkgs/tools/typesetting/xml2rfc/default.nix +++ b/pkgs/tools/typesetting/xml2rfc/default.nix @@ -4,14 +4,14 @@ with python.pkgs; buildPythonPackage rec { pname = "xml2rfc"; - version = "2.9.6"; + version = "2.9.8"; buildInputs = [ intervaltree lxml requests pyflakes ]; propagatedBuildInputs = [ intervaltree lxml requests six ]; src = fetchPypi { inherit pname version; - sha256 = "1wr161lx6f1b3fq14ddr3y4jl0myrcmqs1s3fzsighvlmqfdihj7"; + sha256 = "b50ce2f98bc431cadbcef0523213497049b78c2829ee81c399976f1e4832afc6"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 5e0c13f9d951..893d4f2aec23 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.timkay.com/aws/; + homepage = https://www.timkay.com/aws/; description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f310fd156c33..b653dfc7db69 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1,4 +1,4 @@ -self: +lib: self: super: with self; @@ -19,7 +19,7 @@ let # Make sure that we are not shadowing something from # all-packages.nix. - checkInPkgs = n: alias: if builtins.hasAttr n self + checkInPkgs = n: alias: if builtins.hasAttr n super then throw "Alias ${n} is still in all-packages.nix" else alias; @@ -32,7 +32,7 @@ in ### Deprecated aliases - for backward compatibility -mapAliases (rec { +mapAliases ({ PPSSPP = ppsspp; # added 2017-10-01 QmidiNet = qmidinet; # added 2016-05-22 accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 @@ -219,7 +219,6 @@ mapAliases (rec { pltScheme = racket; # just to be sure polarssl = mbedtls; # added 2018-04-25 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 - postage = pgmanage; # added 2017-11-03 procps = procps-ng; # added 2018-04-25 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 pulseaudioLight = pulseaudio; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb4ba9232755..0bc2589c7538 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -502,6 +502,8 @@ with pkgs; buildTools = androidenv.buildTools; }; + appimage-run = callPackage ../tools/package-management/appimage-run {}; + apt-cacher-ng = callPackage ../servers/http/apt-cacher-ng { }; apt-offline = callPackage ../tools/misc/apt-offline { }; @@ -645,6 +647,8 @@ with pkgs; enpass = callPackage ../tools/security/enpass { }; + esh = callPackage ../tools/text/esh { }; + ezstream = callPackage ../tools/audio/ezstream { }; genymotion = callPackage ../development/mobile/genymotion { }; @@ -989,6 +993,10 @@ with pkgs; capstone = callPackage ../development/libraries/capstone { }; unicorn-emu = callPackage ../development/libraries/unicorn-emu { }; + casync = callPackage ../applications/networking/sync/casync { + sphinx = python3Packages.sphinx; + }; + cataract = callPackage ../applications/misc/cataract { }; cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { }; @@ -1993,6 +2001,10 @@ with pkgs; ddrescue = callPackage ../tools/system/ddrescue { }; + ddrescueview = callPackage ../tools/system/ddrescueview { }; + + ddrutility = callPackage ../tools/system/ddrutility { }; + deluge = callPackage ../applications/networking/p2p/deluge { pythonPackages = python2Packages; }; @@ -2650,6 +2662,8 @@ with pkgs; stdenv = overrideCC stdenv gcc49; }; + gnirehtet = callPackage ../tools/networking/gnirehtet { }; + gnome15 = callPackage ../applications/misc/gnome15 { inherit (gnome2) gnome_python gnome_python_desktop; }; @@ -3024,6 +3038,8 @@ with pkgs; http-prompt = callPackage ../tools/networking/http-prompt { }; + http-getter = callPackage ../applications/networking/flent/http-getter.nix { }; + httpie = callPackage ../tools/networking/httpie { }; httping = callPackage ../tools/networking/httping {}; @@ -3231,6 +3247,8 @@ with pkgs; journalbeat = callPackage ../tools/system/journalbeat { }; + journaldriver = callPackage ../tools/misc/journaldriver { }; + jp = callPackage ../development/tools/jp { }; jp2a = callPackage ../applications/misc/jp2a { }; @@ -5042,6 +5060,8 @@ with pkgs; snabb = callPackage ../tools/networking/snabb { } ; + snapcast = callPackage ../applications/audio/snapcast { }; + sng = callPackage ../tools/graphics/sng { libpng = libpng12; }; @@ -7167,7 +7187,7 @@ with pkgs; beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) - erlang erlangR18 erlangR19 erlangR20 + erlang erlangR18 erlangR19 erlangR20 erlangR21 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3 lfe lfe_1_2; @@ -7396,6 +7416,7 @@ with pkgs; python34Full = python34.override{x11Support=true;}; python35Full = python35.override{x11Support=true;}; python36Full = python36.override{x11Support=true;}; + python37Full = python37.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python.pkgs; @@ -7418,6 +7439,10 @@ with pkgs; inherit (darwin) CF configd; self = python36; }; + python37 = callPackage ../development/interpreters/python/cpython/3.7 { + inherit (darwin) CF configd; + self = python37; + }; pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { self = pypy27; @@ -7430,6 +7455,7 @@ with pkgs; python34Packages = python34.pkgs; python35Packages = python35.pkgs; python36Packages = recurseIntoAttrs python36.pkgs; + python37Packages = python37.pkgs; pypyPackages = pypy.pkgs; # Should eventually be moved inside Python interpreters. @@ -8691,7 +8717,7 @@ with pkgs; # TODO(@Ericson2314): Build bionic libc from source bionic = assert hostPlatform.useAndroidPrebuilt; - androidenv.androidndkPkgs.libraries; + androidenv."androidndkPkgs_${hostPlatform.ndkVer}".libraries; bobcat = callPackage ../development/libraries/bobcat { }; @@ -10131,8 +10157,6 @@ with pkgs; libgssglue = callPackage ../development/libraries/libgssglue { }; - libgsystem = callPackage ../development/libraries/libgsystem { }; - libgudev = callPackage ../development/libraries/libgudev { }; libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; @@ -11075,7 +11099,6 @@ with pkgs; openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_2_5 libressl_2_6 libressl_2_7; @@ -13659,6 +13682,13 @@ with pkgs; ]; }; + linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.modinst_arg_list_too_long + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -13882,6 +13912,11 @@ with pkgs; linuxPackages_samus_latest = linuxPackages_samus_4_12; linux_samus_latest = linuxPackages_samus_latest.kernel; + # Hardkernel (Odroid) kernels. + linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); + linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14; + linux_hardkernel_latest = linuxPackages_hardkernel_latest.kernel; + # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); @@ -14990,6 +15025,8 @@ with pkgs; audio-recorder = callPackage ../applications/audio/audio-recorder { }; + autokey = callPackage ../applications/office/autokey { }; + autotrace = callPackage ../applications/graphics/autotrace {}; avocode = callPackage ../applications/graphics/avocode {}; @@ -15968,6 +16005,7 @@ with pkgs; wireshark = callPackage ../applications/networking/sniffers/wireshark { withQt = true; + qt5 = qt59; withGtk = false; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; @@ -16543,6 +16581,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }); + inherit (nodePackages) imapnotify; + # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; @@ -16773,7 +16813,7 @@ with pkgs; libreoffice = hiPrio libreoffice-still; - libreoffice-unwrapped =callPackage ../applications/office/libreoffice { + libreoffice-args = { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) defaultIconTheme; @@ -16796,12 +16836,20 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; - libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = libreoffice-unwrapped; }); + libreoffice-unwrapped =callPackage ../applications/office/libreoffice + (libreoffice-args // { + }); + libreoffice-still-unwrapped =callPackage ../applications/office/libreoffice/still.nix + (libreoffice-args // { + poppler = poppler_0_61; + }); + + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { + libreoffice = libreoffice-unwrapped; + }); libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libreoffice-unwrapped.override { - poppler = poppler_0_61; - }; + libreoffice = libreoffice-still-unwrapped; }); liferea = callPackage ../applications/networking/newsreaders/liferea { @@ -17409,6 +17457,8 @@ with pkgs; osmctools = callPackage ../applications/misc/osmctools { }; + owamp = callPackage ../applications/networking/owamp { }; + vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; @@ -17770,10 +17820,6 @@ with pkgs; fltk = fltk13; }; - inherit (callPackage ../applications/virtualization/rancher-compose {}) - rancher-compose - rancher-compose_0_10; - renoise = callPackage ../applications/audio/renoise {}; radiotray-ng = callPackage ../applications/audio/radiotray-ng { @@ -18216,7 +18262,7 @@ with pkgs; gconf = gnome2.GConf; }; - teamspeak_client = libsForQt59.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; uaskjuggler = callPackage ../applications/misc/taskjuggler { }; @@ -19729,8 +19775,6 @@ with pkgs; unnethack = callPackage ../games/unnethack { }; - unvanquished = callPackage ../games/unvanquished { }; - uqm = callPackage ../games/uqm { }; urbanterror = callPackage ../games/urbanterror { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 765f69c1b14a..8f8caf755edf 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -41,6 +41,15 @@ rec { javacSupport = true; odbcSupport = true; }; erlangR20_nox = erlangR20.override { wxSupport = false; }; + erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { + wxGTK = wxGTK30; + }; + erlangR21_odbc = erlangR21.override { odbcSupport = true; }; + erlangR21_javac = erlangR21.override { javacSupport = true; }; + erlangR21_odbc_javac = erlangR21.override { + javacSupport = true; odbcSupport = true; + }; + erlangR21_nox = erlangR21.override { wxSupport = false; }; # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { @@ -69,6 +78,7 @@ rec { erlangR18 = packagesWith interpreters.erlangR18; erlangR19 = packagesWith interpreters.erlangR19; erlangR20 = packagesWith interpreters.erlangR20; + erlangR21 = packagesWith interpreters.erlangR21; }; } diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index c6be00b0288f..a1d5772fe6da 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -71,7 +71,8 @@ in usr-include = callPackage ../os-specific/darwin/usr-include { }; - inherit (callPackages ../os-specific/darwin/xcode { } ) xcode_8_1 xcode_8_2 xcode_9_1 xcode_9_2; + inherit (callPackages ../os-specific/darwin/xcode { } ) + xcode_8_1 xcode_8_2 xcode_9_1 xcode_9_2 xcode_9_4 xcode; CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c5f0378049e1..ec4715380954 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -66,12 +66,6 @@ in rec { buildLlvmPackages = buildPackages.llvmPackages_39; llvmPackages = pkgs.llvmPackages_39; }; - ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec { - bootPkgs = packages.ghc821Binary; - inherit (bootPkgs) alex happy hscolour; - buildLlvmPackages = buildPackages.llvmPackages_5; - llvmPackages = pkgs.llvmPackages_5; - }; ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix rec { bootPkgs = packages.ghc821Binary; inherit (bootPkgs) alex happy hscolour; @@ -100,7 +94,7 @@ in rec { stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix; }; ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec { - bootPkgs = packages.ghc842; + bootPkgs = packages.ghc843; inherit (bootPkgs) alex happy; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json; stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix; @@ -151,11 +145,6 @@ in rec { ghc = bh.compiler.ghc822; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; - ghc842 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc842; - ghc = bh.compiler.ghc842; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; - }; ghc843 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc843; ghc = bh.compiler.ghc843; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6c2b726a06b9..00689e1f5b2e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1464,21 +1464,7 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystPluginUnicodeEncoding = buildPerlPackage { - name = "Catalyst-Plugin-Unicode-Encoding-1.9"; - src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Unicode-Encoding-1.9.tar.gz; - sha256 = "1glxkh79zz71bmgk44hnhsi37z2mgxcwf7bkmwlnwv3jh1iaz0ah"; - }; - buildInputs = [ HTTPMessage IOStringy ]; - propagatedBuildInputs = [ CatalystRuntime ClassDataInheritable LWP TryTiny URI ]; - meta = { - description = "Unicode aware Catalyst"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; - }; + CatalystPluginUnicodeEncoding = CatalystRuntime; CatalystPluginHTMLWidget = buildPerlPackage rec { name = "Catalyst-Plugin-HTML-Widget-1.1"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a1015c780241..7861b2a231d0 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -12,14 +12,14 @@ let apcu = if isPhp7 then apcu51 else apcu40; apcu40 = assert !isPhp7; buildPecl { - name = "apcu-4.0.7"; - sha256 = "1mhbz56mbnq7dryf2d64l84lj3fpr5ilmg2424glans3wcg772hp"; + name = "apcu-4.0.11"; + sha256 = "002d1gklkf0z170wkbhmm2z1p9p5ghhq3q1r9k54fq1sq4p30ks5"; buildInputs = [ pkgs.pcre ]; }; apcu51 = assert isPhp7; buildPecl { - name = "apcu-5.1.8"; - sha256 = "01dfbf0245d8cc0f51ba16467a60b5fad08e30b28df7846e0dd213da1143ecce"; + name = "apcu-5.1.11"; + sha256 = "0nz9m3fbxgyc2ij63yqmxm06a1f51g8rkxk85f85ziqdin66q2f1"; buildInputs = [ pkgs.pcre ]; doCheck = true; checkTarget = "test"; @@ -107,8 +107,8 @@ let }; imagick = buildPecl { - name = "imagick-3.4.3RC1"; - sha256 = "0siyxpszjz6s095s2g2854bhprjq49rf22v6syjiwvndg1pc9fsh"; + name = "imagick-3.4.3"; + sha256 = "0z2nc92xfc5axa9f2dy95rmsd2c81q8cs1pm4anh0a50x9g5ng0z"; configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.pcre ]; @@ -328,11 +328,11 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.6.3"; + version = "1.6.5"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1dna9ng77nw002l7hq60b6vz0f1snmnsxj1l7cg4f877msxppjsj"; + sha256 = "0d1lpvq8wylh5qgxhbqb5r7j3c6qk0bz4b5vg187jsl6z6fvxgk7"; }; unpackPhase = ":"; @@ -494,4 +494,30 @@ let maintainers = with maintainers; [ cmcdragonkai etu ]; }; }; + + psysh = pkgs.stdenv.mkDerivation rec { + name = "psysh-${version}"; + version = "0.9.6"; + + src = pkgs.fetchurl { + url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; + sha256 = "06icmyn7v229mpfplqj76kjnp1gh4ns0nrxa7bsckyqhzi425kc6"; + }; + + phases = [ "installPhase" ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + tar -xzf $src -C $out/bin + wrapProgram $out/bin/psysh + ''; + + meta = with pkgs.lib; { + description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; + license = licenses.mit; + homepage = https://psysh.org/; + maintainers = with maintainers; [ caugner ]; + }; + }; }; in self diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d057cebf9f57..5b8eb59422f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26,6 +26,7 @@ let isPy34 = python.pythonVersion == "3.4"; isPy35 = python.pythonVersion == "3.5"; isPy36 = python.pythonVersion == "3.6"; + isPy37 = python.pythonVersion == "3.7"; isPyPy = python.executable == "pypy"; isPy3k = strings.substring 0 1 python.pythonVersion == "3"; @@ -132,7 +133,7 @@ let in { - inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k buildPythonPackage buildPythonApplication; + inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPyPy isPy3k buildPythonPackage buildPythonApplication; inherit fetchPypi callPackage; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; inherit toPythonModule toPythonApplication; @@ -233,6 +234,8 @@ in { cdecimal = callPackage ../development/python-modules/cdecimal { }; + clustershell = callPackage ../development/python-modules/clustershell { }; + dendropy = callPackage ../development/python-modules/dendropy { }; dbf = callPackage ../development/python-modules/dbf { }; @@ -291,7 +294,9 @@ in { logster = callPackage ../development/python-modules/logster { }; - mail-parser = callPackage ../development/python-modules/mail-parser { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; + + monty = callPackage ../development/python-modules/monty { }; mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; @@ -434,6 +439,8 @@ in { then ../development/python-modules/python3-openid else ../development/python-modules/python-openid) { }; + python-periphery = callPackage ../development/python-modules/python-periphery { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-stdnum = callPackage ../development/python-modules/python-stdnum { }; @@ -458,6 +465,8 @@ in { salmon-mail = callPackage ../development/python-modules/salmon-mail { }; + seekpath = callPackage ../development/python-modules/seekpath { }; + serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; simpleeval = callPackage ../development/python-modules/simpleeval { }; @@ -1566,6 +1575,8 @@ in { cherrypy = callPackage ../development/python-modules/cherrypy {}; + cftime = callPackage ../development/python-modules/cftime {}; + cjson = callPackage ../development/python-modules/cjson { }; cld2-cffi = callPackage ../development/python-modules/cld2-cffi {}; @@ -1925,9 +1936,9 @@ in { }; }; - pytest = self.pytest_35; + pytest = self.pytest_36; - pytest_35 = callPackage ../development/python-modules/pytest { + pytest_36 = callPackage ../development/python-modules/pytest { hypothesis = self.hypothesis.override { # hypothesis requires pytest that causes dependency cycle doCheck = false; @@ -1936,7 +1947,7 @@ in { }; # Needed for celery - pytest_32 = self.pytest_35.overrideAttrs( oldAttrs: rec { + pytest_32 = self.pytest_36.overrideAttrs( oldAttrs: rec { version = "3.2.5"; src = oldAttrs.src.override { inherit version; @@ -2118,9 +2129,6 @@ in { # Alias that we should deprecate dateutil = self.python-dateutil; - # Buildbot 0.8.7p1 needs dateutil==1.5 - dateutil_1_5 = callPackage ../development/python-modules/dateutil/1_5.nix { }; - decorator = callPackage ../development/python-modules/decorator { }; deform = callPackage ../development/python-modules/deform { }; @@ -2286,7 +2294,7 @@ in { ''; meta = { - homepage = "http://editorconfig.org"; + homepage = https://editorconfig.org; description = "EditorConfig File Locator and Interpreter for Python"; license = stdenv.lib.licenses.psfl; }; @@ -6194,6 +6202,8 @@ in { googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; + google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; + google_api_core = callPackage ../development/python-modules/google_api_core { }; google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; @@ -6236,30 +6246,7 @@ in { grammalecte = callPackage ../development/python-modules/grammalecte { }; - greenlet = buildPythonPackage rec { - name = "greenlet-${version}"; - version = "0.4.10"; - disabled = isPyPy; # builtin for pypy - - src = pkgs.fetchurl { - url = "mirror://pypi/g/greenlet/${name}.tar.gz"; - sha256 = "c4417624aa88380cdf0fe110a8a6e0dbcc26f80887197fe5df0427dfa348ae62"; - }; - - propagatedBuildInputs = with self; [ six ]; - - # see https://github.com/python-greenlet/greenlet/issues/85 - preCheck = '' - rm tests/test_leaks.py - ''; - - meta = { - homepage = https://pypi.python.org/pypi/greenlet; - description = "Module for lightweight in-process concurrent programming"; - license = licenses.lgpl2; - platforms = platforms.all; - }; - }; + greenlet = callPackage ../development/python-modules/greenlet { }; grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { @@ -7794,7 +7781,7 @@ in { meta = { description = "EditorConfig File Locator and Interpreter for Python"; - homepage = "http://editorconfig.org/"; + homepage = https://editorconfig.org/; license = licenses.psfl; }; }; @@ -9169,7 +9156,7 @@ in { ]; meta = with stdenv.lib; { - homepage = "http://github.com/bcwaldon/warlock"; + homepage = https://github.com/bcwaldon/warlock; }; }; @@ -9992,35 +9979,8 @@ in { inherit (pkgs.xorg) libX11; }; - pkgconfig = buildPythonPackage rec { - name = "pkgconfig-${version}"; - version = "1.1.0"; - - # pypy: SyntaxError: __future__ statements must appear at beginning of file - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pkgconfig/${name}.tar.gz"; - sha256 = "709daaf077aa2b33bedac12706373412c3683576a43013bbaa529fc2769d80df"; - }; - - buildInputs = with self; [ nose ]; - - propagatedBuildInputs = with self; [pkgs.pkgconfig]; - - meta = { - description = "Interface Python with pkg-config"; - homepage = https://github.com/matze/pkgconfig; - license = licenses.mit; - }; - - # nosetests needs to be run explicitly. - # Note that the distributed archive does not actually contain any tests. - # https://github.com/matze/pkgconfig/issues/9 - checkPhase = '' - nosetests - ''; - + pkgconfig = callPackage ../development/python-modules/pkgconfig { + inherit (pkgs) pkgconfig; }; plumbum = callPackage ../development/python-modules/plumbum { }; @@ -10142,15 +10102,6 @@ in { psutil = callPackage ../development/python-modules/psutil { }; - psutil_1 = self.psutil.overrideAttrs (oldAttrs: rec { - name = "${oldAttrs.pname}-${version}"; - version = "1.2.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0ibclqy6a4qmkjhlk3g8jhpvnk0v9aywknc61xm3hfi5r124m3jh"; - }; - }); - psycopg2 = buildPythonPackage rec { name = "psycopg2-2.7.1"; disabled = isPyPy; @@ -11640,7 +11591,7 @@ in { doCheck = false; meta = { - homepage = "http://github.com/mongodb/mongo-python-driver"; + homepage = https://github.com/mongodb/mongo-python-driver; license = licenses.asl20; description = "Python driver for MongoDB "; }; @@ -12142,53 +12093,9 @@ in { rjsmin = callPackage ../development/python-modules/rjsmin { }; - pysolr = buildPythonPackage rec { - name = "pysolr-${version}"; - version = "3.3.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pysolr/pysolr-${version}.tar.gz"; - sha256 = "1wapg9n7myn7c82r3nzs2gisfzx52nip8w2mrfy0yih1zn02mnd6"; - }; - - propagatedBuildInputs = with self; [ - requests - ]; - buildInputs = with self; [ - - ]; - - meta = with stdenv.lib; { - homepage = "http://github.com/toastdriven/pysolr/"; - }; - }; - - - django-haystack = buildPythonPackage rec { - name = "django-haystack-${version}"; - version = "2.4.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-haystack/django-haystack-${version}.tar.gz"; - sha256 = "04cva8qg79xig4zqhb4dwkpm7734dvhzqclzvrdz70fh59ki5b4f"; - }; - - doCheck = false; # no tests in source + pysolr = callPackage ../development/python-modules/pysolr { }; - buildInputs = with self; [ coverage mock nose geopy ]; - propagatedBuildInputs = with self; [ - django dateutil_1_5 whoosh pysolr elasticsearch - ]; - - patchPhase = '' - sed -i 's/geopy==/geopy>=/' setup.py - sed -i 's/whoosh==/Whoosh>=/' setup.py - ''; - - meta = with stdenv.lib; { - homepage = "http://haystacksearch.org/"; - }; - }; + django-haystack = callPackage ../development/python-modules/django-haystack { }; geoalchemy2 = buildPythonPackage rec { name = "GeoAlchemy2-${version}"; @@ -12890,7 +12797,7 @@ in { meta = { description = "sqlite-backed dictionary"; - homepage = "http://github.com/Yelp/sqlite3dbm"; + homepage = https://github.com/Yelp/sqlite3dbm; license = licenses.asl20; }; }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index e38f5442d3aa..f9941a1c500d 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -98,7 +98,7 @@ let in res; aliases = self: super: if config.skipAliases or false then {} - else import ./aliases.nix super; + else import ./aliases.nix lib self super; # stdenvOverrides is used to avoid having multiple of versions # of certain dependencies that were used in bootstrapping the diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 362715e82623..c1bd46ad68dc 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -19,14 +19,12 @@ let in runCommand "${cmd}-${version}" { meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); } '' - mkdir -p $out/bin - if ! [ -x "${provider}" ]; then echo "Cannot find command ${cmd}" exit 1 fi - ln -s "${provider}" "$out/bin/${cmd}" + install -D "${provider}" "$out/bin/${cmd}" ''; # more is unavailable in darwin |