diff options
Diffstat (limited to 'pkgs')
438 files changed, 18636 insertions, 10907 deletions
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index e4d508b2a1f..73d8d350f38 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.1.4.14"; + version = "1.1.4.16"; format = "other"; doCheck = false; @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "004cwbnxss6vmdsc6i0y83h3xbc2bzc0ra4z99pkizkky2mz6swj"; + sha256 = "1azfxc1vc1j4ph0zrfsgz2gac1vwmbj65j6wjlxx3nr8kia4mccl"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 40e45a76b4b..26b94f306bc 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A console front-end for Pandora.com"; - homepage = http://6xq.net/projects/pianobar/; - platforms = platforms.linux; + homepage = "https://6xq.net/pianobar/"; + platforms = platforms.unix; license = licenses.mit; # expat version }; } diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix index 706d0faa3bc..615a8a8c660 100644 --- a/pkgs/applications/audio/sfxr-qt/default.nix +++ b/pkgs/applications/audio/sfxr-qt/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { }; nativeBuildInputs = [ cmake - (python3.withPackages (pp: with pp; [ pyyaml jinja2 ])) + (python3.withPackages (pp: with pp; [ pyyaml jinja2 setuptools ])) ]; buildInputs = [ qtbase diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix index 8c276d6bb80..541ef49ef5a 100644 --- a/pkgs/applications/blockchains/jormungandr/default.nix +++ b/pkgs/applications/blockchains/jormungandr/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "jormungandr"; - version = "0.3.3"; + version = "0.3.1415"; src = fetchgit { url = "https://github.com/input-output-hk/${pname}"; rev = "v${version}"; - sha256 = "1fw3cl2rxnw9mww1b1z96x2iapwbpdgyp4ra19dhvfzmlvaiml5j"; + sha256 = "1kg20570ri3bj99gicpp2z272igj9s7m2qw0z1ndk60bxcyghi2x"; fetchSubmodules = true; }; - cargoSha256 = "1ilp9ffaz3njv38mnqics4b5d7wh52mj4rwi71h5c0wzx4ww3zal"; + cargoSha256 = "0b5phmvwv5cyjawlxd9rmlc403lxzm4gnw0mclq70g5g0msqzd9m"; nativeBuildInputs = [ pkgconfig protobuf ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 41510eebff6..6a5532f92c9 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz"; - sha256 = "10w4f9d0li25ifkmlmj6302i70sw3drdwd54d4r7x1n5kc6p164j"; + sha256 = "1dz05ivhadfjfp4yfpz492401yznm3rlnx7g4nqzxwh4cmqzisrm"; }; dontBuild = true; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 6a8fba3c2bb..1852d72d326 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,6 +1,6 @@ { stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost , zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent -, withGui }: +, libsnark, withGui }: let librustzcash = callPackage ./librustzcash {}; in @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ gtest gmock gmp openssl wget db62 boost zlib - protobuf libevent libsodium librustzcash ] + protobuf libevent libsodium librustzcash libsnark ] ++ optionals stdenv.isLinux [ utillinux ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index accdea3ae2d..3128f125cd9 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, pkgconfig +{ stdenv, fetchgit, pkgconfig, linkFarm, lightdm-enso-os-greeter , dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs -, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }: +, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: stdenv.mkDerivation { version = "0.2.1"; @@ -12,12 +12,21 @@ stdenv.mkDerivation { sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz"; }; + patches = [ + ./fix-paths.patch + ]; + + nativeBuildInputs = [ + cmake + pkgconfig + vala + wrapGAppsHook + ]; + buildInputs = [ dbus gtk3 pcre - vala - cmake epoxy libgee libX11 @@ -29,31 +38,21 @@ stdenv.mkDerivation { at-spi2-core libxkbcommon libpthreadstubs + librsvg ]; - nativeBuildInputs = [ - pkgconfig - ]; - - postPatch = '' - sed -i "s@\''${CMAKE_INSTALL_PREFIX}/@@" greeter/CMakeLists.txt - ''; - preConfigure = '' cd greeter ''; - installFlags = [ - "DESTDIR=$(out)" - ]; - - preFixup = '' - mv $out/usr/* $out - rm -r $out/usr - ''; + passthru.xgreeters = linkFarm "enso-os-greeter-xgreeters" [{ + path = "${lightdm-enso-os-greeter}/share/xgreeters/pantheon-greeter.desktop"; + name = "pantheon-greeter.desktop"; + }]; postFixup = '' - rm -r $out/sbin + substituteInPlace $out/share/xgreeters/pantheon-greeter.desktop \ + --replace "pantheon-greeter" "$out/bin/pantheon-greeter" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch b/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch new file mode 100644 index 00000000000..ab3ad2b10e4 --- /dev/null +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch @@ -0,0 +1,24 @@ +diff --git a/greeter/CMakeLists.txt b/greeter/CMakeLists.txt +index 57aebb0..ab50bff 100644 +--- a/greeter/CMakeLists.txt ++++ b/greeter/CMakeLists.txt +@@ -9,7 +9,6 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) + set (CONF_DIR "/etc/lightdm") + set (DATADIR "${CMAKE_INSTALL_PREFIX}/share") + set (PKGDATADIR "${DATADIR}/enso/greeter") +-set (CMAKE_INSTALL_PREFIX /usr) + set (VERSION "1.0.6") + + +@@ -94,9 +93,9 @@ glib_compile_resources (GLIB_RESOURCES_CSS SOURCE data/css.gresource.xml) + add_executable (pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS}) + target_link_libraries(pantheon-greeter m) + +-install (TARGETS pantheon-greeter RUNTIME DESTINATION sbin) ++install (TARGETS pantheon-greeter RUNTIME DESTINATION bin) + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters) +-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION ${CONF_DIR}) ++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION etc/lightdm) + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.svg DESTINATION ${PKGDATADIR}) + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/power.svg DESTINATION ${PKGDATADIR}) + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/checked.svg DESTINATION ${PKGDATADIR}) diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index 69635718e3b..b5b26d7cc43 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }: +{ stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { pname = "lightdm-mini-greeter"; @@ -11,17 +11,22 @@ stdenv.mkDerivation rec { sha256 = "1qi0bsqi8z2zv3303ww0kd7bciz6qx8na5bkvgrqlwyvq31czai5"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ lightdm gtk3 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + buildInputs = [ lightdm gtk3 glib gdk-pixbuf librsvg ]; configureFlags = [ "--sysconfdir=/etc" ]; - makeFlags = [ "configdir=$(out)/etc" ]; + makeFlags = [ "configdir=${placeholder "out"}/etc" ]; postInstall = '' substituteInPlace "$out/share/xgreeters/lightdm-mini-greeter.desktop" \ --replace "Exec=lightdm-mini-greeter" "Exec=$out/bin/lightdm-mini-greeter" ''; + passthru.xgreeters = linkFarm "lightdm-mini-greeter-xgreeters" [{ + path = "${lightdm-mini-greeter}/share/xgreeters/lightdm-mini-greeter.desktop"; + name = "lightdm-mini-greeter.desktop"; + }]; + meta = with stdenv.lib; { description = "A minimal, configurable, single-user GTK3 LightDM greeter"; homepage = https://github.com/prikhi/lightdm-mini-greeter; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index f892a9da50b..5b1490a6b3b 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -1,7 +1,18 @@ -{ stdenv, fetchurl, lightdm, pkgconfig, intltool -, hicolor-icon-theme, makeWrapper -, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported -, exo, at-spi2-core +{ stdenv +, lightdm_gtk_greeter +, fetchurl +, lightdm +, pkgconfig +, intltool +, linkFarm +, wrapGAppsHook +, useGTK2 ? false +, gtk2 +, gtk3 # gtk3 seems better supported +, exo +, at-spi2-core +, librsvg +, hicolor-icon-theme }: #ToDo: bad icons with gtk2; @@ -20,14 +31,15 @@ stdenv.mkDerivation rec { sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ] + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + buildInputs = [ lightdm exo librsvg hicolor-icon-theme ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--disable-indicator-services-command" + "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; preConfigure = '' @@ -43,11 +55,14 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ - --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" - wrapProgram "$out/sbin/lightdm-gtk-greeter" \ - --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share" + --replace "Exec=lightdm-gtk-greeter" "Exec=$out/bin/lightdm-gtk-greeter" ''; + passthru.xgreeters = linkFarm "lightdm-gtk-greeter-xgreeters" [{ + path = "${lightdm_gtk_greeter}/share/xgreeters/lightdm-gtk-greeter.desktop"; + name = "lightdm-gtk-greeter.desktop"; + }]; + meta = with stdenv.lib; { homepage = https://launchpad.net/lightdm-gtk-greeter; platforms = platforms.linux; diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index 98692de4317..31d0806df8a 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2 }: +{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2, darwin +, curl }: rustPlatform.buildRustPackage rec { pname = "amp"; @@ -15,7 +16,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1bvj2zg19ak4vi47vjkqlybz011kn5zq1j7zznr76zrryacw4lz1"; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ openssl python3 xorg.libxcb libgit2 ]; + buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ curl Security AppKit ]); # Tests need to write to the theme directory in HOME. preCheck = "export HOME=`mktemp -d`"; diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index ecbe7e8b719..a9d8ffec43e 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -1,9 +1,11 @@ -{ stdenv, zlib, fetchFromGitHub, python3Packages }: +{ stdenv, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonApplication rec { pname = "manuskript"; version = "0.9.0"; + format = "other"; + src = fetchFromGitHub { repo = pname; owner = "olivierkes"; @@ -11,6 +13,8 @@ python3Packages.buildPythonApplication rec { sha256 = "13y1s0kba1ib6g977n7h920kyr7abdw03kpal512m7iwa9g2kdw8"; }; + nativeBuildInputs = [ wrapQtAppsHook ]; + propagatedBuildInputs = [ python3Packages.pyqt5 python3Packages.lxml @@ -30,6 +34,10 @@ python3Packages.buildPythonApplication rec { cp -r sample-projects/ $out/share/${pname} ''; + postFixup = '' + wrapQtApp $out/bin/manuskript + ''; + doCheck = false; meta = { diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 92ff745d1a6..6ad3983a531 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,14 +4,14 @@ with stdenv.lib; pythonPackages.buildPythonApplication rec { pname = "neovim-remote"; - version = "2.2.0"; + version = "2.2.1"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "0vvwygyar835z947d5zgjywyhl7ajj63z0l8sb7w9kj1w5snb43x"; + sha256 = "0f9x053yr8wq35l2s2dsnb0iygd4g4yya2h3iv0yh3440jjj5vfj"; }; propagatedBuildInputs = with pythonPackages; [ pynvim psutil ]; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 6081bbc8b0c..3df964361cc 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -48,7 +48,11 @@ stdenv.mkDerivation { # The sparkle patch modified the nibs, so we have to recompile them postPatch = '' for nib in MainMenu Preferences; do - /usr/bin/ibtool --compile src/MacVim/English.lproj/$nib.nib/keyedobjects.nib src/MacVim/English.lproj/$nib.nib + # redirect stdin/stdout/stderr to /dev/null because ibtool marks them nonblocking + # and not redirecting screws with subsequent commands. + # redirecting stderr is unfortunate but I don't know of a reasonable way to remove O_NONBLOCK + # from the fds. + /usr/bin/ibtool --compile src/MacVim/English.lproj/$nib.nib/keyedobjects.nib src/MacVim/English.lproj/$nib.nib >/dev/null 2>/dev/null </dev/null done ''; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 40d16733db2..6f7e3ad0ba4 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,13 +11,13 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q"; - x86_64-darwin = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky"; + x86_64-linux = "1wxaxz2q4qizh6f23ipz8ihay6bpjdq0545vijqd84fqazcji6sq"; + x86_64-darwin = "1gb9w3hvw3avn852an5v8m1ia64fkavnvaawjfc3455b248iiqvk"; }.${system}; in callPackage ./generic.nix rec { - version = "1.38.0"; + version = "1.38.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 02d0396a94f..b526d8fe327 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,13 +11,13 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132"; - x86_64-darwin = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4"; + x86_64-linux = "15m7mfb8gmx3pwydc37blj0rxwgmkrnqfj6y79rpqlr2dg92gwlb"; + x86_64-darwin = "080k4fnfa5ylmmya6zprgci3gld9mrbqsfnk53hgcny91ykl5xj5"; }.${system}; in callPackage ./generic.nix rec { - version = "1.38.0"; + version = "1.38.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index 4c7f9cde5ce..84d7f3ddb49 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,18 +1,21 @@ { stdenv, rustPlatform , fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "whitebox_tools"; - version = "0.9.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "jblindsay"; repo = "whitebox-tools"; - rev = "6221cdf327be70f0ee4f2053b76bfa01c3f37caa"; - sha256 = "1423ga964mz7qkl88vkcm8qfprsksx04aq4sz9v5ghnmdzzvl89x"; + rev = "v${version}"; + sha256 = "1vs4hf2x3qjnffs9kjx56rzl67kpcy8xvng6p0r9fp9mfnblxg6j"; }; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "11m13h9b75xz8dfisfcykar53qsl1crrp3l75s73gkkkvczlfd24"; + cargoSha256 = "1y3vk8bzsaisx7wrncjxcqdh355f2wk4n59vq5qgj37fph2zpy7f"; + + # failures: structures::polyline::test::test_polyline_split + doCheck = false; meta = with stdenv.lib; { description = "An advanced geospatial data analysis platform"; diff --git a/pkgs/applications/graphics/giv/build.patch b/pkgs/applications/graphics/giv/build.patch deleted file mode 100644 index f57689fd3fa..00000000000 --- a/pkgs/applications/graphics/giv/build.patch +++ /dev/null @@ -1,22 +0,0 @@ -Get the environment propagated to scons forked childs, and correct the dicom plugin about -a typedef of size_t that failed at least on x86_64-linux. - -diff --git a/SConstruct b/SConstruct -index 9e752d6..f93f27f 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -9,13 +9,7 @@ else: - - commit_id = os.popen('git rev-parse HEAD').read().replace('\n','') - --env = Environment(LIBPATH=[], -- CPPFLAGS = cppflags + ['-Wno-deprecated-declarations', -- '-Wno-reorder', -- '-Wno-unused-but-set-variable', -- '-Wno-unused-function'], -- CXXFLAGS=['-std=c++1y'] -- ) -+env = Environment(ENV = os.environ) - - env['SBOX'] = False - env['COMMITIDSHORT'] = commit_id[0:6] diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix deleted file mode 100644 index 9ba7dbed37b..00000000000 --- a/pkgs/applications/graphics/giv/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchFromGitHub, gdk-pixbuf, scons, pkgconfig, gtk2, glib -, pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }: - -stdenv.mkDerivation rec { - pname = "giv"; - version = "0.9.26"; - - src = fetchFromGitHub { - owner = "dov"; - repo = "giv"; - rev = "v${version}"; - sha256 = "1sfm8j3hvqij6z3h8xz724d7hjqqbzljl2a6pp4yjpnnrxksnic2"; - }; - - hardeningDisable = [ "format" ]; - - prePatch = '' - sed -i s,/usr/bin/perl,${perl}/bin/perl, doc/eperl - sed -i s,/usr/local,$out, SConstruct - ''; - - patches = [ ./build.patch ]; - - nativeBuildInputs = [ scons pkgconfig vala perl gob2 ]; - buildInputs = [ gdk-pixbuf gtk2 glib pcre cfitsio libtiff json-glib ]; - - meta = with stdenv.lib; { - description = "Cross platform image and hierarchical vector viewer based"; - homepage = http://giv.sourceforge.net/giv/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 6bcee18651b..f24d57786ef 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -103,6 +103,6 @@ stdenv.mkDerivation rec { description = "Image browser and viewer for GNOME"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = [ maintainers.mimadrid ]; + maintainers = [ maintainers.mimame ]; }; } diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix new file mode 100644 index 00000000000..da358918972 --- /dev/null +++ b/pkgs/applications/graphics/kcc/default.nix @@ -0,0 +1,38 @@ +{ lib +, mkDerivationWith +, python3Packages +, p7zip +, archiveSupport ? true +}: + +mkDerivationWith python3Packages.buildPythonApplication rec { + pname = "kcc"; + version = "5.5.1"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "KindleComicConverter"; + sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644"; + }; + + propagatedBuildInputs = with python3Packages ; [ + pillow + pyqt5 + psutil + python-slugify + raven + ]; + + qtWrapperArgs = lib.optional archiveSupport [ "--prefix" "PATH" ":" "${ lib.makeBinPath [ p7zip ] }" ]; + + postFixup = '' + wrapProgram $out/bin/kcc "''${qtWrapperArgs[@]}" + ''; + + meta = with lib; { + description = "Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ"; + homepage = "https://kcc.iosphe.re"; + license = licenses.isc; + maintainers = with maintainers; [ dawidsowa ]; + }; +} diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 83489e1a24c..30f7739167c 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.2.5"; + version = "4.2.6"; src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "1f14r2mrqasl6nr3sss0xy2h8xlxd5wdcjcd64m9nz2gwlm39r7w"; + url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "0qdaw8xx3h91v8iw6nw2h276ka8hflaq4r4qwz5mqfd3h254jzym"; }; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index fa75dd1eb97..b7c691e9594 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -70,10 +70,13 @@ mkDerivation { kpurpose kdeclarative ]; + patches = [ ./mlt-path.patch ]; + inherit mlt; postPatch = # Module Qt5::Concurrent must be included in `find_package` before it is used. '' sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|' + substituteAllInPlace src/kdenlivesettings.kcfg ''; meta = { license = with lib.licenses; [ gpl2Plus ]; diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index a58b3b8c45d..ab24f15a14b 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -7,7 +7,7 @@ kmail-account-wizard, kmailtransport, knotifications, knotifyconfig, kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon, - messagelib, pim-sieve-editor, qtscript, qtwebengine, + messagelib, pim-sieve-editor, qtscript, qtwebengine, akonadi }: mkDerivation { @@ -25,6 +25,6 @@ mkDerivation { ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine ]; - propagatedUserEnvPkgs = [ kdepim-runtime kwallet ]; + propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ]; patches = [ ./kmail.patch ]; } diff --git a/pkgs/applications/kde/mlt-path.patch b/pkgs/applications/kde/mlt-path.patch new file mode 100644 index 00000000000..9bfb66c1a83 --- /dev/null +++ b/pkgs/applications/kde/mlt-path.patch @@ -0,0 +1,22 @@ +diff -ruN old/src/kdenlivesettings.kcfg new/src/kdenlivesettings.kcfg +--- old/src/kdenlivesettings.kcfg 2019-09-10 23:20:27.555392353 -0400 ++++ new/src/kdenlivesettings.kcfg 2019-09-10 23:25:47.533964155 -0400 +@@ -378,14 +378,14 @@ + </group> + + <group name="env"> +- <entry name="mltpath" type="Path"> ++ <entry name="mltpath" type="Path" hidden="true"> + <label>Mlt framework install path.</label> +- <default></default> ++ <default>@mlt@/share/mlt/profiles</default> + </entry> + +- <entry name="rendererpath" type="Path"> ++ <entry name="rendererpath" type="Path" hidden="true"> + <label>Mlt melt renderer install path.</label> +- <default></default> ++ <default>@mlt@/bin/melt</default> + </entry> + + <entry name="ffmpegpath" type="Path"> diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index dddf8d93412..24f788ef468 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -22,6 +22,7 @@ libxcb, libxkbcommon, wayland, + xdg_utils, # Darwin Frameworks AppKit, @@ -75,6 +76,10 @@ in buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ]; outputs = [ "out" "terminfo" ]; + postPatch = '' + substituteInPlace alacritty_terminal/src/config/mouse.rs \ + --replace xdg-open ${xdg_utils}/bin/xdg-open + ''; postBuild = lib.optionalString stdenv.isDarwin "make app"; diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix index e78ba2df999..0d8ebccb3d0 100644 --- a/pkgs/applications/misc/ape/default.nix +++ b/pkgs/applications/misc/ape/default.nix @@ -1,33 +1,33 @@ { stdenv, swiProlog, makeWrapper, fetchFromGitHub, - lexicon ? "lexicon/clex_lexicon.pl", + lexicon ? "prolog/lexicon/clex_lexicon.pl", pname ? "ape", description ? "Parser for Attempto Controlled English (ACE)", license ? with stdenv.lib; licenses.lgpl3 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "6.7-131003"; + inherit pname; + version = "2019-08-10"; buildInputs = [ swiProlog makeWrapper ]; src = fetchFromGitHub { owner = "Attempto"; repo = "APE"; - rev = version; - sha256 = "0cw47qjg4896kw3vps6rfs02asvscsqvcfdiwgfmqb3hvykb1sdx"; + rev = "113b81621262d7a395779465cb09397183e6f74c"; + sha256 = "0xyvna2fbr18hi5yvm0zwh77q02dfna1g4g53z9mn2rmlfn2mhjh"; }; patchPhase = '' # We move the file first to avoid "same file" error in the default case cp ${lexicon} new_lexicon.pl - rm lexicon/clex_lexicon.pl - cp new_lexicon.pl lexicon/clex_lexicon.pl + rm prolog/lexicon/clex_lexicon.pl + cp new_lexicon.pl prolog/lexicon/clex_lexicon.pl ''; buildPhase = '' - make build + make SHELL=${stdenv.shell} build ''; installPhase = '' diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 5f4e24f4d3c..1c33a92987c 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -22,17 +22,21 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ glib libxml2 exiv2 imagemagick ]; + prePatch = '' + sed -i 's|#include <exiv2/exif.hpp>|#include <exiv2/exiv2.hpp>|' src/jpeg-utils.cpp + ''; + installPhase = '' mkdir $out/{bin,share} -p cp src/cgg{,-dirgen} $out/bin/ ''; - meta = { - homepage = http://cgg.bzatek.net/; - description = "a simple static web photo gallery, designed to be clean and easily usable"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + meta = with stdenv.lib; { + homepage = "http://cgg.bzatek.net/"; + description = "A simple static web photo gallery, designed to be clean and easily usable"; + license = licenses.gpl2; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 0016f89746d..af47afcc601 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -7,15 +7,15 @@ let else [ wxGTK ]; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "diff-pdf"; - version = "2017-12-30"; + version = "0.3"; src = fetchFromGitHub { owner = "vslavik"; repo = "diff-pdf"; - rev = "c4d67226ec4c29b30a7399e75f80636ff8a6f9fc"; - sha256 = "1c3ig7ckrg37p5vzvgjnsfdzdad328wwsx0r31lbs1d8pkjkgq3m"; + rev = "v${version}"; + sha256 = "0vzvyjpk6m89zs6j1dq85f93n2b1i6akn2g0z9qhagjd2pds920i"; }; nativeBuildInputs = [ autoconf automake pkgconfig ]; @@ -24,9 +24,10 @@ stdenv.mkDerivation { preConfigure = "./bootstrap"; meta = with stdenv.lib; { - homepage = http://vslavik.github.io/diff-pdf; + homepage = "https://vslavik.github.io/diff-pdf/"; description = "Simple tool for visually comparing two PDF files"; license = licenses.gpl2; + platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 0a28efbc28c..88f44c6cc85 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { homepage = https://electrum-ltc.org/; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ asymmetric ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 6f380114a27..8381f182e5d 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -5,13 +5,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "gcalcli"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "insanum"; repo = pname; rev = "v${version}"; - sha256 = "1qlmslywm4dfimggly4p0ckn2gj165mq1p0wkry9jpb3sg1m5fdf"; + sha256 = "0746vmhfclkpkqnyaidxid2z20mlv86hv0pjxy1qglrja91vkd72"; }; postPatch = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index d10507b1044..bf7bec38afb 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -3,15 +3,17 @@ stdenv.mkDerivation rec { pname = "gpscorrelate"; - version = "unstable-2019-06-05"; + version = "unstable-2019-09-03"; src = fetchFromGitHub { owner = "dfandrich"; repo = pname; - rev = "80b14fe7c10c1cc8f62c13f517c062577ce88c85"; - sha256 = "1gaan0nd7ai0bwilfnkza7lg5mz87804mvlygj0gjc672izr37r6"; + rev = "e1dd44a34f67b1ab7201440e60a840258ee448d2"; + sha256 = "0gjwwdqh9dprzylmmnk3gm41khka9arkij3i9amd8y7d49pm9rlv"; }; + patches = [ ./fix-localedir.diff ]; + nativeBuildInputs = [ desktop-file-utils docbook_xml_dtd_42 @@ -31,11 +33,12 @@ stdenv.mkDerivation rec { "GTK=3" "CC=cc" "CXX=c++" + "CFLAGS=-DENABLE_NLS" ]; doCheck = true; - installTargets = [ "install" "install-desktop-file" ]; + installTargets = [ "install" "install-po" "install-desktop-file" ]; meta = with stdenv.lib; { description = "A GPS photo correlation tool, to add EXIF geotags"; @@ -59,5 +62,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = "https://github.com/dfandrich/gpscorrelate"; platforms = platforms.linux; + maintainers = with maintainers; [ sikmir ]; }; } diff --git a/pkgs/applications/misc/gpscorrelate/fix-localedir.diff b/pkgs/applications/misc/gpscorrelate/fix-localedir.diff new file mode 100644 index 00000000000..5f9cb296ecd --- /dev/null +++ b/pkgs/applications/misc/gpscorrelate/fix-localedir.diff @@ -0,0 +1,27 @@ +diff --git i/Makefile w/Makefile +index 47919ca..408fd68 100644 +--- i/Makefile ++++ w/Makefile +@@ -33,8 +33,9 @@ datadir = $(prefix)/share + mandir = $(datadir)/man + docdir = $(datadir)/doc/gpscorrelate + applicationsdir = $(datadir)/applications ++localedir = ${datadir}/locale + +-DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" ++DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -DPACKAGE_LOCALE_DIR=\"$(localedir)\" + + TARGETS = gpscorrelate-gui$(EXEEXT) gpscorrelate$(EXEEXT) doc/gpscorrelate.1 doc/gpscorrelate.html + +diff --git i/main-gui.c w/main-gui.c +index fdace6f..8a6197b 100644 +--- i/main-gui.c ++++ w/main-gui.c +@@ -40,6 +40,7 @@ + int main(int argc, char* argv[]) + { + /* Initialize gettext (gtk_init initializes the locale) */ ++ (void) bindtextdomain(TEXTDOMAIN, PACKAGE_LOCALE_DIR); + (void) textdomain(TEXTDOMAIN); + (void) bind_textdomain_codeset(TEXTDOMAIN, "UTF-8"); + diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 6e9296da267..4b2ed9af24e 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.12"; + version = "7.13"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0c3axs3mm6xzabwbvy9vgq1sryjpi4h91nwzy9iyv9zjxz7phgzc"; + sha256 = "08cg5k4ffj2wrcm4rk7vyixbyyz0424276fw2fn8lmziklkdqyjw"; }; nativeBuildInputs = [ qmake ]; @@ -28,7 +28,7 @@ mkDerivation rec { all common GPS log file formats. ''; license = licenses.gpl3; - maintainers = [ maintainers.womfoo ]; + maintainers = with maintainers; [ womfoo sikmir ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json index 3170a63379c..64cad5c0292 100644 --- a/pkgs/applications/misc/hubstaff/revision.json +++ b/pkgs/applications/misc/hubstaff/revision.json @@ -1,5 +1,5 @@ { - "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.10-848554d6/Hubstaff-1.4.10-848554d6.sh", - "version": "1.4.10-848554d6", - "sha256": "1hwncdzpzawrwswr3ibhxny0aa5k9f8f2qf636bdzqilwhv6342z" + "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.11-a12e5bad/Hubstaff-1.4.11-a12e5bad.sh", + "version": "1.4.11-a12e5bad", + "sha256": "0nqmw02spplqppvz2jniq5p5y69l8n5xp9wji4032kn4qsba33jn" } diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 410b04d5dcb..ff0332e1e5f 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "joplin-desktop"; - version = "1.0.158"; + version = "1.0.167"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}-x86_64.AppImage"; - sha256 = "1xaamwcasihja3agwb0nnfnzc1wmmr0d2ng73qmfil9nhf9v3j6q"; + sha256 = "062f2av60490ffrml0q8zv68yir6zaqif0g3d32c985gcvmgn9lw"; }; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 9391fe88c5e..a2eba8e08c2 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -30,73 +30,25 @@ stdenv.mkDerivation rec { cp -r ${v251a_src}/* $sourceRoot ''; - patches = [ ./k2pdfopt.patch ]; + patches = [ ./k2pdfopt.patch ./k2pdfopt-mupdf-1.16.1.patch ]; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = let + # The patches below were constructed by taking the files from k2pdfopt in + # the {mupdf,leptonica,tesseract}_mod/ directories, replacing the + # corresponding files in the respective source trees, resolving any errors + # with more recent versions of these depencencies, and running diff. mupdf_modded = mupdf.overrideAttrs (attrs: { - # Excluded the pdf-*.c files, since they mostly just broke the #includes - prePatch = '' - cp ${src}/mupdf_mod/{font,stext-device,string}.c source/fitz/ - cp ${src}/mupdf_mod/font-win32.c source/pdf/ - ''; + patches = attrs.patches ++ [ ./mupdf.patch ]; # Last verified with mupdf 1.16.1 }); - leptonica_modded = leptonica.overrideAttrs (attrs: { - name = "leptonica-1.74.4"; - # Modified source files apply to this particular version of leptonica - version = "1.74.4"; - - src = fetchurl { - url = "http://www.leptonica.org/source/leptonica-1.74.4.tar.gz"; - sha256 = "0fw39amgyv8v6nc7x8a4c7i37dm04i6c5zn62d24bgqnlhk59hr9"; - }; - - prePatch = '' - cp ${src}/leptonica_mod/{allheaders.h,dewarp2.c,leptwin.c} src/ - ''; - patches = [ - # stripped down copy of upstream commit b88c821f8d347bce0aea86d606c710303919f3d2 - ./leptonica-CVE-2018-3836.patch - (fetchpatch { - # CVE-2018-7186 - url = "https://github.com/DanBloomberg/leptonica/commit/" - + "ee301cb2029db8a6289c5295daa42bba7715e99a.patch"; - sha256 = "0cgb7mvz2px1rg5i80wk1wxxjvzjga617d8q6j7qygkp7jm6495d"; - }) - (fetchpatch { - # CVE-2018-7247 - url = "https://github.com/DanBloomberg/leptonica/commit/" - + "c1079bb8e77cdd426759e466729917ca37a3ed9f.patch"; - sha256 = "1z4iac5gwqggh7aa8cvyp6nl9fwd1v7wif26caxc9y5qr3jj34qf"; - }) - (fetchpatch { - # CVE-2018-7440 - url = "https://github.com/DanBloomberg/leptonica/commit/" - + "49ecb6c2dfd6ed5078c62f4a8eeff03e3beced3b.patch"; - sha256 = "1hjmva98iaw9xj7prg7aimykyayikcwnk4hk0380007hqb35lqmy"; - }) - ]; + patches = [ ./leptonica.patch ]; # Last verified with leptonica 1.78.0 }); tesseract_modded = tesseract4.override { tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: { - prePatch = '' - cp ${src}/tesseract_mod/baseapi.{h,cpp} src/api/ - cp ${src}/tesseract_mod/ccutil.{h,cpp} src/ccutil/ - cp ${src}/tesseract_mod/genericvector.h src/ccutil/ - cp ${src}/tesseract_mod/input.cpp src/lstm/ - cp ${src}/tesseract_mod/lstmrecognizer.cpp src/lstm/ - cp ${src}/tesseract_mod/mainblk.cpp src/ccutil/ - cp ${src}/tesseract_mod/params.cpp src/ccutil/ - cp ${src}/tesseract_mod/serialis.{h,cpp} src/ccutil/ - cp ${src}/tesseract_mod/tesscapi.cpp src/api/ - cp ${src}/tesseract_mod/tessdatamanager.cpp src/ccstruct/ - cp ${src}/tesseract_mod/tessedit.cpp src/ccmain/ - cp ${src}/include_mod/{tesseract.h,leptonica.h} src/api/ - ''; - patches = [ ./tesseract.patch ]; + patches = [ ./tesseract.patch ]; # Last verified with tesseract 1.4 }); }; in diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch new file mode 100644 index 00000000000..3a9eca30e75 --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch @@ -0,0 +1,151 @@ +diff --git a/willuslib/wmupdf.c b/willuslib/wmupdf.c +index 81627ef..f14a96c 100644 +--- a/willuslib/wmupdf.c ++++ b/willuslib/wmupdf.c +@@ -189,8 +189,6 @@ int wmupdf_remake_pdf(char *infile,char *outfile,WPDFPAGEINFO *pageinfo,int use_ + pdf_write_opts.do_compress=1; + pdf_write_opts.do_linear=0; + pdf_write_opts.do_garbage=1; /* 2 and 3 don't work for this. */ +- pdf_write_opts.continue_on_error=0; +- pdf_write_opts.errors=NULL; + write_failed=0; + wpdfpageinfo_sort(pageinfo); + xref=NULL; +@@ -1687,8 +1685,8 @@ WPDFOUTLINE *wpdfoutline_read_from_pdf_file(char *filename) + /* Sumatra version of MuPDF v1.4 -- use locally installed fonts */ + pdf_install_load_system_font_funcs(ctx); + fz_try(ctx) { doc=fz_open_document(ctx,filename); } +- fz_catch(ctx) +- { ++ fz_catch(ctx) ++ { + fz_drop_context(ctx); + return(NULL); + } +@@ -1890,5 +1888,5 @@ static pdf_obj *pdf_new_string_utf8(fz_context *ctx,char *string) + willus_mem_free((double **)&utfbuf,funcname); + return(pdfobj); + } +- ++ + #endif /* HAVE_MUPDF_LIB */ +diff --git a/willuslib/wmupdfinfo.c b/willuslib/wmupdfinfo.c +index 5c7f38c..9b9e6fd 100644 +--- a/willuslib/wmupdfinfo.c ++++ b/willuslib/wmupdfinfo.c +@@ -237,23 +237,22 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename) + pdf_obj *robj; + + robj=pdf_resolve_indirect(ctx,obj); +- n=pdf_sprint_obj(ctx,NULL,0,robj,1); +- buf=malloc(n+2); ++ buf=pdf_sprint_obj(ctx,NULL,0,&n,robj,1,0); + if (buf==NULL) + { + fz_write_printf(ctx,out,"Info object (%d %d R):\n",pdf_to_num(ctx,obj),pdf_to_gen(ctx,obj)); +- pdf_print_obj(ctx,out,robj,1); ++ pdf_print_obj(ctx,out,robj,1,0); + } + else + { +- pdf_sprint_obj(ctx,buf,n+2,robj,1); ++ pdf_sprint_obj(ctx,buf,n+2,&n,robj,1,0); + display_pdf_field(ctx,out,buf,"Title","TITLE"); + display_pdf_field(ctx,out,buf,"CreationDate","CREATED"); + display_pdf_field(ctx,out,buf,"ModDate","LAST MODIFIED"); + display_pdf_field(ctx,out,buf,"Producer","PDF PRODUCER"); + display_pdf_field(ctx,out,buf,"Creator","CREATOR"); + display_file_size(ctx,out,filename); +- free(buf); ++ fz_free(ctx,buf); + } + } + if (glo->dims==1) +@@ -275,7 +274,7 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename) + if (obj) + { + fz_write_printf(ctx,out, "\nEncryption object (%d %d R):\n", pdf_to_num(ctx,obj), pdf_to_gen(ctx,obj)); +- pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1); ++ pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1, 0); + } + } + +@@ -396,7 +395,7 @@ gatherdimensions(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ + if (j < glo->dims) + return; + +- glo->dim = fz_resize_array(ctx, glo->dim, glo->dims+1, sizeof(struct info)); ++ glo->dim = fz_realloc_array(ctx, glo->dim, glo->dims+1, struct info); + glo->dims++; + + glo->dim[glo->dims - 1].page = page; +@@ -441,7 +440,7 @@ gatherfonts(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj * + if (k < glo->fonts) + continue; + +- glo->font = fz_resize_array(ctx, glo->font, glo->fonts+1, sizeof(struct info)); ++ glo->font = fz_realloc_array(ctx, glo->font, glo->fonts+1, struct info); + glo->fonts++; + + glo->font[glo->fonts - 1].page = page; +@@ -510,7 +509,7 @@ gatherimages(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj + if (k < glo->images) + continue; + +- glo->image = fz_resize_array(ctx, glo->image, glo->images+1, sizeof(struct info)); ++ glo->image = fz_realloc_array(ctx, glo->image, glo->images+1, struct info); + glo->images++; + + glo->image[glo->images - 1].page = page; +@@ -568,7 +567,7 @@ gatherforms(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj * + if (k < glo->forms) + continue; + +- glo->form = fz_resize_array(ctx, glo->form, glo->forms+1, sizeof(struct info)); ++ glo->form = fz_realloc_array(ctx, glo->form, glo->forms+1, struct info); + glo->forms++; + + glo->form[glo->forms - 1].page = page; +@@ -613,7 +612,7 @@ gatherpsobjs(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj + if (k < glo->psobjs) + continue; + +- glo->psobj = fz_resize_array(ctx, glo->psobj, glo->psobjs+1, sizeof(struct info)); ++ glo->psobj = fz_realloc_array(ctx, glo->psobj, glo->psobjs+1, struct info); + glo->psobjs++; + + glo->psobj[glo->psobjs - 1].page = page; +@@ -656,7 +655,7 @@ gathershadings(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob + if (k < glo->shadings) + continue; + +- glo->shading = fz_resize_array(ctx, glo->shading, glo->shadings+1, sizeof(struct info)); ++ glo->shading = fz_realloc_array(ctx, glo->shading, glo->shadings+1, struct info); + glo->shadings++; + + glo->shading[glo->shadings - 1].page = page; +@@ -724,7 +723,7 @@ gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob + if (k < glo->patterns) + continue; + +- glo->pattern = fz_resize_array(ctx, glo->pattern, glo->patterns+1, sizeof(struct info)); ++ glo->pattern = fz_realloc_array(ctx, glo->pattern, glo->patterns+1, struct info); + glo->patterns++; + + glo->pattern[glo->patterns - 1].page = page; +@@ -1216,7 +1215,7 @@ void wmupdfinfo_get(char *filename,int *pagelist,char **buf) + if (fout==NULL) + return; + */ +- ++ + ctx = fz_new_context(NULL, NULL, FZ_STORE_UNLIMITED); + if (!ctx) + { +@@ -1307,5 +1306,5 @@ static void date_convert(char *dst,char *src) + else if (src[i]!='\0') + sprintf(&dst[strlen(dst)]," %s",&src[i]); + } +- ++ + #endif /* HAVE_MUPDF_LIB */ diff --git a/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch b/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch deleted file mode 100644 index f1b4170fbaa..00000000000 --- a/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- a/src/allheaders.h -+++ b/src/allheaders.h -@@ -2600,6 +2600,7 @@ - LEPT_DLL extern char * stringReverse ( const char *src ); - LEPT_DLL extern char * strtokSafe ( char *cstr, const char *seps, char **psaveptr ); - LEPT_DLL extern l_int32 stringSplitOnToken ( char *cstr, const char *seps, char **phead, char **ptail ); -+LEPT_DLL extern l_int32 stringCheckForChars ( const char *src, const char *chars, l_int32 *pfound ); - LEPT_DLL extern char * stringRemoveChars ( const char *src, const char *remchars ); - LEPT_DLL extern l_int32 stringFindSubstr ( const char *src, const char *sub, l_int32 *ploc ); - LEPT_DLL extern char * stringReplaceSubstr ( const char *src, const char *sub1, const char *sub2, l_int32 *pfound, l_int32 *ploc ); ---- a/src/gplot.c -+++ b/src/gplot.c -@@ -141,9 +141,10 @@ - const char *xlabel, - const char *ylabel) - { --char *newroot; --char buf[L_BUF_SIZE]; --GPLOT *gplot; -+char *newroot; -+char buf[L_BUF_SIZE]; -+l_int32 badchar; -+GPLOT *gplot; - - PROCNAME("gplotCreate"); - -@@ -152,6 +153,9 @@ - if (outformat != GPLOT_PNG && outformat != GPLOT_PS && - outformat != GPLOT_EPS && outformat != GPLOT_LATEX) - return (GPLOT *)ERROR_PTR("outformat invalid", procName, NULL); -+ stringCheckForChars(rootname, "`;&|><\"?*", &badchar); -+ if (badchar) /* danger of command injection */ -+ return (GPLOT *)ERROR_PTR("invalid rootname", procName, NULL); - - if ((gplot = (GPLOT *)LEPT_CALLOC(1, sizeof(GPLOT))) == NULL) - return (GPLOT *)ERROR_PTR("gplot not made", procName, NULL); ---- a/src/utils2.c -+++ b/src/utils2.c -@@ -42,6 +42,7 @@ - * l_int32 stringSplitOnToken() - * - * Find and replace string and array procs -+ * l_int32 stringCheckForChars() - * char *stringRemoveChars() - * l_int32 stringFindSubstr() - * char *stringReplaceSubstr() -@@ -701,6 +702,48 @@ - /*--------------------------------------------------------------------* - * Find and replace procs * - *--------------------------------------------------------------------*/ -+/*! -+ * \brief stringCheckForChars() -+ * -+ * \param[in] src input string; can be of zero length -+ * \param[in] chars string of chars to be searched for in %src -+ * \param[out] pfound 1 if any characters are found; 0 otherwise -+ * \return 0 if OK, 1 on error -+ * -+ * <pre> -+ * Notes: -+ * (1) This can be used to sanitize an operation by checking for -+ * special characters that don't belong in a string. -+ * </pre> -+ */ -+l_int32 -+stringCheckForChars(const char *src, -+ const char *chars, -+ l_int32 *pfound) -+{ -+char ch; -+l_int32 i, n; -+ -+ PROCNAME("stringCheckForChars"); -+ -+ if (!pfound) -+ return ERROR_INT("&found not defined", procName, 1); -+ *pfound = FALSE; -+ if (!src || !chars) -+ return ERROR_INT("src and chars not both defined", procName, 1); -+ -+ n = strlen(src); -+ for (i = 0; i < n; i++) { -+ ch = src[i]; -+ if (strchr(chars, ch)) { -+ *pfound = TRUE; -+ break; -+ } -+ } -+ return 0; -+} -+ -+ - /*! - * \brief stringRemoveChars() - * diff --git a/pkgs/applications/misc/k2pdfopt/leptonica.patch b/pkgs/applications/misc/k2pdfopt/leptonica.patch new file mode 100644 index 00000000000..dfab99fd013 --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/leptonica.patch @@ -0,0 +1,254 @@ +From 8c11a20925686855023df90ed477957c7d7fe91e Mon Sep 17 00:00:00 2001 +From: Daniel Fullmer <danielrf12@gmail.com> +Date: Fri, 13 Sep 2019 15:54:21 -0400 +Subject: [PATCH] Willus mod for k2pdfopt + +--- + src/allheaders.h | 4 ++ + src/dewarp2.c | 106 ++++++++++++++++++++++++++++++++++++++++++----- + src/leptwin.c | 6 ++- + 3 files changed, 104 insertions(+), 12 deletions(-) + +diff --git a/src/allheaders.h b/src/allheaders.h +index e68eff1..b3cc729 100644 +--- a/src/allheaders.h ++++ b/src/allheaders.h +@@ -669,6 +669,10 @@ LEPT_DLL extern L_DEWARPA * dewarpaReadMem ( const l_uint8 *data, size_t size ); + LEPT_DLL extern l_ok dewarpaWrite ( const char *filename, L_DEWARPA *dewa ); + LEPT_DLL extern l_ok dewarpaWriteStream ( FILE *fp, L_DEWARPA *dewa ); + LEPT_DLL extern l_ok dewarpaWriteMem ( l_uint8 **pdata, size_t *psize, L_DEWARPA *dewa ); ++/* WILLUS MOD */ ++ LEPT_DLL extern l_int32 dewarpBuildPageModel_ex ( L_DEWARP *dew, const char *debugfile,l_int32 fit_order ); ++ LEPT_DLL extern l_int32 dewarpFindVertDisparity_ex ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag,l_int32 fit_order ); ++ LEPT_DLL extern l_int32 dewarpBuildLineModel_ex ( L_DEWARP *dew, l_int32 opensize, const char *debugfile,l_int32 fit_order ); + LEPT_DLL extern l_ok dewarpBuildPageModel ( L_DEWARP *dew, const char *debugfile ); + LEPT_DLL extern l_ok dewarpFindVertDisparity ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag ); + LEPT_DLL extern l_ok dewarpFindHorizDisparity ( L_DEWARP *dew, PTAA *ptaa ); +diff --git a/src/dewarp2.c b/src/dewarp2.c +index 220eec1..2e29500 100644 +--- a/src/dewarp2.c ++++ b/src/dewarp2.c +@@ -144,9 +144,17 @@ static const l_float32 L_ALLOWED_W_FRACT = 0.05; /* no bigger */ + * longest textlines. + * </pre> + */ ++/* WILLUS MOD */ + l_ok +-dewarpBuildPageModel(L_DEWARP *dew, +- const char *debugfile) ++dewarpBuildPageModel(L_DEWARP *dew,const char *debugfile) ++{ ++return(dewarpBuildPageModel_ex(dew,debugfile,2)); ++} ++ ++l_ok ++dewarpBuildPageModel_ex(L_DEWARP *dew, ++ const char *debugfile, ++ l_int32 fit_order) + { + l_int32 linecount, topline, botline, ret; + PIX *pixs, *pix1, *pix2, *pix3; +@@ -225,7 +233,7 @@ PTAA *ptaa1, *ptaa2; + /* Get the sampled vertical disparity from the textline centers. + * The disparity array will push pixels vertically so that each + * textline is flat and centered at the y-position of the mid-point. */ +- if (dewarpFindVertDisparity(dew, ptaa2, 0) != 0) { ++ if (dewarpFindVertDisparity_ex(dew, ptaa2, 0, fit_order) != 0) { + L_WARNING("vertical disparity not built\n", procName); + ptaaDestroy(&ptaa2); + return 1; +@@ -290,13 +298,24 @@ PTAA *ptaa1, *ptaa2; + * a pdf. Non-pix debug output goes to /tmp. + * </pre> + */ ++/* WILLUS MOD */ + l_ok + dewarpFindVertDisparity(L_DEWARP *dew, + PTAA *ptaa, + l_int32 rotflag) + { ++return(dewarpFindVertDisparity_ex(dew,ptaa,rotflag,2)); ++} ++/* WILLUS MOD -- add cubic and quartic fits and ..._ex functions */ ++l_int32 ++dewarpFindVertDisparity_ex(L_DEWARP *dew, ++ PTAA *ptaa, ++ l_int32 rotflag, ++ l_int32 fit_order) ++{ + l_int32 i, j, nlines, npts, nx, ny, sampling; +-l_float32 c0, c1, c2, x, y, midy, val, medval, meddev, minval, maxval; ++/* WILLUS MOD */ ++l_float32 c0, c1, c2, c3, c4, x, y, midy, val, medval, meddev, minval, maxval; + l_float32 *famidys; + NUMA *nax, *nafit, *nacurve0, *nacurve1, *nacurves; + NUMA *namidy, *namidys, *namidysi; +@@ -304,11 +323,22 @@ PIX *pix1, *pix2, *pixcirc, *pixdb; + PTA *pta, *ptad, *ptacirc; + PTAA *ptaa0, *ptaa1, *ptaa2, *ptaa3, *ptaa4, *ptaa5, *ptaat; + FPIX *fpix; ++/* WILLUS MOD */ ++l_int32 fit_order1,fit_order2; + + PROCNAME("dewarpFindVertDisparity"); + + if (!dew) + return ERROR_INT("dew not defined", procName, 1); ++/* WILLUS MOD */ ++ if (fit_order < 10) ++ fit_order1 = fit_order2 = fit_order; ++ else ++ { ++ fit_order1=fit_order % 10; ++ fit_order2=fit_order / 10; ++ fit_order2=fit_order2 % 10; ++ } + dew->vsuccess = 0; + if (!ptaa) + return ERROR_INT("ptaa not defined", procName, 1); +@@ -331,12 +361,32 @@ FPIX *fpix; + pixdb = (rotflag) ? pixRotateOrth(dew->pixs, 1) : pixClone(dew->pixs); + for (i = 0; i < nlines; i++) { /* for each line */ + pta = ptaaGetPta(ptaa, i, L_CLONE); +- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); +- numaAddNumber(nacurve0, c2); ++/* WILLUS MOD */ ++if (fit_order1>3) ++ { ++ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL); ++ numaAddNumber(nacurve0, c4); ++ } ++else if (fit_order1==3) ++ { ++ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL); ++ numaAddNumber(nacurve0, c3); ++ } ++else ++ { ++ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); ++ numaAddNumber(nacurve0, c2); ++ } + ptad = ptaCreate(nx); + for (j = 0; j < nx; j++) { /* uniformly sampled in x */ + x = j * sampling; +- applyQuadraticFit(c2, c1, c0, x, &y); ++/* WILLUS MOD */ ++if (fit_order1>3) ++ applyQuarticFit(c4, c3, c2, c1, c0, x, &y); ++else if (fit_order1==3) ++ applyCubicFit(c3, c2, c1, c0, x, &y); ++else ++ applyQuadraticFit(c2, c1, c0, x, &y); + ptaAddPt(ptad, x, y); + } + ptaaAddPta(ptaa0, ptad, L_INSERT); +@@ -350,7 +400,13 @@ FPIX *fpix; + for (i = 0; i < nlines; i++) { + pta = ptaaGetPta(ptaa, i, L_CLONE); + ptaGetArrays(pta, &nax, NULL); +- ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit); ++/* WILLUS MOD */ ++if (fit_order1>3) ++ptaGetQuarticLSF(pta, NULL, NULL, NULL, NULL, NULL, &nafit); ++else if (fit_order1==3) ++ptaGetCubicLSF(pta, NULL, NULL, NULL, NULL, &nafit); ++else ++ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit); + ptad = ptaCreateFromNuma(nax, nafit); + ptaaAddPta(ptaat, ptad, L_INSERT); + ptaDestroy(&pta); +@@ -494,11 +550,24 @@ FPIX *fpix; + ptaa5 = ptaaCreate(nx); /* uniformly sampled across full height of image */ + for (j = 0; j < nx; j++) { /* for each column */ + pta = ptaaGetPta(ptaa4, j, L_CLONE); +- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); ++/* WILLUS MOD */ ++/* Order higher than 2 can cause a little craziness here. */ ++if (fit_order2>3) ++ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL); ++else if (fit_order2==3) ++ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL); ++else ++ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); + ptad = ptaCreate(ny); + for (i = 0; i < ny; i++) { /* uniformly sampled in y */ + y = i * sampling; +- applyQuadraticFit(c2, c1, c0, y, &val); ++/* WILLUS MOD */ ++if (fit_order2>3) ++ applyQuarticFit(c4, c3, c2, c1, c0, y, &val); ++else if (fit_order2==3) ++ applyCubicFit(c3, c2, c1, c0, y, &val); ++else ++ applyQuadraticFit(c2, c1, c0, y, &val); + ptaAddPt(ptad, y, val); + } + ptaaAddPta(ptaa5, ptad, L_INSERT); +@@ -1602,11 +1671,21 @@ FPIX *fpix; + * See notes there. + * </pre> + */ ++/* WILLUS MOD */ + l_ok + dewarpBuildLineModel(L_DEWARP *dew, + l_int32 opensize, + const char *debugfile) + { ++return(dewarpBuildLineModel_ex(dew,opensize,debugfile,2)); ++} ++ ++l_int32 ++dewarpBuildLineModel_ex(L_DEWARP *dew, ++ l_int32 opensize, ++ const char *debugfile, ++ l_int32 fit_order) ++{ + char buf[64]; + l_int32 i, j, bx, by, ret, nlines; + BOXA *boxa; +@@ -1695,6 +1774,8 @@ PTAA *ptaa1, *ptaa2; + + /* Remove all lines that are not at least 0.75 times the length + * of the longest line. */ ++/* WILLUS MOD */ ++/* + ptaa2 = dewarpRemoveShortLines(pix, ptaa1, 0.75, DEBUG_SHORT_LINES); + if (debugfile) { + pix1 = pixConvertTo32(pix); +@@ -1704,6 +1785,8 @@ PTAA *ptaa1, *ptaa2; + pixDestroy(&pix1); + pixDestroy(&pix2); + } ++*/ ++ptaa2=ptaa1; + ptaaDestroy(&ptaa1); + nlines = ptaaGetCount(ptaa2); + if (nlines < dew->minlines) { +@@ -1717,7 +1800,8 @@ PTAA *ptaa1, *ptaa2; + * centers. The disparity array will push pixels vertically + * so that each line is flat and centered at the y-position + * of the mid-point. */ +- ret = dewarpFindVertDisparity(dew, ptaa2, 1 - i); ++/* WILLUS MOD */ ++ ret = dewarpFindVertDisparity_ex(dew, ptaa2, 1 - i, fit_order); + + /* If i == 0, move the result to the horizontal disparity, + * rotating it back by -90 degrees. */ +diff --git a/src/leptwin.c b/src/leptwin.c +index 72643a0..573d33e 100644 +--- a/src/leptwin.c ++++ b/src/leptwin.c +@@ -364,5 +364,9 @@ PIXCMAP *cmap; + + return hBitmap; + } +- ++#else ++/* willus mod: Avoid weird issue with OS/X library archiver when there are no symbols */ ++int leptwin_my_empty_func(void); ++int leptwin_my_empty_func(void) ++{return(0);} + #endif /* _WIN32 */ +-- +2.22.0 + diff --git a/pkgs/applications/misc/k2pdfopt/mupdf.patch b/pkgs/applications/misc/k2pdfopt/mupdf.patch new file mode 100644 index 00000000000..0c59a1d2016 --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/mupdf.patch @@ -0,0 +1,1060 @@ +From d8927c969e3387ca2669a616c0ba53bce918a031 Mon Sep 17 00:00:00 2001 +From: Daniel Fullmer <danielrf12@gmail.com> +Date: Fri, 13 Sep 2019 15:11:45 -0400 +Subject: [PATCH] Willus mod for k2pdfopt + +--- + source/fitz/filter-basic.c | 3 + + source/fitz/font-win32.c | 866 +++++++++++++++++++++++++++++++++++++ + source/fitz/font.c | 3 + + source/fitz/stext-device.c | 5 + + source/fitz/string.c | 5 + + source/pdf/pdf-annot.c | 14 +- + source/pdf/pdf-link.c | 3 + + source/pdf/pdf-parse.c | 5 + + source/pdf/pdf-xref.c | 9 + + 9 files changed, 912 insertions(+), 1 deletion(-) + create mode 100644 source/fitz/font-win32.c + +diff --git a/source/fitz/filter-basic.c b/source/fitz/filter-basic.c +index 0713a62e7..b8ef4d292 100644 +--- a/source/fitz/filter-basic.c ++++ b/source/fitz/filter-basic.c +@@ -259,7 +259,10 @@ look_for_endstream: + if (!state->warned) + { + state->warned = 1; ++/* willus mod -- no warning */ ++/* + fz_warn(ctx, "PDF stream Length incorrect"); ++*/ + } + return *stm->rp++; + } +diff --git a/source/fitz/font-win32.c b/source/fitz/font-win32.c +new file mode 100644 +index 000000000..45de8cfd3 +--- /dev/null ++++ b/source/fitz/font-win32.c +@@ -0,0 +1,866 @@ ++/* ++** Routines to access MS Windows system fonts. ++** From sumatra PDF distro. ++** Modified for MuPDF v1.9a by willus.com ++*/ ++#include "mupdf/pdf.h" ++ ++/* ++ Which fonts are embedded is based on a few preprocessor definitions. ++ ++ The base 14 fonts are always embedded. ++ For CJK font substitution we embed DroidSansFallback. ++ ++ Set NOCJK to skip all CJK support (this also omits embedding the CJK CMaps) ++ Set NOCJKFONT to skip the embedded CJK font. ++ Set NOCJKFULL to embed a smaller CJK font without CJK Extension A support. ++*/ ++ ++#ifdef NOCJK ++#define NOCJKFONT ++#endif ++ ++/* SumatraPDF: also load fonts included with Windows */ ++#ifdef _WIN32 ++ ++#ifndef UNICODE ++#define UNICODE ++#endif ++#ifndef _UNICODE ++#define _UNICODE ++#endif ++ ++#include <windows.h> ++ ++// TODO: Use more of FreeType for TTF parsing (for performance reasons, ++// the fonts can't be parsed completely, though) ++#include <ft2build.h> ++#include FT_TRUETYPE_IDS_H ++#include FT_TRUETYPE_TAGS_H ++ ++#define TTC_VERSION1 0x00010000 ++#define TTC_VERSION2 0x00020000 ++ ++#define MAX_FACENAME 128 ++ ++// Note: the font face must be the first field so that the structure ++// can be treated like a simple string for searching ++typedef struct pdf_fontmapMS_s ++{ ++ char fontface[MAX_FACENAME]; ++ char fontpath[MAX_PATH]; ++ int index; ++} pdf_fontmapMS; ++ ++typedef struct pdf_fontlistMS_s ++{ ++ pdf_fontmapMS *fontmap; ++ int len; ++ int cap; ++} pdf_fontlistMS; ++ ++typedef struct _tagTT_OFFSET_TABLE ++{ ++ ULONG uVersion; ++ USHORT uNumOfTables; ++ USHORT uSearchRange; ++ USHORT uEntrySelector; ++ USHORT uRangeShift; ++} TT_OFFSET_TABLE; ++ ++typedef struct _tagTT_TABLE_DIRECTORY ++{ ++ ULONG uTag; //table name ++ ULONG uCheckSum; //Check sum ++ ULONG uOffset; //Offset from beginning of file ++ ULONG uLength; //length of the table in bytes ++} TT_TABLE_DIRECTORY; ++ ++typedef struct _tagTT_NAME_TABLE_HEADER ++{ ++ USHORT uFSelector; //format selector. Always 0 ++ USHORT uNRCount; //Name Records count ++ USHORT uStorageOffset; //Offset for strings storage, from start of the table ++} TT_NAME_TABLE_HEADER; ++ ++typedef struct _tagTT_NAME_RECORD ++{ ++ USHORT uPlatformID; ++ USHORT uEncodingID; ++ USHORT uLanguageID; ++ USHORT uNameID; ++ USHORT uStringLength; ++ USHORT uStringOffset; //from start of storage area ++} TT_NAME_RECORD; ++ ++typedef struct _tagFONT_COLLECTION ++{ ++ ULONG Tag; ++ ULONG Version; ++ ULONG NumFonts; ++} FONT_COLLECTION; ++ ++static struct { ++ char *name; ++ char *pattern; ++} baseSubstitutes[] = { ++ { "Courier", "CourierNewPSMT" }, ++ { "Courier-Bold", "CourierNewPS-BoldMT" }, ++ { "Courier-Oblique", "CourierNewPS-ItalicMT" }, ++ { "Courier-BoldOblique", "CourierNewPS-BoldItalicMT" }, ++ { "Helvetica", "ArialMT" }, ++ { "Helvetica-Bold", "Arial-BoldMT" }, ++ { "Helvetica-Oblique", "Arial-ItalicMT" }, ++ { "Helvetica-BoldOblique", "Arial-BoldItalicMT" }, ++ { "Times-Roman", "TimesNewRomanPSMT" }, ++ { "Times-Bold", "TimesNewRomanPS-BoldMT" }, ++ { "Times-Italic", "TimesNewRomanPS-ItalicMT" }, ++ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT" }, ++ { "Symbol", "SymbolMT" }, ++}; ++static const char *base_font_names[][10] = ++{ ++ { "Courier", "CourierNew", "CourierNewPSMT", NULL }, ++ { "Courier-Bold", "CourierNew,Bold", "Courier,Bold", ++ "CourierNewPS-BoldMT", "CourierNew-Bold", NULL }, ++ { "Courier-Oblique", "CourierNew,Italic", "Courier,Italic", ++ "CourierNewPS-ItalicMT", "CourierNew-Italic", NULL }, ++ { "Courier-BoldOblique", "CourierNew,BoldItalic", "Courier,BoldItalic", ++ "CourierNewPS-BoldItalicMT", "CourierNew-BoldItalic", NULL }, ++ { "Helvetica", "ArialMT", "Arial", NULL }, ++ { "Helvetica-Bold", "Arial-BoldMT", "Arial,Bold", "Arial-Bold", ++ "Helvetica,Bold", NULL }, ++ { "Helvetica-Oblique", "Arial-ItalicMT", "Arial,Italic", "Arial-Italic", ++ "Helvetica,Italic", "Helvetica-Italic", NULL }, ++ { "Helvetica-BoldOblique", "Arial-BoldItalicMT", ++ "Arial,BoldItalic", "Arial-BoldItalic", ++ "Helvetica,BoldItalic", "Helvetica-BoldItalic", NULL }, ++ { "Times-Roman", "TimesNewRomanPSMT", "TimesNewRoman", ++ "TimesNewRomanPS", NULL }, ++ { "Times-Bold", "TimesNewRomanPS-BoldMT", "TimesNewRoman,Bold", ++ "TimesNewRomanPS-Bold", "TimesNewRoman-Bold", NULL }, ++ { "Times-Italic", "TimesNewRomanPS-ItalicMT", "TimesNewRoman,Italic", ++ "TimesNewRomanPS-Italic", "TimesNewRoman-Italic", NULL }, ++ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT", ++ "TimesNewRoman,BoldItalic", "TimesNewRomanPS-BoldItalic", ++ "TimesNewRoman-BoldItalic", NULL }, ++ { "Symbol", "Symbol,Italic", "Symbol,Bold", "Symbol,BoldItalic", ++ "SymbolMT", "SymbolMT,Italic", "SymbolMT,Bold", "SymbolMT,BoldItalic", NULL }, ++ { "ZapfDingbats", NULL } ++}; ++ ++static pdf_fontlistMS fontlistMS = ++{ ++ NULL, ++ 0, ++ 0, ++}; ++static int strcmp_ignore_space(const char *a, const char *b); ++static const char *clean_font_name(const char *fontname); ++static const char *pdf_clean_base14_name(const char *fontname); ++ ++static inline USHORT BEtoHs(USHORT x) ++{ ++ BYTE *data = (BYTE *)&x; ++ return (data[0] << 8) | data[1]; ++} ++ ++static inline ULONG BEtoHl(ULONG x) ++{ ++ BYTE *data = (BYTE *)&x; ++ return (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3]; ++} ++ ++static int strcmp_ignore_space(const char *a, const char *b) ++{ ++ while (1) ++ { ++ while (*a == ' ') ++ a++; ++ while (*b == ' ') ++ b++; ++ if (*a != *b) ++ return 1; ++ if (*a == 0) ++ return *a != *b; ++ if (*b == 0) ++ return *a != *b; ++ a++; ++ b++; ++ } ++} ++ ++/* A little bit more sophisticated name matching so that e.g. "EurostileExtended" ++ matches "EurostileExtended-Roman" or "Tahoma-Bold,Bold" matches "Tahoma-Bold" */ ++static int ++lookup_compare(const void *elem1, const void *elem2) ++{ ++ const char *val1 = elem1; ++ const char *val2 = elem2; ++ int len1 = strlen(val1); ++ int len2 = strlen(val2); ++ ++ if (len1 != len2) ++ { ++ const char *rest = len1 > len2 ? val1 + len2 : val2 + len1; ++ if (',' == *rest || !_stricmp(rest, "-roman")) ++ return _strnicmp(val1, val2, fz_mini(len1, len2)); ++ } ++ ++ return _stricmp(val1, val2); ++} ++ ++static void ++remove_spaces(char *srcDest) ++{ ++ char *dest; ++ ++ for (dest = srcDest; *srcDest; srcDest++) ++ if (*srcDest != ' ') ++ *dest++ = *srcDest; ++ *dest = '\0'; ++} ++ ++static int ++str_ends_with(const char *str, const char *end) ++{ ++ size_t len1 = strlen(str); ++ size_t len2 = strlen(end); ++ ++ return len1 >= len2 && !strcmp(str + len1 - len2, end); ++} ++ ++static pdf_fontmapMS * ++pdf_find_windows_font_path(const char *fontname) ++{ ++ return bsearch(fontname, fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), lookup_compare); ++} ++ ++/* source and dest can be same */ ++static void ++decode_unicode_BE(fz_context *ctx, char *source, int sourcelen, char *dest, int destlen) ++{ ++ WCHAR *tmp; ++ int converted, i; ++ ++ if (sourcelen % 2 != 0) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string"); ++ ++ tmp = fz_malloc_array(ctx, sourcelen / 2 + 1, sizeof(WCHAR)); ++ for (i = 0; i < sourcelen / 2; i++) ++ tmp[i] = BEtoHs(((WCHAR *)source)[i]); ++ tmp[sourcelen / 2] = '\0'; ++ ++ converted = WideCharToMultiByte(CP_UTF8, 0, tmp, -1, dest, destlen, NULL, NULL); ++ fz_free(ctx, tmp); ++ if (!converted) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string"); ++} ++ ++static void ++decode_platform_string(fz_context *ctx, int platform, int enctype, char *source, int sourcelen, char *dest, int destlen) ++{ ++ switch (platform) ++ { ++ case TT_PLATFORM_APPLE_UNICODE: ++ switch (enctype) ++ { ++ case TT_APPLE_ID_DEFAULT: ++ case TT_APPLE_ID_UNICODE_2_0: ++ decode_unicode_BE(ctx, source, sourcelen, dest, destlen); ++ return; ++ } ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); ++ case TT_PLATFORM_MACINTOSH: ++ switch (enctype) ++ { ++ case TT_MAC_ID_ROMAN: ++ if (sourcelen + 1 > destlen) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : overlong fontname: %s", source); ++ // TODO: Convert to UTF-8 from what encoding? ++ memcpy(dest, source, sourcelen); ++ dest[sourcelen] = 0; ++ return; ++ } ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); ++ case TT_PLATFORM_MICROSOFT: ++ switch (enctype) ++ { ++ case TT_MS_ID_SYMBOL_CS: ++ case TT_MS_ID_UNICODE_CS: ++ case TT_MS_ID_UCS_4: ++ decode_unicode_BE(ctx, source, sourcelen, dest, destlen); ++ return; ++ } ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); ++ default: ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); ++ } ++} ++ ++static void ++grow_system_font_list(fz_context *ctx, pdf_fontlistMS *fl) ++{ ++ int newcap; ++ pdf_fontmapMS *newitems; ++ ++ if (fl->cap == 0) ++ newcap = 1024; ++ else ++ newcap = fl->cap * 2; ++ ++ // use realloc/free for the fontmap, since the list can ++ // remain in memory even with all fz_contexts destroyed ++ newitems = realloc(fl->fontmap, newcap * sizeof(pdf_fontmapMS)); ++ if (!newitems) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "OOM in grow_system_font_list"); ++ memset(newitems + fl->cap, 0, sizeof(pdf_fontmapMS) * (newcap - fl->cap)); ++ ++ fl->fontmap = newitems; ++ fl->cap = newcap; ++} ++ ++static void ++append_mapping(fz_context *ctx, pdf_fontlistMS *fl, const char *facename, const char *path, int index) ++{ ++ if (fl->len == fl->cap) ++ grow_system_font_list(ctx, fl); ++ ++ if (fl->len >= fl->cap) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : fontlist overflow"); ++ ++ fz_strlcpy(fl->fontmap[fl->len].fontface, facename, sizeof(fl->fontmap[0].fontface)); ++ fz_strlcpy(fl->fontmap[fl->len].fontpath, path, sizeof(fl->fontmap[0].fontpath)); ++ fl->fontmap[fl->len].index = index; ++ ++ ++fl->len; ++} ++ ++static void ++safe_read(fz_context *ctx, fz_stream *file, int offset, char *buf, int size) ++{ ++ int n; ++ fz_seek(ctx, file, offset, 0); ++ n = fz_read(ctx, file, (unsigned char *)buf, size); ++ if (n != size) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "safe_read: read %d, expected %d", n, size); ++} ++ ++static void ++read_ttf_string(fz_context *ctx, fz_stream *file, int offset, TT_NAME_RECORD *ttRecordBE, char *buf, int size) ++{ ++ char szTemp[MAX_FACENAME * 2]; ++ // ignore empty and overlong strings ++ int stringLength = BEtoHs(ttRecordBE->uStringLength); ++ if (stringLength == 0 || stringLength >= sizeof(szTemp)) ++ return; ++ ++ safe_read(ctx, file, offset + BEtoHs(ttRecordBE->uStringOffset), szTemp, stringLength); ++ decode_platform_string(ctx, BEtoHs(ttRecordBE->uPlatformID), ++ BEtoHs(ttRecordBE->uEncodingID), szTemp, stringLength, buf, size); ++} ++ ++static void ++makeFakePSName(char szName[MAX_FACENAME], const char *szStyle) ++{ ++ // append the font's subfamily, unless it's a Regular font ++ if (*szStyle && _stricmp(szStyle, "Regular") != 0) ++ { ++ fz_strlcat(szName, "-", MAX_FACENAME); ++ fz_strlcat(szName, szStyle, MAX_FACENAME); ++ } ++ remove_spaces(szName); ++} ++ ++static void ++parseTTF(fz_context *ctx, fz_stream *file, int offset, int index, const char *path) ++{ ++ TT_OFFSET_TABLE ttOffsetTableBE; ++ TT_TABLE_DIRECTORY tblDirBE; ++ TT_NAME_TABLE_HEADER ttNTHeaderBE; ++ TT_NAME_RECORD ttRecordBE; ++ ++ char szPSName[MAX_FACENAME] = { 0 }; ++ char szTTName[MAX_FACENAME] = { 0 }; ++ char szStyle[MAX_FACENAME] = { 0 }; ++ char szCJKName[MAX_FACENAME] = { 0 }; ++ int i, count, tblOffset; ++ ++ safe_read(ctx, file, offset, (char *)&ttOffsetTableBE, sizeof(TT_OFFSET_TABLE)); ++ ++ // check if this is a TrueType font of version 1.0 or an OpenType font ++ if (BEtoHl(ttOffsetTableBE.uVersion) != TTC_VERSION1 && ++ BEtoHl(ttOffsetTableBE.uVersion) != TTAG_OTTO) ++ { ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid font version %x", (unsigned int)BEtoHl(ttOffsetTableBE.uVersion)); ++ } ++ ++ // determine the name table's offset by iterating through the offset table ++ count = BEtoHs(ttOffsetTableBE.uNumOfTables); ++ for (i = 0; i < count; i++) ++ { ++ int entryOffset = offset + sizeof(TT_OFFSET_TABLE) + i * sizeof(TT_TABLE_DIRECTORY); ++ safe_read(ctx, file, entryOffset, (char *)&tblDirBE, sizeof(TT_TABLE_DIRECTORY)); ++ if (!BEtoHl(tblDirBE.uTag) || BEtoHl(tblDirBE.uTag) == TTAG_name) ++ break; ++ } ++ if (count == i || !BEtoHl(tblDirBE.uTag)) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : nameless font"); ++ tblOffset = BEtoHl(tblDirBE.uOffset); ++ ++ // read the 'name' table for record count and offsets ++ safe_read(ctx, file, tblOffset, (char *)&ttNTHeaderBE, sizeof(TT_NAME_TABLE_HEADER)); ++ offset = tblOffset + sizeof(TT_NAME_TABLE_HEADER); ++ tblOffset += BEtoHs(ttNTHeaderBE.uStorageOffset); ++ ++ // read through the strings for PostScript name and font family ++ count = BEtoHs(ttNTHeaderBE.uNRCount); ++ for (i = 0; i < count; i++) ++ { ++ short langId, nameId; ++ BOOL isCJKName; ++ ++ safe_read(ctx, file, offset + i * sizeof(TT_NAME_RECORD), (char *)&ttRecordBE, sizeof(TT_NAME_RECORD)); ++ ++ langId = BEtoHs(ttRecordBE.uLanguageID); ++ nameId = BEtoHs(ttRecordBE.uNameID); ++ isCJKName = TT_NAME_ID_FONT_FAMILY == nameId && LANG_CHINESE == PRIMARYLANGID(langId); ++ ++ // ignore non-English strings (except for Chinese font names) ++ if (langId && langId != TT_MS_LANGID_ENGLISH_UNITED_STATES && !isCJKName) ++ continue; ++ // ignore names other than font (sub)family and PostScript name ++ fz_try(ctx) ++ { ++ if (isCJKName) ++ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szCJKName, sizeof(szCJKName)); ++ else if (TT_NAME_ID_FONT_FAMILY == nameId) ++ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szTTName, sizeof(szTTName)); ++ else if (TT_NAME_ID_FONT_SUBFAMILY == nameId) ++ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szStyle, sizeof(szStyle)); ++ else if (TT_NAME_ID_PS_NAME == nameId) ++ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szPSName, sizeof(szPSName)); ++ } ++ fz_catch(ctx) ++ { ++ fz_warn(ctx, "ignoring face name decoding fonterror"); ++ } ++ } ++ ++ // try to prevent non-Arial fonts from accidentally substituting Arial ++ if (!strcmp(szPSName, "ArialMT")) ++ { ++ // cf. https://code.google.com/p/sumatrapdf/issues/detail?id=2471 ++ if (strcmp(szTTName, "Arial") != 0) ++ szPSName[0] = '\0'; ++ // TODO: is there a better way to distinguish Arial Caps from Arial proper? ++ // cf. http://code.google.com/p/sumatrapdf/issues/detail?id=1290 ++ else if (strstr(path, "caps") || strstr(path, "Caps")) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "ignore %s, as it can't be distinguished from Arial,Regular", path); ++ } ++ ++ if (szPSName[0]) ++ append_mapping(ctx, &fontlistMS, szPSName, path, index); ++ if (szTTName[0]) ++ { ++ // derive a PostScript-like name and add it, if it's different from the font's ++ // included PostScript name; cf. http://code.google.com/p/sumatrapdf/issues/detail?id=376 ++ makeFakePSName(szTTName, szStyle); ++ // compare the two names before adding this one ++ if (lookup_compare(szTTName, szPSName)) ++ append_mapping(ctx, &fontlistMS, szTTName, path, index); ++ } ++ if (szCJKName[0]) ++ { ++ makeFakePSName(szCJKName, szStyle); ++ if (lookup_compare(szCJKName, szPSName) && lookup_compare(szCJKName, szTTName)) ++ append_mapping(ctx, &fontlistMS, szCJKName, path, index); ++ } ++} ++ ++static void ++parseTTFs(fz_context *ctx, const char *path) ++{ ++ fz_stream *file = fz_open_file(ctx, path); ++ /* "fonterror : %s not found", path */ ++ fz_try(ctx) ++ { ++ parseTTF(ctx, file, 0, 0, path); ++ } ++ fz_always(ctx) ++ { ++ fz_drop_stream(ctx,file); ++ } ++ fz_catch(ctx) ++ { ++ fz_rethrow(ctx); ++ } ++} ++ ++static void ++parseTTCs(fz_context *ctx, const char *path) ++{ ++ FONT_COLLECTION fontcollectionBE; ++ ULONG i, numFonts, *offsettableBE = NULL; ++ ++ fz_stream *file = fz_open_file(ctx, path); ++ /* "fonterror : %s not found", path */ ++ ++ fz_var(offsettableBE); ++ ++ fz_try(ctx) ++ { ++ safe_read(ctx, file, 0, (char *)&fontcollectionBE, sizeof(FONT_COLLECTION)); ++ if (BEtoHl(fontcollectionBE.Tag) != TTAG_ttcf) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : wrong format %x", (unsigned int)BEtoHl(fontcollectionBE.Tag)); ++ if (BEtoHl(fontcollectionBE.Version) != TTC_VERSION1 && ++ BEtoHl(fontcollectionBE.Version) != TTC_VERSION2) ++ { ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid version %x", (unsigned int)BEtoHl(fontcollectionBE.Version)); ++ } ++ ++ numFonts = BEtoHl(fontcollectionBE.NumFonts); ++ offsettableBE = fz_malloc_array(ctx, numFonts, sizeof(ULONG)); ++ ++ safe_read(ctx, file, sizeof(FONT_COLLECTION), (char *)offsettableBE, numFonts * sizeof(ULONG)); ++ for (i = 0; i < numFonts; i++) ++ parseTTF(ctx, file, BEtoHl(offsettableBE[i]), i, path); ++ } ++ fz_always(ctx) ++ { ++ fz_free(ctx, offsettableBE); ++ fz_drop_stream(ctx,file); ++ } ++ fz_catch(ctx) ++ { ++ fz_rethrow(ctx); ++ } ++} ++ ++static void ++extend_system_font_list(fz_context *ctx, const WCHAR *path) ++{ ++ WCHAR szPath[MAX_PATH], *lpFileName; ++ WIN32_FIND_DATA FileData; ++ HANDLE hList; ++ ++ GetFullPathName(path, nelem(szPath), szPath, &lpFileName); ++ ++ hList = FindFirstFile(szPath, &FileData); ++ if (hList == INVALID_HANDLE_VALUE) ++ { ++ // Don't complain about missing directories ++ if (GetLastError() == ERROR_FILE_NOT_FOUND) ++ return; ++ fz_throw(ctx, FZ_ERROR_GENERIC, "extend_system_font_list: unknown error %d", (int)GetLastError()); ++ } ++ do ++ { ++ if (!(FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) ++ { ++ char szPathUtf8[MAX_PATH], *fileExt; ++ int res; ++ lstrcpyn(lpFileName, FileData.cFileName, szPath + MAX_PATH - lpFileName); ++ res = WideCharToMultiByte(CP_UTF8, 0, szPath, -1, szPathUtf8, sizeof(szPathUtf8), NULL, NULL); ++ if (!res) ++ { ++ fz_warn(ctx, "WideCharToMultiByte failed for %S", szPath); ++ continue; ++ } ++ fileExt = szPathUtf8 + strlen(szPathUtf8) - 4; ++ fz_try(ctx) ++ { ++ if (!_stricmp(fileExt, ".ttc")) ++ parseTTCs(ctx, szPathUtf8); ++ else if (!_stricmp(fileExt, ".ttf") || !_stricmp(fileExt, ".otf")) ++ parseTTFs(ctx, szPathUtf8); ++ } ++ fz_catch(ctx) ++ { ++ // ignore errors occurring while parsing a given font file ++ } ++ } ++ } while (FindNextFile(hList, &FileData)); ++ FindClose(hList); ++} ++ ++static void ++destroy_system_font_list(void) ++{ ++ free(fontlistMS.fontmap); ++ memset(&fontlistMS, 0, sizeof(fontlistMS)); ++} ++ ++static void ++create_system_font_list(fz_context *ctx) ++{ ++ WCHAR szFontDir[MAX_PATH]; ++ UINT cch; ++ ++ cch = GetWindowsDirectory(szFontDir, nelem(szFontDir) - 12); ++ if (0 < cch && cch < nelem(szFontDir) - 12) ++ { ++ /* willus.com edit--Win XP default MSVCRT.DLL doesn't have wcscat_s */ ++#ifdef _WIN64 ++ wcscat_s(szFontDir, MAX_PATH, L"\\Fonts\\*.?t?"); ++#else ++ wcscat(szFontDir,L"\\Fonts\\*.?t?"); ++#endif ++ extend_system_font_list(ctx, szFontDir); ++ } ++ ++ if (fontlistMS.len == 0) ++ fz_warn(ctx, "couldn't find any usable system fonts"); ++ ++#ifdef NOCJKFONT ++ { ++ // If no CJK fallback font is builtin but one has been shipped separately (in the same ++ // directory as the main executable), add it to the list of loadable system fonts ++ WCHAR szFile[MAX_PATH], *lpFileName; ++ GetModuleFileName(0, szFontDir, MAX_PATH); ++ GetFullPathName(szFontDir, MAX_PATH, szFile, &lpFileName); ++ lstrcpyn(lpFileName, L"DroidSansFallback.ttf", szFile + MAX_PATH - lpFileName); ++ extend_system_font_list(ctx, szFile); ++ } ++#endif ++ ++ // sort the font list, so that it can be searched binarily ++ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp); ++ ++#ifdef DEBUG ++ // allow to overwrite system fonts for debugging purposes ++ // (either pass a full path or a search pattern such as "fonts\*.ttf") ++ cch = GetEnvironmentVariable(L"MUPDF_FONTS_PATTERN", szFontDir, nelem(szFontDir)); ++ if (0 < cch && cch < nelem(szFontDir)) ++ { ++ int i, prev_len = fontlistMS.len; ++ extend_system_font_list(ctx, szFontDir); ++ for (i = prev_len; i < fontlistMS.len; i++) ++ { ++ pdf_fontmapMS *entry = bsearch(fontlistMS.fontmap[i].fontface, fontlistMS.fontmap, prev_len, sizeof(pdf_fontmapMS), lookup_compare); ++ if (entry) ++ *entry = fontlistMS.fontmap[i]; ++ } ++ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp); ++ } ++#endif ++ ++ // make sure to clean up after ourselves ++ atexit(destroy_system_font_list); ++} ++ ++static fz_font * ++pdf_load_windows_font_by_name(fz_context *ctx, const char *orig_name) ++{ ++ pdf_fontmapMS *found = NULL; ++ char *comma, *fontname; ++ fz_font *font; ++ ++ /* WILLUS MOD--not multi-threaded for k2pdfopt */ ++ /* fz_synchronize_begin(); */ ++ if (fontlistMS.len == 0) ++ { ++ fz_try(ctx) ++ { ++ create_system_font_list(ctx); ++ } ++ fz_catch(ctx) { } ++ } ++ /* WILLUS MOD--not multi-threaded for k2pdfopt */ ++ /* fz_synchronize_end(); */ ++ if (fontlistMS.len == 0) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror: couldn't find any fonts"); ++ ++ // work on a normalized copy of the font name ++ fontname = fz_strdup(ctx, orig_name); ++ remove_spaces(fontname); ++ ++ // first, try to find the exact font name (including appended style information) ++ comma = strchr(fontname, ','); ++ if (comma) ++ { ++ *comma = '-'; ++ found = pdf_find_windows_font_path(fontname); ++ *comma = ','; ++ } ++ // second, substitute the font name with a known PostScript name ++ else ++ { ++ int i; ++ for (i = 0; i < nelem(baseSubstitutes) && !found; i++) ++ if (!strcmp(fontname, baseSubstitutes[i].name)) ++ found = pdf_find_windows_font_path(baseSubstitutes[i].pattern); ++ } ++ // third, search for the font name without additional style information ++ if (!found) ++ found = pdf_find_windows_font_path(fontname); ++ // fourth, try to separate style from basename for prestyled fonts (e.g. "ArialBold") ++ if (!found && !comma && (str_ends_with(fontname, "Bold") || str_ends_with(fontname, "Italic"))) ++ { ++ int styleLen = str_ends_with(fontname, "Bold") ? 4 : str_ends_with(fontname, "BoldItalic") ? 10 : 6; ++ fontname = fz_resize_array(ctx, fontname, strlen(fontname) + 2, sizeof(char)); ++ comma = fontname + strlen(fontname) - styleLen; ++ memmove(comma + 1, comma, styleLen + 1); ++ *comma = '-'; ++ found = pdf_find_windows_font_path(fontname); ++ *comma = ','; ++ if (!found) ++ found = pdf_find_windows_font_path(fontname); ++ } ++ // fifth, try to convert the font name from the common Chinese codepage 936 ++ if (!found && fontname[0] < 0) ++ { ++ WCHAR cjkNameW[MAX_FACENAME]; ++ char cjkName[MAX_FACENAME]; ++ if (MultiByteToWideChar(936, MB_ERR_INVALID_CHARS, fontname, -1, cjkNameW, nelem(cjkNameW)) && ++ WideCharToMultiByte(CP_UTF8, 0, cjkNameW, -1, cjkName, nelem(cjkName), NULL, NULL)) ++ { ++ comma = strchr(cjkName, ','); ++ if (comma) ++ { ++ *comma = '-'; ++ found = pdf_find_windows_font_path(cjkName); ++ *comma = ','; ++ } ++ if (!found) ++ found = pdf_find_windows_font_path(cjkName); ++ } ++ } ++ ++ fz_free(ctx, fontname); ++ if (!found) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "couldn't find system font '%s'", orig_name); ++ ++ /* ++ fz_warn(ctx, "loading non-embedded font '%s' from '%s'", orig_name, found->fontpath); ++ */ ++ ++ font = fz_new_font_from_file(ctx, orig_name, found->fontpath, found->index, ++ strcmp(found->fontface, "DroidSansFallback") != 0); ++ /* willus mod for MuPDF v1.10, 10-21-2016 */ ++ { ++ fz_font_flags_t *flags; ++ flags=fz_font_flags(font); ++ if (flags!=NULL) ++ flags->ft_substitute = 1; ++ } ++ return font; ++} ++ ++static fz_font * ++pdf_load_windows_font(fz_context *ctx, const char *fontname, int bold, int italic, int needs_exact_metrics) ++{ ++ if (needs_exact_metrics) ++ { ++ const char *clean_name; ++ /* WILLUS: Declare pdf_clean_base14_name() */ ++ extern const char *pdf_clean_base14_name(const char *fontname); ++ ++ /* TODO: the metrics for Times-Roman and Courier don't match ++ those of Windows' Times New Roman and Courier New; for ++ some reason, Poppler doesn't seem to have this problem */ ++ int len; ++ if (fz_lookup_builtin_font(ctx,fontname, bold, italic, &len)) ++ return NULL; ++ ++ /* cf. http://code.google.com/p/sumatrapdf/issues/detail?id=2173 */ ++ clean_name = pdf_clean_base14_name(fontname); ++ if (clean_name != fontname && !strncmp(clean_name, "Times-", 6)) ++ return NULL; ++ } ++ ++ // TODO: unset font->ft_substitute for base14/needs_exact_metrics? ++ return pdf_load_windows_font_by_name(ctx, fontname); ++} ++ ++static const char *clean_font_name(const char *fontname) ++{ ++ int i, k; ++ for (i = 0; i < nelem(base_font_names); i++) ++ for (k = 0; base_font_names[i][k]; k++) ++ if (!strcmp_ignore_space(base_font_names[i][k], fontname)) ++ return base_font_names[i][0]; ++ return fontname; ++} ++ ++ ++/* SumatraPDF: expose clean_font_name */ ++static const char * pdf_clean_base14_name(const char *fontname) ++{ ++ return clean_font_name(fontname); ++} ++ ++static fz_font * ++pdf_load_windows_cjk_font(fz_context *ctx, const char *fontname, int ros, int serif) ++{ ++ fz_font *font; ++ ++ font=NULL; /* WILLUS: Avoid compiler warning */ ++ /* try to find a matching system font before falling back to an approximate one */ ++ fz_try(ctx) ++ { ++ font = pdf_load_windows_font_by_name(ctx, fontname); ++ } ++ fz_catch(ctx) ++ { ++ font = NULL; ++ } ++ if (font) ++ return font; ++ ++ /* try to fall back to a reasonable system font */ ++ fz_try(ctx) ++ { ++ if (serif) ++ { ++ switch (ros) ++ { ++ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "MingLiU"); break; ++ case FZ_ADOBE_GB: font = pdf_load_windows_font_by_name(ctx, "SimSun"); break; ++ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Mincho"); break; ++ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Batang"); break; ++ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid serif ros"); ++ } ++ } ++ else ++ { ++ switch (ros) ++ { ++ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "DFKaiShu-SB-Estd-BF"); break; ++ case FZ_ADOBE_GB: ++ fz_try(ctx) ++ { ++ font = pdf_load_windows_font_by_name(ctx, "KaiTi"); ++ } ++ fz_catch(ctx) ++ { ++ font = pdf_load_windows_font_by_name(ctx, "KaiTi_GB2312"); ++ } ++ break; ++ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Gothic"); break; ++ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Gulim"); break; ++ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid sans-serif ros"); ++ } ++ } ++ } ++ fz_catch(ctx) ++ { ++#ifdef NOCJKFONT ++ /* If no CJK fallback font is builtin, maybe one has been shipped separately */ ++ font = pdf_load_windows_font_by_name(ctx, "DroidSansFallback"); ++#else ++ fz_rethrow(ctx); ++#endif ++ } ++ ++ return font; ++} ++ ++#endif ++ ++void pdf_install_load_system_font_funcs(fz_context *ctx) ++{ ++#ifdef _WIN32 ++ fz_install_load_system_font_funcs(ctx, pdf_load_windows_font, pdf_load_windows_cjk_font, NULL); ++#endif ++} +diff --git a/source/fitz/font.c b/source/fitz/font.c +index 00c6e8f99..1448b4a56 100644 +--- a/source/fitz/font.c ++++ b/source/fitz/font.c +@@ -4,8 +4,11 @@ + #include "draw-imp.h" + + #include <ft2build.h> ++/* willus mod -- remove hb includes */ ++/* + #include "hb.h" + #include "hb-ft.h" ++*/ + + #include <assert.h> + +diff --git a/source/fitz/stext-device.c b/source/fitz/stext-device.c +index 2df90305e..b1f99e056 100644 +--- a/source/fitz/stext-device.c ++++ b/source/fitz/stext-device.c +@@ -825,6 +825,11 @@ fz_new_stext_device(fz_context *ctx, fz_stext_page *page, const fz_stext_options + dev->lastchar = ' '; + dev->curdir = 1; + dev->lasttext = NULL; ++ /* willus mod -- seems like this should be here, but not sure. */ ++ if (opts) ++ dev->flags = opts->flags; ++ else ++ dev->flags = 0; + + return (fz_device*)dev; + } +diff --git a/source/fitz/string.c b/source/fitz/string.c +index f8eedb682..7a767983d 100644 +--- a/source/fitz/string.c ++++ b/source/fitz/string.c +@@ -560,6 +560,10 @@ fz_utflen(const char *s) + */ + float fz_atof(const char *s) + { ++/* willus mod: atof(s), #if-#else-#endif */ ++#if (!defined(__SSE__)) ++ return(atof(s)); ++#else + float result; + + if (s == NULL) +@@ -572,6 +576,7 @@ float fz_atof(const char *s) + return 1; + result = fz_clamp(result, -FLT_MAX, FLT_MAX); + return result; ++#endif + } + + /* +diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c +index 4dfdf36fe..acff7d12a 100644 +--- a/source/pdf/pdf-annot.c ++++ b/source/pdf/pdf-annot.c +@@ -5,8 +5,20 @@ + #include <string.h> + #include <time.h> + ++/* willus mod--don't use _mkgmtime--not available in Win XP */ + #ifdef _WIN32 +-#define timegm _mkgmtime ++static time_t timegm(struct tm *date); ++static time_t timegm(struct tm *date) ++ ++ { ++ time_t t,z; ++ struct tm gmz; ++ ++ z=(time_t)0; ++ gmz=(*gmtime(&z)); ++ t=mktime(date)-mktime(&gmz); ++ return(t); ++ } + #endif + + #define isdigit(c) (c >= '0' && c <= '9') +diff --git a/source/pdf/pdf-link.c b/source/pdf/pdf-link.c +index 37444b471..613cc05b9 100644 +--- a/source/pdf/pdf-link.c ++++ b/source/pdf/pdf-link.c +@@ -345,6 +345,9 @@ pdf_resolve_link(fz_context *ctx, pdf_document *doc, const char *uri, float *xp, + } + return page; + } ++/* willus mod -- be quiet */ ++/* + fz_warn(ctx, "unknown link uri '%s'", uri); ++*/ + return -1; + } +diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c +index 04a772204..9dd0cd898 100644 +--- a/source/pdf/pdf-parse.c ++++ b/source/pdf/pdf-parse.c +@@ -663,9 +663,14 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc, + if (c == '\r') + { + c = fz_peek_byte(ctx, file); ++/* willus mod -- no warning */ ++/* + if (c != '\n') + fz_warn(ctx, "line feed missing after stream begin marker (%d %d R)", num, gen); + else ++*/ ++if (c=='\n') ++/* willus mod -- end */ + fz_read_byte(ctx, file); + } + stm_ofs = fz_tell(ctx, file); +diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c +index 8f888059b..08de7bfba 100644 +--- a/source/pdf/pdf-xref.c ++++ b/source/pdf/pdf-xref.c +@@ -710,8 +710,11 @@ pdf_xref_size_from_old_trailer(fz_context *ctx, pdf_document *doc, pdf_lexbuf *b + if (!s) + fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length missing"); + len = fz_atoi(fz_strsep(&s, " ")); ++/* willus mod -- no warning */ ++/* + if (len < 0) + fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length must be positive"); ++*/ + + /* broken pdfs where the section is not on a separate line */ + if (s && *s != '\0') +@@ -1378,7 +1381,10 @@ pdf_init_document(fz_context *ctx, pdf_document *doc) + { + pdf_drop_xref_sections(ctx, doc); + fz_rethrow_if(ctx, FZ_ERROR_TRYLATER); ++/* willus mod -- be quiet */ ++/* + fz_warn(ctx, "trying to repair broken xref"); ++*/ + repaired = 1; + } + +@@ -1506,7 +1512,10 @@ pdf_drop_document_imp(fz_context *ctx, pdf_document *doc) + /* Swallow error, but continue dropping */ + } + ++/* willu smod -- no pdf_drop_js */ ++/* + pdf_drop_js(ctx, doc->js); ++*/ + + pdf_drop_xref_sections(ctx, doc); + fz_free(ctx, doc->xref_index); +-- +2.22.0 + diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch index b882f5b949c..adfee9ae282 100644 --- a/pkgs/applications/misc/k2pdfopt/tesseract.patch +++ b/pkgs/applications/misc/k2pdfopt/tesseract.patch @@ -1,13 +1,675 @@ +From 39aa8502eee7bb669a29d1a9b3bfe5c9595ad960 Mon Sep 17 00:00:00 2001 +From: Daniel Fullmer <danielrf12@gmail.com> +Date: Fri, 13 Sep 2019 13:45:05 -0400 +Subject: [PATCH] Willus mod changes from k2pdfopt + +--- + src/api/Makefile.am | 1 + + src/api/baseapi.cpp | 87 +++++++++++ + src/api/baseapi.h | 3 + + src/api/tesscapi.cpp | 311 +++++++++++++++++++++++++++++++++++++ + src/api/tesseract.h | 29 ++++ + src/ccmain/tessedit.cpp | 5 +- + src/ccutil/ccutil.h | 7 + + src/ccutil/genericvector.h | 21 ++- + src/ccutil/mainblk.cpp | 17 +- + src/ccutil/params.cpp | 3 +- + src/ccutil/serialis.cpp | 3 + + src/ccutil/serialis.h | 2 + + src/lstm/input.cpp | 3 + + 13 files changed, 488 insertions(+), 4 deletions(-) + create mode 100644 src/api/tesscapi.cpp + create mode 100644 src/api/tesseract.h + diff --git a/src/api/Makefile.am b/src/api/Makefile.am -index d8c1e54..46ead13 100644 +index d9b76eb6..cd2dc30f 100644 --- a/src/api/Makefile.am +++ b/src/api/Makefile.am -@@ -42,7 +42,7 @@ libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS) - if VISIBILITY - libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS - endif --libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp -+libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp tesscapi.cpp +@@ -39,6 +39,7 @@ libtesseract_api_la_SOURCES += lstmboxrenderer.cpp + libtesseract_api_la_SOURCES += pdfrenderer.cpp + libtesseract_api_la_SOURCES += wordstrboxrenderer.cpp + libtesseract_api_la_SOURCES += renderer.cpp ++libtesseract_api_la_SOURCES += tesscapi.cpp lib_LTLIBRARIES += libtesseract.la - libtesseract_la_LDFLAGS = + libtesseract_la_LDFLAGS = $(LEPTONICA_LIBS) $(OPENCL_LDFLAGS) $(libarchive_LIBS) +diff --git a/src/api/baseapi.cpp b/src/api/baseapi.cpp +index 9245d07c..ea964ee6 100644 +--- a/src/api/baseapi.cpp ++++ b/src/api/baseapi.cpp +@@ -215,6 +215,14 @@ TessBaseAPI::TessBaseAPI() + // Use the current locale if building debug code. + std::locale::global(std::locale("")); + #endif ++ const char *locale; ++ locale = std::setlocale(LC_ALL, nullptr); ++/* willus mod Remove assertions--taken care of in tesscapi.cpp */ ++// ASSERT_HOST(!strcmp(locale, "C")); ++ locale = std::setlocale(LC_CTYPE, nullptr); ++// ASSERT_HOST(!strcmp(locale, "C")); ++ locale = std::setlocale(LC_NUMERIC, nullptr); ++// ASSERT_HOST(!strcmp(locale, "C")); + } + + TessBaseAPI::~TessBaseAPI() { +@@ -1333,6 +1341,85 @@ static void AddBoxToTSV(const PageIterator* it, PageIteratorLevel level, + text->add_str_int("\t", bottom - top); + } + ++/* willus mod */ ++int TessBaseAPI::GetOCRWords(int **x00,int **y00,int **x11,int **y11,int **ybaseline0, ++ char **utf8words) ++ ++ { ++ int iword,nwords,totlen,it8; ++ int *x0,*y0,*x1,*y1,*ybaseline; ++ char *tutf8; ++ ++ ResultIterator *res_it = GetIterator(); ++ /* Count words */ ++ iword=0; ++ totlen=0; ++ while (!res_it->Empty(RIL_BLOCK)) ++ { ++ if (res_it->Empty(RIL_WORD)) ++ { ++ res_it->Next(RIL_WORD); ++ continue; ++ } ++ iword++; ++ STRING textstr=std::unique_ptr<const char[]>(res_it->GetUTF8Text(RIL_WORD)).get(); ++ totlen+=strlen(textstr.string())+1; ++ res_it->Next(RIL_WORD); ++ } ++ nwords=iword; ++/* ++printf("\nnwords=%d, totlen=%d\n",nwords,totlen); ++*/ ++ x0=(*x00)=(int *)malloc(sizeof(int)*5*nwords); ++ y0=(*y00)=&x0[nwords]; ++ x1=(*x11)=&y0[nwords]; ++ y1=(*y11)=&x1[nwords]; ++ ybaseline=(*ybaseline0)=&y1[nwords]; ++ tutf8=(*utf8words)=(char *)malloc(totlen); ++ iword=0; ++ it8=0; ++ res_it->Begin(); ++ while (!res_it->Empty(RIL_BLOCK)) ++ { ++ if (res_it->Empty(RIL_WORD)) ++ { ++ res_it->Next(RIL_WORD); ++ continue; ++ } ++ STRING textstr=std::unique_ptr<const char[]>(res_it->GetUTF8Text(RIL_WORD)).get(); ++ strcpy(&tutf8[it8],textstr.string()); ++ it8 += strlen(&tutf8[it8])+1; ++ /* ++ STRING textstr(""); ++ textstr += std::unique_ptr<const char[]>(res_it->GetUTF8Text(RIL_WORD)).get(); ++ */ ++/* ++printf("Word %d: '%s'\n",iword,textstr.string()); ++*/ ++ int left, top, right, bottom; ++ int u1,v1,u2,v2; ++ res_it->BoundingBox(RIL_WORD, &left, &top, &right, &bottom); ++ res_it->Baseline(RIL_WORD, &u1, &v1, &u2, &v2); ++ x0[iword]=left; ++ x1[iword]=right; ++ y0[iword]=top; ++ y1[iword]=bottom; ++ ybaseline[iword]=(v1+v2)/2; ++ iword++; ++/* ++printf("BB: (%d,%d)-(%d,%d) BL: (%d,%d)-(%d,%d)\n",left,bottom,right,top,x1,y1,x2,y2); ++*/ ++ res_it->Next(RIL_WORD); ++ } ++/* ++printf("iword=%d\n",iword); ++*/ ++ return(iword); ++ } ++ ++/* willus mod */ ++int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words); ++ + /** + * Make a TSV-formatted string from the internal data structures. + * page_number is 0-based but will appear in the output as 1-based. +diff --git a/src/api/baseapi.h b/src/api/baseapi.h +index 3724dd92..23be5920 100644 +--- a/src/api/baseapi.h ++++ b/src/api/baseapi.h +@@ -575,6 +575,9 @@ class TESS_API TessBaseAPI { + */ + char* GetHOCRText(ETEXT_DESC* monitor, int page_number); + ++/* willus mod */ ++int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words); ++ + /** + * Make a HTML-formatted string with hOCR markup from the internal + * data structures. +diff --git a/src/api/tesscapi.cpp b/src/api/tesscapi.cpp +new file mode 100644 +index 00000000..1752fafe +--- /dev/null ++++ b/src/api/tesscapi.cpp +@@ -0,0 +1,311 @@ ++/* ++** tesscapi.cpp willus.com attempt at C wrapper for tesseract. ++** (Butchered from tesseractmain.cpp) ++** Last udpated 9-1-12 ++** ++** Copyright (C) 2012 http://willus.com ++** ++** This program is free software: you can redistribute it and/or modify ++** it under the terms of the GNU Affero General Public License as ++** published by the Free Software Foundation, either version 3 of the ++** License, or (at your option) any later version. ++** ++** This program is distributed in the hope that it will be useful, ++** but WITHOUT ANY WARRANTY; without even the implied warranty of ++** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++** GNU Affero General Public License for more details. ++** ++** You should have received a copy of the GNU Affero General Public License ++** along with this program. If not, see <http://www.gnu.org/licenses/>. ++** ++*/ ++ ++/* ++#include "mfcpch.h" ++*/ ++// #define USE_VLD //Uncomment for Visual Leak Detector. ++#if (defined _MSC_VER && defined USE_VLD) ++#include <vld.h> ++#endif ++ ++// Include automatically generated configuration file if running autoconf ++#ifdef HAVE_CONFIG_H ++#include "config_auto.h" ++#endif ++#include <locale.h> ++#ifdef USING_GETTEXT ++#include <libintl.h> ++#define _(x) gettext(x) ++#else ++#define _(x) (x) ++#endif ++ ++#include "allheaders.h" ++#include "baseapi.h" ++#include "strngs.h" ++#include "params.h" ++#include "blobs.h" ++#include "simddetect.h" ++#include "tesseractclass.h" ++/* ++#include "notdll.h" ++*/ ++ ++/* C Wrappers */ ++#include "tesseract.h" ++ ++// static tesseract::TessBaseAPI api[4]; ++ ++/* ++** ocr_type=0: OEM_DEFAULT ++** ocr_type=1: OEM_TESSERACT_ONLY ++** ocr_type=2: OEM_LSTM_ONLY ++** ocr_type=3: OEM_TESSERACT_LSTM_COMBINED ++*/ ++void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out, ++ char *initstr,int maxlen,int *status) ++ ++ { ++ char original_locale[256]; ++ tesseract::TessBaseAPI *api = new tesseract::TessBaseAPI; ++/* ++printf("@tess_capi_init\n"); ++printf(" datapath='%s'\n",datapath); ++printf(" language='%s'\n",language); ++printf(" ocr_type=%d\n",ocr_type); ++*/ ++#ifdef USE_NLS ++ setlocale (LC_ALL, ""); ++ bindtextdomain (PACKAGE, LOCALEDIR); ++ textdomain (PACKAGE); ++#endif ++ /* willus mod, 11-24-16 */ ++ /* Tesseract needs "C" locale to correctly parse all data .traineddata files. */ ++/* ++printf("locale='%s'\n",setlocale(LC_ALL,NULL)); ++printf("ctype='%s'\n",setlocale(LC_CTYPE,NULL)); ++printf("numeric='%s'\n",setlocale(LC_NUMERIC,NULL)); ++*/ ++ strncpy(original_locale,setlocale(LC_ALL,NULL),255); ++ original_locale[255]='\0'; ++/* ++printf("original_locale='%s'\n",original_locale); ++*/ ++ setlocale(LC_ALL,"C"); ++/* ++printf("new locale='%s'\n",setlocale(LC_ALL,NULL)); ++printf("new ctype='%s'\n",setlocale(LC_CTYPE,NULL)); ++printf("new numeric='%s'\n",setlocale(LC_NUMERIC,NULL)); ++*/ ++ // fprintf(stderr, "tesseract %s\n", tesseract::TessBaseAPI::Version()); ++ // Make the order of args a bit more forgiving than it used to be. ++ const char* lang = "eng"; ++ tesseract::PageSegMode pagesegmode = tesseract::PSM_SINGLE_BLOCK; ++ if (language!=NULL && language[0]!='\0') ++ lang = language; ++ /* ++ if (output == NULL) ++ { ++ fprintf(stderr, _("Usage:%s imagename outputbase [-l lang] " ++ "[-psm pagesegmode] [configfile...]\n"), argv[0]); ++ fprintf(stderr, ++ _("pagesegmode values are:\n" ++ "0 = Orientation and script detection (OSD) only.\n" ++ "1 = Automatic page segmentation with OSD.\n" ++ "2 = Automatic page segmentation, but no OSD, or OCR\n" ++ "3 = Fully automatic page segmentation, but no OSD. (Default)\n" ++ "4 = Assume a single column of text of variable sizes.\n" ++ "5 = Assume a single uniform block of vertically aligned text.\n" ++ "6 = Assume a single uniform block of text.\n" ++ "7 = Treat the image as a single text line.\n" ++ "8 = Treat the image as a single word.\n" ++ "9 = Treat the image as a single word in a circle.\n" ++ "10 = Treat the image as a single character.\n")); ++ fprintf(stderr, _("-l lang and/or -psm pagesegmode must occur before any" ++ "configfile.\n")); ++ exit(1); ++ } ++ */ ++/* ++printf("SSE = %s\n",SIMDDetect::IsSSEAvailable() ? "AVAILABLE" : "NOT AVAILABLE"); ++printf("AVX = %s\n",SIMDDetect::IsAVXAvailable() ? "AVAILABLE" : "NOT AVAILABLE"); ++*/ ++/* ++v4.00 loads either TESSERACT enginer, LSTM engine, or both. No CUBE. ++*/ ++ ocr_type=0; /* Ignore specified and use default */ ++ api->SetOutputName(NULL); ++ (*status)=api->Init(datapath,lang, ++ ocr_type==0 ? tesseract::OEM_DEFAULT : ++ (ocr_type==1 ? tesseract::OEM_TESSERACT_ONLY : ++ (ocr_type==2 ? tesseract::OEM_LSTM_ONLY : ++ (tesseract::OEM_TESSERACT_LSTM_COMBINED)))); ++ if ((*status)!=0) ++ { ++ /* willus mod, 11-24-16 */ ++ setlocale(LC_ALL,original_locale); ++ api->End(); ++ delete api; ++ return(NULL); ++ } ++ /* ++ api.Init("tesscapi",lang,tesseract::OEM_DEFAULT, ++ &(argv[arg]), argc - arg, NULL, NULL, false); ++ */ ++ // We have 2 possible sources of pagesegmode: a config file and ++ // the command line. For backwards compatability reasons, the ++ // default in tesseract is tesseract::PSM_SINGLE_BLOCK, but the ++ // default for this program is tesseract::PSM_AUTO. We will let ++ // the config file take priority, so the command-line default ++ // can take priority over the tesseract default, so we use the ++ // value from the command line only if the retrieved mode ++ // is still tesseract::PSM_SINGLE_BLOCK, indicating no change ++ // in any config file. Therefore the only way to force ++ // tesseract::PSM_SINGLE_BLOCK is from the command line. ++ // It would be simpler if we could set the value before Init, ++ // but that doesn't work. ++ if (api->GetPageSegMode() == tesseract::PSM_SINGLE_BLOCK) ++ api->SetPageSegMode(pagesegmode); ++ ++ /* ++ ** Initialization message ++ */ ++ { ++ char istr[1024]; ++ int sse,avx; ++ ++// printf("tessedit_ocr_engine_mode = %d\n",tessedit_ocr_engine_mode); ++ sprintf(istr,"%s",api->Version()); ++ sse=tesseract::SIMDDetect::IsSSEAvailable(); ++ avx=tesseract::SIMDDetect::IsAVXAvailable(); ++ if (sse || avx) ++ sprintf(&istr[strlen(istr)]," [%s]",sse&&avx?"SSE+AVX":(sse?"SSE":"AVX")); ++ sprintf(&istr[strlen(istr)],"\n Tesseract data folder = '%s'",datapath==NULL?getenv("TESSDATA_PREFIX"):datapath); ++ strcat(istr,"\n Tesseract languages: "); ++ GenericVector<STRING> languages; ++ api->GetLoadedLanguagesAsVector(&languages); ++/* ++printf("OEM=%d\n",api->oem()); ++printf("Langs='%s'\n",api->GetInitLanguagesAsString()); ++printf("AnyTessLang()=%d\n",(int)api->tesseract()->AnyTessLang()); ++printf("AnyLSTMLang()=%d\n",(int)api->tesseract()->AnyLSTMLang()); ++printf("num_sub_langs()=%d\n",api->tesseract()->num_sub_langs()); ++printf("languages.size()=%d\n",(int)languages.size()); ++*/ ++ ++ for (int i=0;i<=api->tesseract()->num_sub_langs();i++) ++ { ++ tesseract::Tesseract *lang1; ++ int eng; ++ lang1 = i==0 ? api->tesseract() : api->tesseract()->get_sub_lang(i-1); ++ eng=(int)lang1->tessedit_ocr_engine_mode; ++ sprintf(&istr[strlen(istr)],"%s%s [%s]",i==0?"":", ",lang1->lang.string(), ++ eng==2?"LSTM+Tess":(eng==1?"LSTM":"Tess")); ++ } ++/* ++printf("%d. '%s'\n",i+1,languages[i].string()); ++printf(" sublang[%d].oem_engine = %d\n",i+1,(int)api->tesseract()->get_sub_lang(i)->tessedit_ocr_engine_mode); ++*/ ++ ++ /* ++ if (ocr_type==0 || ocr_type==3) ++ sprintf(&istr[strlen(istr)],"[LSTM+] (lang="); ++ else if (ocr_type==2) ++ sprintf(&istr[strlen(istr)],"[LSTM] (lang="); ++ strncpy(&istr[strlen(istr)],language,253-strlen(istr)); ++ istr[253]='\0'; ++ strcat(istr,")"); ++ */ ++ if (out!=NULL) ++ fprintf(out,"%s\n",istr); ++ if (initstr!=NULL) ++ { ++ strncpy(initstr,istr,maxlen-1); ++ initstr[maxlen-1]='\0'; ++ } ++ } ++ ++ ++ /* Turn off LSTM debugging output */ ++ api->SetVariable("lstm_debug_level","0"); ++#if (WILLUSDEBUG & 1) ++ api->SetVariable("lstm_debug_level","9"); ++ api->SetVariable("paragraph_debug_level","9"); ++ api->SetVariable("tessdata_manager_debug_level","9"); ++ api->SetVariable("tosp_debug_level","9"); ++ api->SetVariable("wordrec_debug_level","9"); ++ api->SetVariable("segsearch_debug_level","9"); ++#endif ++ /* willus mod, 11-24-16 */ ++ setlocale(LC_ALL,original_locale); ++ return((void *)api); ++ } ++ ++ ++int tess_capi_get_ocr(void *vapi,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out) ++ ++ { ++ tesseract::TessBaseAPI *api; ++ static int old_segmode=-1; ++ ++ api=(tesseract::TessBaseAPI *)vapi; ++ if (old_segmode != segmode) ++ { ++ old_segmode=segmode; ++ api->SetPageSegMode((tesseract::PageSegMode)segmode); ++ } ++ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL)) ++ { ++ /* pixDestroy(&pix); */ ++ if (out!=NULL) ++ fprintf(out,"tesscapi: Error during bitmap processing.\n"); ++ api->Clear(); ++ return(-1); ++ } ++ strncpy(outstr,api->GetUTF8Text(),maxlen-1); ++ outstr[maxlen-1]='\0'; ++ api->Clear(); ++ return(0); ++ } ++ ++ ++int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode, ++ int **left,int **top,int **right,int **bottom, ++ int **ybase,char **text,int *nw, ++ FILE *out) ++ ++ { ++ tesseract::TessBaseAPI *api; ++ static int old_segmode=-1; ++ ++ api=(tesseract::TessBaseAPI *)vapi; ++ if (old_segmode != segmode) ++ { ++ old_segmode=segmode; ++ api->SetPageSegMode((tesseract::PageSegMode)segmode); ++ } ++ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL)) ++ { ++ if (out!=NULL) ++ fprintf(out,"tesscapi: Error during bitmap processing.\n"); ++ api->Clear(); ++ (*nw)=0; ++ return(-1); ++ } ++ (*nw)=api->GetOCRWords(left,top,right,bottom,ybase,text); ++ api->Clear(); ++ return(0); ++ } ++ ++ ++void tess_capi_end(void *vapi) ++ ++ { ++ tesseract::TessBaseAPI *api; ++ ++ if (vapi==NULL) ++ return; ++ api=(tesseract::TessBaseAPI *)vapi; ++ api->End(); ++ delete api; ++ } +diff --git a/src/api/tesseract.h b/src/api/tesseract.h +new file mode 100644 +index 00000000..575948cc +--- /dev/null ++++ b/src/api/tesseract.h +@@ -0,0 +1,29 @@ ++/* ++** Willus.com's Tesseract C Wrappers ++** ++** 6-8-12 ++** ++*/ ++ ++#ifndef _TESSERACT_H_ ++#define _TESSERACT_H_ ++ ++//#include <leptonica.h> ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out, ++ char *initstr,int maxlen,int *status); ++int tess_capi_get_ocr(void *api,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out); ++int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode, ++ int **left,int **top,int **right,int **bottom, ++ int **ybase,char **text,int *nw, ++ FILE *out); ++void tess_capi_end(void *api); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif +diff --git a/src/ccmain/tessedit.cpp b/src/ccmain/tessedit.cpp +index 17f0951b..7af94ee2 100644 +--- a/src/ccmain/tessedit.cpp ++++ b/src/ccmain/tessedit.cpp +@@ -101,6 +101,10 @@ bool Tesseract::init_tesseract_lang_data( + " to your \"tessdata\" directory.\n"); + return false; + } ++ /* willus mod */ ++ TFile fp; ++ strncpy(fp.tfile_filename,tessdata_path.string(),511); ++ fp.tfile_filename[511]='\0'; + #ifndef DISABLED_LEGACY_ENGINE + if (oem == OEM_DEFAULT) { + // Set the engine mode from availability, which can then be overridden by +@@ -116,7 +120,6 @@ bool Tesseract::init_tesseract_lang_data( + #endif // ndef DISABLED_LEGACY_ENGINE + + // If a language specific config file (lang.config) exists, load it in. +- TFile fp; + if (mgr->GetComponent(TESSDATA_LANG_CONFIG, &fp)) { + ParamUtils::ReadParamsFromFp(SET_PARAM_CONSTRAINT_NONE, &fp, + this->params()); +diff --git a/src/ccutil/ccutil.h b/src/ccutil/ccutil.h +index 71e89c60..bdeccc14 100644 +--- a/src/ccutil/ccutil.h ++++ b/src/ccutil/ccutil.h +@@ -80,6 +80,13 @@ class CCUtil { + // Member parameters. + // These have to be declared and initialized after params_ member, since + // params_ should be initialized before parameters are added to it. ++/* willus mod */ ++/* ++ #ifdef _WIN32 ++ STRING_VAR_H(tessedit_module_name, WINDLLNAME, ++ "Module colocated with tessdata dir"); ++ #endif ++*/ + INT_VAR_H(ambigs_debug_level, 0, "Debug level for unichar ambiguities"); + BOOL_VAR_H(use_definite_ambigs_for_classifier, false, + "Use definite ambiguities when running character classifier"); +diff --git a/src/ccutil/genericvector.h b/src/ccutil/genericvector.h +index 3556d153..3a5e8662 100644 +--- a/src/ccutil/genericvector.h ++++ b/src/ccutil/genericvector.h +@@ -382,7 +382,26 @@ inline bool LoadDataFromFile(const char* filename, GenericVector<char>* data) { + // reserve an extra byte in case caller wants to append a '\0' character + data->reserve(size + 1); + data->resize_no_init(size); +- result = static_cast<long>(fread(&(*data)[0], 1, size, fp)) == size; ++ /* willus mod Dec 2018--weird issue with Win XP and MinGW gcc 7.3.0 */ ++ /* Can't read entire file at once -- need to break up into smaller blocksize reads */ ++ { ++ int frs,n; ++ int blocksize; ++ blocksize=1024*1024; ++ for (n=0;1;) ++ { ++ int bs; ++ bs= size-n > blocksize ? blocksize : size-n; ++ frs=(int)fread(&(*data)[n],1,bs,fp); ++ n+=frs; ++ if (frs<bs || bs<blocksize || n>=size) ++ break; ++ } ++ result = static_cast<long>((long)n==size); ++ } ++ /* ++ result = static_cast<long>(fread(&(*data)[0], 1, size, fp)) == size; ++ */ + } + fclose(fp); + } +diff --git a/src/ccutil/mainblk.cpp b/src/ccutil/mainblk.cpp +index 52b04b04..80b26044 100644 +--- a/src/ccutil/mainblk.cpp ++++ b/src/ccutil/mainblk.cpp +@@ -55,8 +55,22 @@ void CCUtil::main_setup(const char *argv0, const char *basename) { + #if defined(_WIN32) + } else if (datadir == nullptr || _access(datadir.string(), 0) != 0) { + /* Look for tessdata in directory of executable. */ ++ /* ++ char drive[_MAX_DRIVE]; ++ char dir[_MAX_DIR]; ++ */ + char path[_MAX_PATH]; +- DWORD length = GetModuleFileName(nullptr, path, sizeof(path)); ++ int i; ++ /* DWORD length = */ GetModuleFileName(nullptr, path, sizeof(path)); ++ /* willus mod--avoid _splitpath_s -- not in XP */ ++ for (i=strlen(path)-1;i>=0 && path[i]!='/' && path[i]!='\\';i--); ++ if (i>=0) ++ { ++ path[i]='\0'; ++ datadir=path; ++ datadir += "/tessdata"; ++ } ++ /* + if (length > 0 && length < sizeof(path)) { + char* separator = std::strrchr(path, '\\'); + if (separator != nullptr) { +@@ -65,6 +79,7 @@ void CCUtil::main_setup(const char *argv0, const char *basename) { + datadir += "/tessdata"; + } + } ++ */ + #endif /* _WIN32 */ + #if defined(TESSDATA_PREFIX) + } else { +diff --git a/src/ccutil/params.cpp b/src/ccutil/params.cpp +index 00bf2563..486c5ce0 100644 +--- a/src/ccutil/params.cpp ++++ b/src/ccutil/params.cpp +@@ -82,7 +82,8 @@ bool ParamUtils::ReadParamsFromFp(SetParamConstraint constraint, TFile *fp, + + if (!foundit) { + anyerr = true; // had an error +- tprintf("Warning: Parameter not found: %s\n", line); ++ /* willus mod */ ++ tprintf("Tesseract warning: Parameter %s not found in file %s.\n",line,fp->tfile_filename); + } + } + } +diff --git a/src/ccutil/serialis.cpp b/src/ccutil/serialis.cpp +index 7def011f..6107a494 100644 +--- a/src/ccutil/serialis.cpp ++++ b/src/ccutil/serialis.cpp +@@ -201,6 +201,9 @@ bool TFile::Open(const STRING& filename, FileReader reader) { + offset_ = 0; + is_writing_ = false; + swap_ = false; ++ /* willus mod */ ++ strncpy(tfile_filename,filename.string(),511); ++ tfile_filename[511]='\0'; + if (reader == nullptr) + return LoadDataFromFile(filename, data_); + else +diff --git a/src/ccutil/serialis.h b/src/ccutil/serialis.h +index 095b9227..4cc8251e 100644 +--- a/src/ccutil/serialis.h ++++ b/src/ccutil/serialis.h +@@ -77,6 +77,8 @@ class TFile { + public: + TFile(); + ~TFile(); ++ /* willus mod */ ++ char tfile_filename[512]; + + // All the Open methods load the whole file into memory for reading. + // Opens a file with a supplied reader, or nullptr to use the default. +diff --git a/src/lstm/input.cpp b/src/lstm/input.cpp +index 73b584b3..0b0b54c3 100644 +--- a/src/lstm/input.cpp ++++ b/src/lstm/input.cpp +@@ -93,8 +93,11 @@ Pix* Input::PrepareLSTMInputs(const ImageData& image_data, + return nullptr; + } + if (width < min_width || height < min_width) { ++ /* willus mod -- no warning */ ++ /* + tprintf("Image too small to scale!! (%dx%d vs min width of %d)\n", width, + height, min_width); ++ */ + pixDestroy(&pix); + return nullptr; + } +-- +2.22.0 + diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index c66ef21416b..2c2acb6a743 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -5,12 +5,12 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { pname = "llpp"; - version = "30"; + version = "31"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; rev = "v${version}"; - sha256 = "0iilpzf12hs0zky58j55l4y5dvzv7fc53nsrg324n9vka92mppvd"; + sha256 = "14ibsm1zzxfidjajcj30b5m9in10q3817izahsjvkmryrvvn6qsg"; fetchSubmodules = false; }; diff --git a/pkgs/applications/misc/llpp/fix-build-bash.patch b/pkgs/applications/misc/llpp/fix-build-bash.patch index 25d503290ce..13dbdb926c8 100644 --- a/pkgs/applications/misc/llpp/fix-build-bash.patch +++ b/pkgs/applications/misc/llpp/fix-build-bash.patch @@ -1,14 +1,5 @@ -From cccadedfbcb6764a38382154838113a6b2fd4dee Mon Sep 17 00:00:00 2001 -From: Michael Hoang <enzime@users.noreply.github.com> -Date: Mon, 10 Dec 2018 15:08:01 +1100 -Subject: [PATCH] Patch build.bash for nixpkgs - ---- - build.bash | 37 ++----------------------------------- - 1 file changed, 2 insertions(+), 35 deletions(-) - diff --git a/build.bash b/build.bash -index 1588011..72117d9 100755 +index 7c278b6..41494c5 100755 --- a/build.bash +++ b/build.bash @@ -29,7 +29,6 @@ srcd="$(dirname $0)" @@ -20,10 +11,10 @@ index 1588011..72117d9 100755 mkdir -p $outd/{$wsid,lablGL} :>$outd/ordered @@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; } - mbt=native + mbt=${mbt:-native} mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a --keycmd="(cd $mudir && git describe --tags --dirty); digest $mulibs" +-keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs" -isfresh "$mulibs" "$(eval $keycmd)" || ( - make -C "$mudir" build=$mbt -j $mjobs libs - echo "k='$(eval $keycmd)'" >$mudir/build/$mbt/libmupdf.a.past @@ -32,12 +23,12 @@ index 1588011..72117d9 100755 oincs() { local i= local incs1= -@@ -90,32 +83,6 @@ mflags() { +@@ -90,34 +83,6 @@ mflags() { } overs="$(ocamlc -vnum 2>/dev/null)" || overs="" --test "$overs" = "4.07.0" || { -- url=https://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.0.tar.xz +-test "$overs" = "4.08" || { +- url=https://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08.0.tar.xz - txz=$outd/$(basename $url) - isfresh $txz $url || { - executable_p() { command -v "$1" >/dev/null 2>&1; } @@ -54,8 +45,10 @@ index 1588011..72117d9 100755 - tar xf $txz -C $outd - bn=$(basename $url) - cd $outd/${bn%.tar.xz} -- ./configure -prefix $absprefix \ -- -no-graph -no-debugger -no-ocamldoc -no-native-compiler +- ./configure --disable-vmthreads --disable-graph-lib \ +- --disable-ocamldoc --enable-debugger=no \ +- --disable-flat-float-array \ +- --prefix=$absprefix - make -j $mjobs world - make install - echo "k='$url'" >$absprefix/bin/ocamlc.past @@ -65,7 +58,7 @@ index 1588011..72117d9 100755 bocaml1() { grep -q "$3" $outd/ordered || { -@@ -224,7 +191,7 @@ bobjc() { +@@ -227,7 +192,7 @@ bobjc() { } && vecho "fresh $o" } @@ -74,7 +67,7 @@ index 1588011..72117d9 100755 cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" -@@ -278,7 +245,7 @@ for m in ml_gl ml_glarray ml_raw; do +@@ -281,7 +246,7 @@ for m in ml_gl ml_glarray ml_raw; do done libs="str.cma unix.cma" @@ -83,6 +76,3 @@ index 1588011..72117d9 100755 if $darwin; then mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; }) clibs="$clibs -framework Cocoa -framework OpenGL" --- -2.19.2 - diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix new file mode 100644 index 00000000000..4b92a43451a --- /dev/null +++ b/pkgs/applications/misc/minder/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub +, pkgconfig, meson, ninja, python3 +, wrapGAppsHook, vala, shared-mime-info +, cairo, pantheon, glib, gtk3, libxml2, libgee, libarchive +, hicolor-icon-theme # for setup-hook +}: + +stdenv.mkDerivation rec { + pname = "minder"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "phase1geo"; + repo = pname; + rev = version; + sha256 = "0lhmv3z2jifv4cksxa27jigdfj9n81myjsxg38xp28fx5x3h8bzc"; + }; + + nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; + buildInputs = [ cairo pantheon.granite glib gtk3 libxml2 libgee libarchive hicolor-icon-theme ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + postFixup = '' + for x in $out/bin/*; do + ln -vrs $x "$out/bin/''${x##*.}" + done + ''; + + meta = with stdenv.lib; { + description = "Mind-mapping application for Elementary OS"; + homepage = "https://github.com/phase1geo/Minder"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ dtzWill ]; + }; +} + diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 9219c4e2e42..ddd325214b2 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -14,24 +14,17 @@ let in stdenv.mkDerivation rec { - version = "1.14.0"; + version = "1.16.1"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "093p7lv6pgyymagn28n58fs0np928r0i5p2az9cc4gwccwx4hhy4"; + sha256 = "0iz4ickj52fxjp8crg573kjrl4viq279g589isdpgpckslysf7g7"; }; patches = # Use shared libraries to decrease size - [( fetchpatch - { - name = "CVE-2018-18662"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=164ddc22ee0d5b63a81d5148f44c37dd132a9356"; - sha256 = "1jkzh20n3b854871h86cy5y7fvy0d5wyqy51b3fg6gj3a0jqpzzd"; - } - )] - ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch + stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch ; diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix index deecc92d993..6a6c95b6572 100644 --- a/pkgs/applications/misc/mystem/default.nix +++ b/pkgs/applications/misc/mystem/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.cdn.yandex.net/mystem/${pname}-${version}-linux-64bit.tar.gz"; - sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10"; + sha256 = "0qha7jvkdmil3jiwrpsfhkqsbkqn9dzgx3ayxwjdmv73ikmg95j6"; }; buildCommand = '' diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/misc/noice/default.nix index db8139122ba..6cc5dc9066d 100644 --- a/pkgs/applications/misc/noice/default.nix +++ b/pkgs/applications/misc/noice/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "noice"; - version = "0.6"; + version = "0.8"; src = fetchgit { url = "git://git.2f30.org/noice.git"; rev = "refs/tags/v${version}"; - sha256 = "03rwglcy47fh6rb630vws10m95bxpcfv47nxrlws2li2ljam8prw"; + sha256 = "0975j4m93s9a21pazwdzn4gqhkngwq7q6ghp0q8a75r6c4fb7aar"; }; configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 816918ca063..ec5ee031a5b 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi -, libtool, makeWrapper }: +, libtool, makeWrapper, nss }: stdenv.mkDerivation rec { name = "nut-2.7.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq"; }; - buildInputs = [ neon libusb openssl udev avahi freeipmi libtool ]; + buildInputs = [ neon libusb openssl udev avahi freeipmi libtool nss ]; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix new file mode 100644 index 00000000000..30e68a89a1c --- /dev/null +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -0,0 +1,49 @@ +{ stdenv, makeDesktopItem, fetchurl, jdk11, wrapGAppsHook, glib }: + +stdenv.mkDerivation rec { + pname = "pdfsam-basic"; + version = "4.0.4"; + + src = fetchurl { + url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; + sha256 = "17lhzxlgr4l4dljy0b0avfrgbj9rsfzk1dzg0abqvld4w4igkqbq"; + }; + + unpackPhase = '' + ar vx ${src} + tar xvf data.tar.gz + ''; + + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ glib ]; + + preFixup = '' + gappsWrapperArgs+=(--set JAVA_HOME "${jdk11}" --set PDFSAM_JAVA_PATH "${jdk11}") + ''; + + installPhase = '' + cp -R opt/pdfsam-basic/ $out/ + mkdir -p "$out"/share/icons + cp --recursive ${desktopItem}/share/applications $out/share + cp $out/icon.svg "$out"/share/icons/pdfsam-basic.svg + ''; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = meta.description; + desktopName = "PDFsam Basic"; + genericName = "PDF Split and Merge"; + mimeType = "application/pdf;"; + categories = "Office;Application;"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/torakiki/pdfsam"; + description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ maintainers."1000101" ]; + }; +}
\ No newline at end of file diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index f2e1aa6bdb6..722b0bc5077 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -1,17 +1,14 @@ { fetchFromGitHub, lib, gobject-introspection, gtk3, python3Packages }: - # Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of # adding this to services.udev.packages on NixOS - -python3Packages.buildPythonApplication { - pname = "solaar-unstable"; - version = "2019-01-30"; - +python3Packages.buildPythonApplication rec { + pname = "solaar"; + version = "1.0.1"; src = fetchFromGitHub { - owner = "pwr"; + owner = "pwr-Solaar"; repo = "Solaar"; - rev = "c07c115ee379e82db84283aaa29dc53df033a8c8"; - sha256 = "0xg181xcwzzs8pdqvjrkjyaaga7ir93hzjvd17j9g3ns8xfj2mvr"; + rev = "${version}"; + sha256 = "1ni3aimpl9vyhwzi61mvm8arkii52cmb6bzjma9cnkjyx328pkid"; }; propagatedBuildInputs = with python3Packages; [ gobject-introspection gtk3 pygobject3 pyudev ]; @@ -28,7 +25,6 @@ python3Packages.buildPythonApplication { ''; enableParallelBuilding = true; - meta = with lib; { description = "Linux devices manager for the Logitech Unifying Receiver"; longDescription = '' @@ -43,7 +39,7 @@ python3Packages.buildPythonApplication { To be able to use it, make sure you have access to /dev/hidraw* files. ''; license = licenses.gpl2; - homepage = https://pwr.github.io/Solaar/; + homepage = https://pwr-solaar.github.io/Solaar/; platforms = platforms.linux; maintainers = with maintainers; [ spinus ysndr ]; }; diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index d9dcee762cf..eaedad16748 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "todoist"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "sachaos"; repo = "todoist"; rev = "v${version}"; - sha256 = "1kwvlsjr2a7wdhlwpxxpdh87wz8k9yjwl59vl2g7ya6m0rvhd3mc"; + sha256 = "0qhmv65il14lns817yxhma784jw5bz629svzh2ykrmilx5f7dxqc"; }; - modSha256 = "09n6abyaqwz4zcdz8934rvpbxhp4v2nmm5v739kkcc98c3h93i64"; + modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp"; meta = { homepage = https://github.com/sachaos/todoist; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 60ff84ffe59..fa865dcc16c 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "wtf"; - version = "0.21.0"; + version = "0.22.0"; overrideModAttrs = _oldAttrs : _oldAttrs // { preBuild = ''export GOPROXY="https://gocenter.io"''; @@ -17,17 +17,18 @@ buildGoModule rec { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0sd8vrx7nak0by4whdmd9jzr66zm48knv1w1aqi90709fv98brm9"; - }; + sha256 = "1d8lp94cw8rh9r9y64awxafhw9fmp33v3m761gzy500hrxal2rzb"; + }; - modSha256 = "0jgq9ql27x0kdp59l5drisl5v7v7sx2wy3zqjbr3bqyh3vdx19ic"; + modSha256 = "0m180571j4564py5mzdcbyypk71fdlp2vkfdwi6q85nd2q94sx6h"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$out/bin/wtf" --prefix PATH : "${ncurses.dev}/bin" + mv "$out/bin/wtf" "$out/bin/wtfutil" + wrapProgram "$out/bin/wtfutil" --prefix PATH : "${ncurses.dev}/bin" ''; meta = with lib; { diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index c673002fb51..0332de0195c 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { cp -r $out/libexec/configuration/ \$HOME/.xmind/configuration-cathy/ fi - exec "$out/libexec/XMind" "$@" + exec "$out/libexec/XMind" "\$@" EOF chmod +x $out/bin/XMind diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 2ebc640d683..d8c1364d395 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -2,7 +2,7 @@ , pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }: stdenv.mkDerivation rec { - version = "0.3.4"; + version = "0.3.5"; pname = "zathura-pdf-mupdf"; # pwmt.org server was down at the time of last update @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "pwmt"; repo = "zathura-pdf-mupdf"; rev = version; - sha256 = "1m4w4jrybpjmx6pi33a5saxzmfd8rrym2k13jpd1fv543s17d9dy"; + sha256 = "0wb46hllykbi30ir69s8s23mihivqn13mgfdzawbsn2a21p8y4zl"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 8bdb33ed5d2..ad7fa78527c 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -1,4 +1,4 @@ -{ stdenv, mkChromiumDerivation, channel }: +{ stdenv, mkChromiumDerivation, channel, enableWideVine }: with stdenv.lib; @@ -18,11 +18,6 @@ mkChromiumDerivation (base: rec { cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" - if [ -e "$buildPath/libwidevinecdmadapter.so" ]; then - cp -v "$buildPath/libwidevinecdmadapter.so" \ - "$libExecPath/libwidevinecdmadapter.so" - fi - mkdir -p "$sandbox/bin" cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}" @@ -67,7 +62,7 @@ mkChromiumDerivation (base: rec { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; maintainers = with maintainers; [ bendlas ivan ]; - license = licenses.bsd3; + license = if enableWideVine then licenses.unfree else licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; timeout = 172800; # 48 hours diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a3645e97e25..4353d2958f5 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -24,7 +24,6 @@ # package customization , enableNaCl ? false -, enableWideVine ? false , useVaapi ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null @@ -133,11 +132,19 @@ let ++ optional pulseSupport libpulseaudio ++ optional (versionAtLeast version "72") jdk.jre; - patches = optional enableWideVine ./patches/widevine.patch ++ [ + patches = [ ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch ./patches/jumbo-sorted.patch ./patches/no-build-timestamps.patch + ./patches/widevine.patch + # Revert "Implement GetFallbackFont on Linux" to fix a performance regression + # Remove after https://bugs.chromium.org/p/chromium/issues/detail?id=1003997 is fixed + (fetchpatch { + url = "https://github.com/chromium/chromium/commit/5a32abe4247f80fdb55c55a289b906b0e42faa5f.patch"; + sha256 = "1a4jqmki6cyi2dwvaszh01db2diqnz1d50mhpdpby3dd1cw0xmfy"; + revert = true; + }) # Unfortunately, chromium regularly breaks on major updates and # then needs various patches backported in order to be compiled with GCC. @@ -227,15 +234,16 @@ let use_gold = true; gold_path = "${stdenv.cc}/bin"; is_debug = false; - # at least 2X compilation speedup - use_jumbo_build = true; + # Use jumbo for a 2x (at least) compilation speedup, except where it is currently broken: + # https://gist.github.com/ivan/6fe7014c1b1cc35dec133fa6de0549d9 + use_jumbo_build = (version != "78.0.3904.17"); proprietary_codecs = false; use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; use_gio = gnomeSupport; enable_nacl = enableNaCl; - enable_widevine = enableWideVine; + enable_widevine = true; use_cups = cupsSupport; treat_warnings_as_errors = false; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 3178e2595fc..5fb0d67a480 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -2,6 +2,8 @@ , makeWrapper, ed , glib, gtk3, gnome3, gsettings-desktop-schemas , libva ? null +, gcc, nspr, nss, patchelfUnstable, runCommand +, lib # package customization , channel ? "stable" @@ -34,14 +36,64 @@ in let mkChromiumDerivation = callPackage ./common.nix { inherit enableNaCl gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport - useVaapi - enableWideVine; + useVaapi; }; - browser = callPackage ./browser.nix { inherit channel; }; + browser = callPackage ./browser.nix { inherit channel enableWideVine; }; plugins = callPackage ./plugins.nix { - inherit enablePepperFlash enableWideVine; + inherit enablePepperFlash; + }; + }; + + mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; + widevine = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation { + name = "chromium-binary-plugin-widevine"; + + # The .deb file for Google Chrome + src = upstream-info.binary; + + nativeBuildInputs = [ patchelfUnstable ]; + + phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; + + unpackCmd = let + soPath = + if upstream-info.channel == "stable" then + "./opt/google/chrome/libwidevinecdm.so" + else if upstream-info.channel == "beta" then + "./opt/google/chrome-beta/libwidevinecdm.so" + else if upstream-info.channel == "dev" then + "./opt/google/chrome-unstable/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so" + else + throw "Unknown chromium channel."; + in '' + mkdir -p plugins + # Extract just libwidevinecdm.so from upstream's .deb file + ar p "$src" data.tar.xz | tar xJ -C plugins ${soPath} + mv plugins/${soPath} plugins/ + rm -rf plugins/opt + ''; + + doCheck = true; + checkPhase = '' + ! find -iname '*.so' -exec ldd {} + | grep 'not found' + ''; + + PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ]; + + patchPhase = '' + patchelf --set-rpath "$PATCH_RPATH" libwidevinecdm.so + ''; + + installPhase = '' + install -vD libwidevinecdm.so \ + "$out/lib/libwidevinecdm.so" + ''; + + meta = { + platforms = [ "x86_64-linux" ]; + license = lib.licenses.unfree; }; }; @@ -51,6 +103,23 @@ in let version = chromium.browser.version; + # We want users to be able to enableWideVine without rebuilding all of + # chromium, so we have a separate derivation here that copies chromium + # and adds the unfree libwidevinecdm.so. + chromiumWV = let browser = chromium.browser; in if enableWideVine then + runCommand (browser.name + "-wv") { version = browser.version; } + '' + mkdir -p $out + cp -a ${browser}/* $out/ + chmod u+w $out/libexec/chromium + if [[ ${channel} != "dev" ]]; then + cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/ + else + mkdir -p $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64 + cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64/ + fi + '' + else browser; in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; @@ -68,7 +137,7 @@ in stdenv.mkDerivation { outputs = ["out" "sandbox"]; buildCommand = let - browserBinary = "${chromium.browser}/libexec/chromium/chromium"; + browserBinary = "${chromiumWV}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; libPath = stdenv.lib.makeLibraryPath ([] ++ stdenv.lib.optional useVaapi libva @@ -113,13 +182,7 @@ in stdenv.mkDerivation { ''; inherit (chromium.browser) packageName; - meta = chromium.browser.meta // { - broken = if enableWideVine then - builtins.trace "WARNING: WideVine is not functional, please only use for testing" - true - else false; - }; - + meta = chromium.browser.meta; passthru = { inherit (chromium) upstream-info browser; mkDerivation = chromium.mkChromiumDerivation; diff --git a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch index 90a13928e3b..2de6024141d 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch @@ -1,16 +1,24 @@ -Minimal WideVine patch from Gentoo: +Description: enable widevine and set its version string to "undefined" +Author: Michael Gilbert <mgilbert@debian.org> +Author: Olivier Tilloy <olivier.tilloy@canonical.com> -https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r1.patch - -BTS: https://bugs.gentoo.org/show_bug.cgi?id=547630 - ---- a/third_party/widevine/cdm/stub/widevine_cdm_version.h -+++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h -@@ -10,6 +10,7 @@ - - #include "third_party/widevine/cdm/widevine_cdm_common.h" - -+#define WIDEVINE_CDM_VERSION_STRING "unknown" - #define WIDEVINE_CDM_AVAILABLE +--- a/third_party/widevine/cdm/widevine_cdm_version.h ++++ b/third_party/widevine/cdm/widevine_cdm_version.h +@@ -11,5 +11,6 @@ + // If the Widevine CDM is available define the following: + // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available + // as a string, e.g., "1.0.123.456"). ++#define WIDEVINE_CDM_VERSION_STRING "undefined" #endif // WIDEVINE_CDM_VERSION_H_ +--- a/chrome/common/chrome_content_client.cc ++++ b/chrome/common/chrome_content_client.cc +@@ -99,7 +99,7 @@ + // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is + // bundled and not a component. When the Widevine CDM is a component, it is + // registered in widevine_cdm_component_installer.cc. +-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) ++#if !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) + #define REGISTER_BUNDLED_WIDEVINE_CDM + #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck + // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index b356f809f03..a80210542c5 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -6,7 +6,6 @@ , fetchzip , patchelfUnstable , enablePepperFlash ? false -, enableWideVine ? false , upstream-info }: @@ -44,60 +43,6 @@ let echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" ''; - widevine = stdenv.mkDerivation { - name = "chromium-binary-plugin-widevine"; - - src = upstream-info.binary; - - nativeBuildInputs = [ patchelfUnstable ]; - - phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; - - unpackCmd = let - chan = if upstream-info.channel == "dev" then "chrome-unstable" - else if upstream-info.channel == "stable" then "chrome" - else "chrome-${upstream-info.channel}"; - in '' - mkdir -p plugins - ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \ - ./opt/google/${chan}/libwidevinecdm.so \ - ./opt/google/${chan}/libwidevinecdmadapter.so - ''; - - doCheck = true; - checkPhase = '' - ! find -iname '*.so' -exec ldd {} + | grep 'not found' - ''; - - PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ]; - - patchPhase = '' - chmod +x libwidevinecdm.so libwidevinecdmadapter.so - patchelf --set-rpath "$PATCH_RPATH" libwidevinecdm.so - patchelf --set-rpath "$out/lib:$PATCH_RPATH" libwidevinecdmadapter.so - ''; - - installPhase = let - wvName = "Widevine Content Decryption Module"; - wvDescription = "Playback of encrypted HTML audio/video content"; - wvMimeTypes = "application/x-ppapi-widevine-cdm"; - wvModule = "@out@/lib/libwidevinecdmadapter.so"; - wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}"; - in '' - install -vD libwidevinecdm.so \ - "$out/lib/libwidevinecdm.so" - install -vD libwidevinecdmadapter.so \ - "$out/lib/libwidevinecdmadapter.so" - - ${mkPluginInfo { - flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ]; - envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@out@/lib"; - }} - ''; - - meta.platforms = platforms.x86_64; - }; - flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; version = "32.0.0.255"; @@ -140,6 +85,5 @@ let }; in { - enabled = optional enableWideVine widevine - ++ optional enablePepperFlash flash; + enabled = optional enablePepperFlash flash; } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 14799e9f96c..b641d1163bc 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0m7xdpi1f2a33csd7bsp91g5klz0hmr83ksfwsd2fki3iipvfs4w"; - sha256bin64 = "1b4cyf4v55sy52mxxl8d70abg5ck5k45jaqdjsjw7dvh3s2x4bwp"; - version = "77.0.3865.42"; + sha256 = "1hzgzmrn0d6cqvqnqayl048zwlcx0f7azg2rhvm7p13lvyqzsk00"; + sha256bin64 = "0p3275ii8800swlfmljbdrvyqjd5nlw0vgv2my4r8ccszgbhidbd"; + version = "77.0.3865.90"; }; dev = { - sha256 = "0x5r6xqwiggwyzbinm252xc1n3f9r7cmmzj6assi4v1nsispdh2k"; - sha256bin64 = "03yymhbpd1snycmcv7wkg5j6zbydvyc365gy5myp7wgas7cd0mb6"; - version = "78.0.3887.7"; + sha256 = "0zka01ml3hbximswzkkqbqq8wpiz8f4fq4wx5fys002hi69l296l"; + sha256bin64 = "0nrip45s0ylri34vlpf16xlwv3ybmy2jg7dz8l9rvgbdwwdzdb75"; + version = "78.0.3904.17"; }; stable = { - sha256 = "0hajwjf7swlgh1flpf8ljfrb2zhmcpzvrigvvxqd36g3nm04cknm"; - sha256bin64 = "0hdsla8i3q0zbczia64ghqsf420alcc31xdishx1sv48x3rlrxkk"; - version = "76.0.3809.132"; + sha256 = "1hzgzmrn0d6cqvqnqayl048zwlcx0f7azg2rhvm7p13lvyqzsk00"; + sha256bin64 = "1npx867j39mdyivf8nlkcfwgq7j34hl7s948vf6h2kqni0y50hzl"; + version = "77.0.3865.90"; }; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e1d4014c83b..3e8cf4d66b9 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -70,11 +70,11 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - ffversion = "60.8.0esr"; + ffversion = "60.9.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0332b6049b97e488e55a3b9540baad3bd159e297084e9a625b8492497c73f86eb3e144219dabc5e9f2c2e4a27630d83d243c919cd4f86b7f59f47133ed3afc54"; + sha512 = "4baea5c9c4eff257834bbaee6d7786f69f7e6bacd24ca13c2705226f4a0d88315ab38c650b2c5e9c76b698f2debc7cea1e5a99cb4dc24e03c48a24df5143a3cf"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 739315917d4..563c0e751c8 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -95,18 +95,12 @@ let srcs = { x86_64-linux = fetchurl { - urls = [ - "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" - "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" - ]; + url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; sha256 = "00r5k9bbfpv3s6shxqypl13psr1zz51xiyz3vmm4flhr2qa4ycsz"; }; i686-linux = fetchurl { - urls = [ - "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" - "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" - ]; + url = "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; sha256 = "1nxvw5kiggfr4n5an436ass84cvwjviaa894kfm72yf2ls149f29"; }; }; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 6483b6d03e3..d93c8f85925 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.7.1628.33-1"; + version = "2.8.1664.35-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1km5ccxqyd5xgmzm42zca670jf7wd4j7c726fhyj4wjni71zar34"; + sha256 = "0wrpn2figljvq9xldpqb1wf81fpwj91ppi2lzvcg5ycpl2a90x7j"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 1faa0988a66..6decad2f9fb 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.79.3"; in +let version = "0.85.0"; in buildGoModule { pname = "helmfile"; @@ -10,12 +10,12 @@ buildGoModule { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0wgfpidpqyvh41dnw351v91z4szi1s6lqak9li2pmddz1rdkx66v"; + sha256 = "0k1019ddzhhl8kn70ibqf6srlfv92jkc26m78pic5c7ibqyq5fds"; }; goPackagePath = "github.com/roboll/helmfile"; - modSha256 = "1ksz1c4j7mhsbq6ifqab04588d48c9glyhr4d3d4jyvi19qhwx1d"; + modSha256 = "1npjm3rs32c1rwx8xb9s03jhd156da6p66hpaqccm7b6zxsm32nv"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index e1b5a4425d5..3d75ef543bc 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.12.0"; in +let version = "0.12.5"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "118p1fy6cihswwz03vp62cz8395hgfqd82nmfkw88fx7av23rfhb"; + sha256 = "0pn37qkwn3kdsd0z3qxk95lqjn2zak7gkk0pwlqp26jmrx0vv18l"; }; goPackagePath = "github.com/bitnami/kubecfg"; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index cbe32e57f20..1ad7ad3e393 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0vamr7m8i5svmvb0z01cngv3sffdfjj0bky2zalm7cfnapib8vz1"; + sha256 = "18wpqrgb1ils4g8ggg217xq4jq30i4m7par2mdjk59pmz7ssm25p"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix new file mode 100644 index 00000000000..9e578b9b333 --- /dev/null +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "qbec"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "splunk"; + repo = "qbec"; + rev = "v${version}"; + sha256 = "1q3rbxih4fn0zv8dni5dxb3pq840spplfy08x941najqfgflv9gb"; + }; + + modSha256 = "0s1brqvzm1ghhqb46aqfj0lpnaq76rav0hwwb82ccw8h7052y4jn"; + + meta = with lib; { + description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; + homepage = https://github.com/splunk/qbec; + license = licenses.asl20; + maintainers = with maintainers; [ groodt ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 9c07760355c..ec452a312e4 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.8"; - sha256 = "1qlhbn6xj2nd8gwr6aiyjsb62qmj4j9jnxab006xgdr1avvl2p67"; + version = "0.12.9"; + sha256 = "14js4n08rg30y0jrm0na79syglpb64cb7cxys0x3w47pcbgymrka"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 7953f35507d..3baa1352a80 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper +{ stdenv, fetchurl, fetchpatch, cmake, openssl, libedit, flex, bison, qt4, makeWrapper , gcc, nettools, iproute, linuxHeaders }: # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; @@ -8,14 +8,25 @@ # so I'm sticking with 3.4 stdenv.mkDerivation rec { - name = "ike-2.2.1"; + pname = "ike"; + version = "2.2.1"; src = fetchurl { - url = "https://www.shrew.net/download/ike/${name}-release.tgz"; + url = "https://www.shrew.net/download/ike/${pname}-${version}-release.tgz"; sha256 = "0fhyr2psd93b0zf7yfb72q3nqnh65mymgq5jpjcsj9jv5kfr6l8y"; }; - buildInputs = [ cmake openssl libedit flex bison qt4 makeWrapper nettools iproute ]; + patches = [ + # required for openssl 1.1.x compatibility + (fetchpatch { + name = "openssl-1.1.0.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/openssl-1.1.0.patch?h=ike&id=3a56735ddc26f750df4720f4baba0728bb4cb458"; + sha256 = "1hw8q4xy858rivpjkq5288q3mc75d52bg4w3n30y99h05wik0h51"; + }) + ]; + + nativeBuildInputs = [ cmake flex bison makeWrapper ]; + buildInputs = [ openssl libedit qt4 nettools iproute ]; configurePhase = '' mkdir -p $out/{bin,sbin,lib} diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 001eadbb01d..62d0d738b50 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchdarcs, pythonPackages, libvncserver, zlib -, gnutls, libvpx, makeDesktopItem }: +, gnutls, libvpx, makeDesktopItem, mkDerivationWith }: + +mkDerivationWith pythonPackages.buildPythonApplication rec { -pythonPackages.buildPythonApplication rec { pname = "blink"; - version = "3.0.3"; + version = "3.2.0"; src = fetchdarcs { url = http://devel.ag-projects.com/repositories/blink-qt; rev = "release-${version}"; - sha256 = "1vj6zzfvxygz0fzr8bhymcw6j4v8xmr0kba53d6qg285j7hj1bdi"; + sha256 = "19rcwr5scw48qnj79q1pysw95fz9h98nyc3161qy2kph5g7dwkc3"; }; patches = [ ./pythonpath.patch ]; @@ -16,9 +17,20 @@ pythonPackages.buildPythonApplication rec { sed -i 's|@out@|'"''${out}"'|g' blink/resources.py ''; - propagatedBuildInputs = with pythonPackages; [ pyqt5_with_qtwebkit cjson sipsimple twisted google_api_python_client ]; + propagatedBuildInputs = with pythonPackages; [ + pyqt5_with_qtwebkit + cjson + sipsimple + twisted + google_api_python_client + ]; - buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ]; + buildInputs = [ + pythonPackages.cython + zlib + libvncserver + libvpx + ]; desktopItem = makeDesktopItem { name = "Blink"; @@ -30,9 +42,14 @@ pythonPackages.buildPythonApplication rec { categories = "Application;Internet;"; }; + dontWrapQtApps = true; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + "--prefix LD_LIBRARY_PATH: ${gnutls.out}/lib" + ]; + postInstall = '' - wrapProgram $out/bin/blink \ - --prefix LD_LIBRARY_PATH ":" ${gnutls.out}/lib mkdir -p "$out/share/applications" mkdir -p "$out/share/pixmaps" cp "$desktopItem"/share/applications/* "$out/share/applications" diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 9a4ab636c5f..46a27737d23 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,13 +3,13 @@ , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let - version = "5.3.1"; + version = "5.3.3"; in stdenv.mkDerivation { pname = "franz"; inherit version; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "16ssg4cjjmq3cps8klyx3jxqma7f83cczwjnknlfqglrwwdpnb5d"; + sha256 = "03ii1gpc2wijy917565pqig1ihd4zhal12i2f5k916i7fp8912m1"; }; # don't remove runtime deps diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix new file mode 100644 index 00000000000..10973345dec --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pidgin, pkgconfig }: + +stdenv.mkDerivation { + pname = "purple-slack-unstable"; + version = "2019-08-18"; + + src = fetchFromGitHub { + owner = "dylex"; + repo = "slack-libpurple"; + rev = "be97802c7fd0b611722d2f551756e2a2672f6084"; + sha256 = "0l6hwnnv6zzszxkk0a3nli88w5gijvlc9qgkkai0sb4v4c504y5v"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pidgin ]; + + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATAROOTDIR = "${placeholder "out"}/share"; + + meta = with stdenv.lib; { + homepage = https://github.com/dylex/slack-libpurple; + description = "Slack plugin for Pidgin"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ eyjhb ]; + }; +} + diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 2e9602458e7..b9017c12d60 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.3.3", + "version": "1.3.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 2c4557f2cc0..1fde990e4a8 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.3.3"; + version = "1.3.5"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "1nzzxcz4r9932cha80q1bzn1425m67fsl89pn7n7ybrv6y0jnxpc"; + sha256 = "05xwp6062lvjsy539swa6dxj3k3dw1667nkx8ffwdl1dg17wphy8"; }; in yarn2nix-moretea.mkYarnPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2755d181da2..b938f4f47cf 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1n5h7q3h0akw09p4z7nwprxsa8jnmwbvwn2npq7zz62ccasb4fv9"; + sha256 = "0vpfv5rvrhrws52j4lxnj1qyagf9894znpxkdnkp72g19qsjn66g"; }; installPhase = let diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix index 29b314417c7..314a3bb6457 100644 --- a/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix @@ -1,49 +1,40 @@ { stdenv, fetchgit -, pkgconfig, makeWrapper -, qmake, qtbase, qtquickcontrols2, qtmultimedia +, pkgconfig, wrapQtAppsHook +, cmake +, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain , libpulseaudio # Not mentioned but seems needed , qtgraphicaleffects , qtdeclarative , qtmacextras +, olm, cmark }: -let - # Following "borrowed" from yubikey-manager-qt - qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; - - inherit (stdenv) lib; - - qml2ImportPath = lib.concatMapStringsSep ":" qmlPath [ - qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia - ]; - +let qtkeychain-qt5 = qtkeychain.override { + inherit qtbase qttools; + withQt5 = true; +}; in stdenv.mkDerivation { pname = "spectral"; - version = "2019-03-03"; + version = "unstable-2019-08-30"; src = fetchgit { url = "https://gitlab.com/b0/spectral.git"; - rev = "0473f25d38a064ee4e18203ec16eeae84fea4866"; - sha256 = "1n09ginw6g0p42xj3zgxm52dvyyvj5psllv70vx21i50lvkbh9rw"; + rev = "ee86c948aec5fe72979fc6df97f4a6ef711bdf94"; + sha256 = "1mqabdkvzq48wki92wm2r79kj8g8m7ganpl47sh60qfsk4bxa8b2"; fetchSubmodules = true; }; - qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ]; - - postInstall = '' - wrapProgram $out/bin/spectral \ - --set QML2_IMPORT_PATH "${qml2ImportPath}" - ''; + #qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ]; - nativeBuildInputs = [ pkgconfig qmake makeWrapper ]; - buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ] + nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ]; + buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm cmark ] ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras; meta = with stdenv.lib; { - description = "A glossy client for Matrix, written in QtQuick Controls 2 and C++"; - homepage = https://gitlab.com/b0/spectral; + description = "A glossy cross-platform Matrix client."; + homepage = "https://gitlab.com/b0/spectral"; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index d8f5e58d9fe..2de09fc73f4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,615 @@ { - version = "68.0"; + version = "68.1.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ar/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ar/thunderbird-68.1.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "4fad3c7c4099f70253bfee450bcefe458bec61430720fcadde1fe8a1cbb2e62a18d9c55943f850c57f8d788c973774e24590823086cfacbbb2ccd8a99ce4faae"; + sha512 = "b9bb22bdbe013358c03e804e3c51ad387dca503b9e0074db70494eb3f331d72bd8679db929972e75b39f2464d384753bcab9947d1a843a69167d7b3706952c35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ast/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ast/thunderbird-68.1.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "aac850773381d7fdb4d50fafe670449301f073f7388f92a1ca38d9b7256ffcd244b63e9fc0ff2f8ef5ccd853b97016b7e05eb751be1bdc8df9623481f15d55e6"; + sha512 = "e00382241343bbd8a86e31dfcf5bbb060b46e5db6211cfa54c7192361353e2c4fe3d0ad3f4e0319ec1a0dc1f4590b7bc0271e5658bc468986d8e27a64d9924da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/be/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/be/thunderbird-68.1.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "6521d818984bbfba195e847735c1228ff637d3079cff1f5a461ac20a079d325adfc1d7b2eca54f63e584a5cbd2007cef42a625597276a1810158931335f09cd9"; + sha512 = "f043c8aa5dac0d5e2f9da628d6659f654cc39726677424e4b5e5005e97bf202575f569ebdee346d37cc8d4d59da188e6cfe1bd6bf7df1acafe26b489242b4a9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/bg/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/bg/thunderbird-68.1.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a0a738b6877225a5b98691d53a8f4a4bf575472a0d5feb8b77a67cd1fc9951772f1ab507b7ba460c0b62b87ab476c5c94130cbe7275692e3a99e5d2ef0bd89bd"; + sha512 = "61fcf864145fb4fd4a05bff47bd23a7be8444f9d067eec246399c3a7ce48db8744ba4a9cb42e28a215a5bb1b336a57c51d1a32e6564f42c8b9fd4dba5f629d9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/br/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/br/thunderbird-68.1.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "58d21d9e55abed644eb16ba98a5fb3277e0a31b935d279b09745262952895c2c2aed31817e6157410137ff82fc5d242b64268f646c3b7b691c55c5f3ea36e0e6"; + sha512 = "1cdc9b2a8ee82bb087a51ac013644ff3da5f1e161fca23fb24feae8076cef6c5aff5316f83a8ecfa4f08c3a8642501a333d3ef95b46b8f899ce78b79d027af4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ca/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ca/thunderbird-68.1.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "cd401259f2cc4ec71ff9d936a1f2f64a064afafed2e305bb359f79eddf1159cd6a7c84ce54cde6be94f6acd295dbedf54017d9f4592ee3637eea00496c7cfbf1"; + sha512 = "1b73ca87f3067ec2a84990c7c58060b11286dd653f4b8b4c18a44f5540ea195d25f995539de39b6e1de6cbbe54c890bf30f6d88157e000e30c69f4d32a4ae8f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cak/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/cak/thunderbird-68.1.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "45ea4af30ff93500d1671c6a0eeda993692b7204a7504a91ad30bfd5155add5af902205240fd62f80abe339224e686473f2d13f466ba96269347207ed3f628b5"; + sha512 = "1b2ec85786a842c7554f52b1ff72c4e5611a76bca94c4b8e9a79604d6b85d7f2deba906bbeca355dfd0c5a6c241d9bd397f4e0dfebd802cdb0c35162a02fd879"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cs/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/cs/thunderbird-68.1.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "9f81f92a3b1710d006cda79f1b92923c1ea637a24654bd622af9be1f53a0024c5daa77619443514c9e607cb62f96403f5b7f426b3692227c0b56d1b14f51ca97"; + sha512 = "69df6542c5037815d3a80be764eaa809dd351f75417e4362a258df5e17e36aef6d8f8653429f4218f196ff096252e0304c2cca1cccbf8693d119bc05f1072067"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cy/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/cy/thunderbird-68.1.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "c90467a78bc82667d974b1e94227b7d4185878654188967d97c11e419ec7a03e4e5e3636466a0b6d35beaa98b717a26341e3a652c3b21083ad8ad0b23f063ed1"; + sha512 = "5dc63d2746475f0045f7749e45bbc3f755b187521b0ca877ffab9386bb1bbe9b4fd66f9cc6bdac516ba591e71d71f02a75b5c965a610a3efbee3b59815d8deda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/da/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/da/thunderbird-68.1.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f49bd5689d2a4dd311b22a23da9f26559685f1c4663eb1e482b45b79544ab4401a17701f33b6ad083e7a8983185fcb16fca4c8026138f24be495c6cbb6401488"; + sha512 = "89427a2b66dbd71cdfbb299a14ce7ed61ab4836e473854ea8b2ec522de64870f8886f6ae86428c9b1c86733aaa4ac7c732a708fccdd70d3e112d2f651c0dc762"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/de/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/de/thunderbird-68.1.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "579d979cfa0bbe50fd0bbf0d15b38d90579bc065b488a2e9d4e3f18f505e71c50225d92185559578146097110760ed3807e1aefad4862d99e247447478d6bc42"; + sha512 = "34130ec994f6ee6a407313ccc61d43b0375046f59f75d4fb619776d5c880993802c16a3b8ec28dc7053b4ae89f91f1c2046da7d884d150aa7c3b65edd1650b21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/dsb/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/dsb/thunderbird-68.1.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8d16bf47d368a670cadb6a2655933d5b49a796272f7dafd948cac95a2ae541561a38fa418cd4ed0c4aa79ef63a441ee769eeb2a071734abf2cc1ba243d4f3ba5"; + sha512 = "0b9c02a1e31f8f3120fb9ed520c53505dc247440ba2e189cbc58569be5ce6e0c33de220ebda17754338aa680cf5c8aac3ad7f5da14e0cbefc29f32db2446618a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/el/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/el/thunderbird-68.1.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "579b9114af9fda86e79e6812946da858945e2034ed2f00e4244724ecdd680b7db5601a4d573b530dc15207caac9245f6883343684eb43f3ae2abb64853c0b54f"; + sha512 = "1d8e2efc2c9a7375a2ce0f2137165756800a680209d18612420581963f13774fc7780ac0ccda24a485996531d1e82e027b42a671f1c8fce5e8ccf0887f72ac6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/en-GB/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/en-GB/thunderbird-68.1.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "f7caed8c3b49714e4449ef971ed1a21e40f28625c84e9342f63e5f73743689ee2c0e9ed4845f6667bd22732c62bd707db425f22a5c074dff8622cc4536ba9c29"; + sha512 = "79684a833afe5d1025088d6f91e023c81832e9df83751926c5d9bc05fecb7f53d6efd096f55d65d45fa07309497cf5bed2e3b00cc4a80cc1e4ed2a0fe44d02a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/en-US/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/en-US/thunderbird-68.1.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "257528761f0eca38528ded4b31329886093418f562aa2fac73b3a5bedda51fe80b34758c10afae1735cf37b37a86413dcf08642aecb1e8bea1fb6b0b94ade5c7"; + sha512 = "7a29cf0a238e44a2051b53e5476bc8f622dffd088251b66d951ad6874fba5fba180f440c80c7d5ae154c688d3e29fcc6c889f0031d81a018b7fd1dfd53f112a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/es-AR/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/es-AR/thunderbird-68.1.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "70a10e329b1031a2fd2ffb2b60459f0238ff3f5e5d80533f4be6cb22ae77692ec079ca3e146bd9a59edd09c266cec92d922a18ba45f8626a4bd44e290d3c0927"; + sha512 = "d9d62f94af40ba69240b792b3ef2d93efef20b01b4289e992f7d1192147029574f86fa21aed5ad54489d1e5ec1f3b80cd9601e71e2ba9c903582ccd7aed278a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/es-ES/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/es-ES/thunderbird-68.1.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "a03098ad7d83b86cd316c56b69589370fb8bad041b93f90f61514b04e3d0e78385f779ed715c6e22e45597d1bf03676046cbc1eae7896bb2a309af3683c8bd1e"; + sha512 = "d720320494b2c8431004e0d1ac24ff8fef83bc0977f44653d0fdab99fbc9a1aee6d5aecd7cbf6002e3746d04156f47aeb57367f2b30f4690efba36c3297fbeb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/et/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/et/thunderbird-68.1.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "44efeaf030580dd7b55770627678808e34d689e85191852c2e5fcb223a0fdd0e5386f21f03524d0983aeded7f8ed99382ff2c372c8c5a1fdfe218bd5b10ccd80"; + sha512 = "8d9ba13604fab4eb9a3dec8894b04d52f9677d5f82695512680ff03740a66e96786f69476071741c8086a09070fd03786e8fae7f94bb3bec9075331fe4dc144b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/eu/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/eu/thunderbird-68.1.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c670be5932d7e8bea28cffda7c119cfdfd5823f76b2c97251ec23ec16e420a8b7feb5f2251d89750b956d3bf3baff5d17393c05d8c265d0a98cc3faea8f85735"; + sha512 = "e40110a94b3d7fb42707287dc695ea09b082fa3262d05b39a0c09002c32722630711f1b0131441c919b23130ed133338239060726cfc9d6c0b49822558081313"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fi/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/fi/thunderbird-68.1.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "36aa0b47e9b5d91fbc812a3d63503924a8ca227d7b7084c1159419092b17da9c1b6e89fa046c636dbcff7776f9a1d8465e660b47f1753505f0d2eb85da9c3a7a"; + sha512 = "d8778ddba26f544a4721b9118ce5726b04fdf09758272b35ca16c14aea61d0b8271888344e742feb4d4e758182e97b01758acd53ad622a66117e3eb0d4a6d336"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/fr/thunderbird-68.1.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "b1e7d345d3dd38725227b5e09c4f3cfcf29ed3a98b0580fbf6ae1ecab4414d09e307423495b75769a8d2ee3ab4700cd6eba3d95ce05612e1d8290d3f5a3ba988"; + sha512 = "2cd546d40bedf09b58703b0b11a5c9349d702540ae714942e0152a19cbecee51f37c7e217fadfc719ecfebf914f9ffad6b3070bb6471d395e8f5ff8ada754551"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fy-NL/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/fy-NL/thunderbird-68.1.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "4065a083f49006dacf64f084c1bf26c4c1b8d53bca7eba7a56d66bb035eaae2c4528687c5c1e2213f92adbba17ff92eb54f897d3b0ef6d27b8effbee66ca555b"; + sha512 = "03f52224f145917f64e8962b68bcf3810543b5bf0508dca7965c5a385c4f87bc7d236dac217594fdd2a10afe31da8aadc674eaf7b226e189b598011a8b9e223a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ga-IE/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ga-IE/thunderbird-68.1.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "2ae9a0860513e90d1742e5c17220b2367e61273eba04738cd29e9ab497b86f9a1d78b38b21da84b1f214f3368ee114d376b05eabe0aac9a1ec07ca6a4b399070"; + sha512 = "931257466ce7134b9852c2627f34efebc031b3dfc9fb7b5e344665da7fa52ac1fcd12a8848fd9a264a900e98ee3383d3ee6c251de58c1432127a8ce8f1c100e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/gd/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/gd/thunderbird-68.1.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d2315aca9d8e5bb35b21cab46a48e51f09200b056da2682201c32eb4fd3d0379a24a6926ebcf11e9c70d70fd20152fc24d5197a78cdb3c8ea3cc2399d784b463"; + sha512 = "ee3573fe9af5fae39aa053061ef82207ae6669e6764637f6ddef5f8ee3cebf362dfecf5cf5e9e208392f3fe79a0c1a56aba28f372e2e279b33a1f1e3a58851f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/gl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/gl/thunderbird-68.1.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "52d9210e857c1b6cb665a2ffa71cfa5e67c3718b210e2b4b42839d8f25987170f1603fa55d324003a4be821ba74093ff92d632e688e44b87ebf51dafd02f69a2"; + sha512 = "73ba3965d522aac8f9d5af87856a7e2f71cb7ed850f240be56eab9426f91e5356810a12da7cb91bc223cb14eeae3ecb89a2afeca48641ce4debefdaed05aeed6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/he/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/he/thunderbird-68.1.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "e7b5a16950be233fe8a49152184270a901bdb4bcc14769401d4b5a21fd2a3ab9d395ed8f6b61081330386723725252fceff09bf9fdde3a71135a98d8ae45089b"; + sha512 = "abd4f47d571037c4340dd3118a517f3421a3e3597efa1ad7ab14cf537d4b4e226144beb0a6c54a45ec272ab428ee8ed95083d31554ef2aa0022712dd832a1585"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/hr/thunderbird-68.1.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "1ed224dc0864009edc6389f9b3b063f56b15be982c2e2915f1a2f773bfc78e6b81ec0ab02e03f7ade08f47260be597003f8119116576f4fe5dd490e85cd3d4ab"; + sha512 = "32a18d8666fc2b7566807a010d94bf5503b375c5330687aa58efc2bc6464e4f910947ea513a6ebb6b7eadef0e552138a5349583e6894b3166ef6f8d53d5cf67b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hsb/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/hsb/thunderbird-68.1.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "f4bcd8a199bafd544687b1e890694dac2b598d4fd79818ab19441ae9be579a9928fd8c7fbae43e322fced15ff39314fbc88be94ce2fe12b5d2ec2ba003a219a3"; + sha512 = "58794aecdb5f3824e94f2bde4e4080d4922648bac632cfdffbc5304329af64f9e5ef01fc587c4e19e88f206004cc4254503513d7bfddecdb6778de89e4ca6bc5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hu/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/hu/thunderbird-68.1.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "28223aec237fce2f07b0c3b454a8339bbd2f195d6e263c5a5723e04bd5df1128d58a6bc6c7275cdbeefd5161a405a2d6340303faa79d9330abd0e70de9facbfb"; + sha512 = "c7881770fc75a6b1eecc5c481e2de134a241b7a497e19ff2abf08aaecf65006f054090a53b028202becf7776d3939742fa71156e6761f981ff7a00ca0d1d7d3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hy-AM/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/hy-AM/thunderbird-68.1.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "d7dea23905f8bc8dfde92082f90278b76477eb3036c7fc4abe656e37af9d389d37f3b166492df210eeab03750d85cbcaf1340aaa26ab723ca1b70299b4a64ab6"; + sha512 = "80f5fd19da8e07a6d40c19c645eb8fd6964f9904cd14df36374170c4d395146d168728953d1619965f04b3f2295df3d379650e97f8320587816ee088e2f17a9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/id/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/id/thunderbird-68.1.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "f55ad81a1dc80838a9ab045899e0f16bb077d05d73119705f820f6fe8c8c7a550e05cc68cb7ca0aa8861cbd70bc9f061ba51a4749db6c37d90e7e7bda5dcccdf"; + sha512 = "efffdd32086ca57e93b1ebcb40484a3c2243d6b088c70d7b20bcdb38925e7fb64be4446c98980a53738f54dadb54a2d17016adc69bd2a47a9719bb7bb982f729"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/is/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/is/thunderbird-68.1.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "503c236102a15428e41a21b458ecc29986abff4e434f4e26ec9741b2facf39a8fc2ae9dff5aeb32fe3c9ca0dcb6e914a2acf229ae9caecdc4f064380f126ecf7"; + sha512 = "277d1137675c6304b28f43273c5a3fbcdf0d2188cbaa38911d784df98b3429eb6d2667b818a292e4c3bd4019b2b682463c2d01faa0a034cb4fc1dd49ba8aab33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/it/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/it/thunderbird-68.1.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "51a736932baa5c810a29de46eba64b0fcd2703da38ba9449b6b06a9412562e80853367416c5b4d6c6834eb7a2186f434e426099ede56d9342860e4f3561455eb"; + sha512 = "6932697d769f98dcd32f3dcda57dfa154314e29bfd2c1b11a2b9a8aeb8395f00fdb0d1c71b8e9d405d1540cde21547a910a55024b799e270759d8638a3d11512"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ja/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ja/thunderbird-68.1.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "7a00080835155d301f65a35684d81f8e3a3be23d927d939da84a2a887057bca0b75d5b580a004b4f797af504a6812f71951bc3c75ccb24dad60b6cca770cc7a1"; + sha512 = "034021e89c471429367807f04d79dbe877d0ebc94f584fa6c0bec3a29f279f1d6dfc85f709b26e9d11c8ebcc1f42adb9a458137c032a73ae2b69f7238d31ce76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ka/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ka/thunderbird-68.1.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "eaf67c64275495fcb08aca63953406cd7815ec356ee0a1edca8a5e8dacd924a9c11e35dbe4ad17a1617199a5f66489bb553a7a5177eb629223b49a9adccff803"; + sha512 = "7af1caeda9babac2a4c9b456233e86be32bcd14b6dd81cc18a1874dafe86c5b80099d0ce388a70fe6e74bb7b0d00d3b7ce810ffcbae143eadf6d8c4367567c27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/kab/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/kab/thunderbird-68.1.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "9432bbba0965b6da04495b79ef4db3bdbe69476b20650b4d6407d921cf07d09950368f0c13211ea6743b621d486bf71dce0e60d8ceefd82b48a8f2581a3fd7ee"; + sha512 = "d8e7e7d423f36d40ce05cf1378278c47049fca0ba415466028dd821b12970fb78fbadfbb7b7390ec446aede490f07f979b94ef890a43a710e3a1f66a0c68937a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/kk/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/kk/thunderbird-68.1.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9bfb99694bcf1227162607e2b674abb00343e4da3876999430d6014cbd4f4aa6c6e9ddca7c7f3b144d101c1a5a6d38772e3750f5feb41d1f304b89a8c1e6ec15"; + sha512 = "339c8e86693a34c8a2da5e47924e545f0fa55d5314db73c6bb23df3eabed29dd6cf47662a8c4e43c381ede5098aba72887739993b4e71db75e41de3d1d777c3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ko/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ko/thunderbird-68.1.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "fd260740ccd74afae7af664775954acfd176b47176f48b5300f11bd77bc31205d0bbc2d06a701486e9742ffb38ad4aa2b253041b9d9518a4b9c7dbbe41aca264"; + sha512 = "ba80df01778f8fa95dd32bf0af55afe7fa828a489c4682e6a8891636281031170b9fff77ae4f2e4bbaae9124946b0429e55bbed741973d80da868d94e29991e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/lt/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/lt/thunderbird-68.1.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "fb7a7b6d0c7d58d13b3ec20c8176ee793cac5c53bf849e3b3c4aaeff0f3e897cc35e61a9dfa4055c691fd56f280f7b31e04999922c29ecc89294ea6eeac16cd3"; + sha512 = "32e93ec3203b70c2dced59a376bf7379879b5361f55a396d533e1f10727482b357344c9890864279eff9aa6d75feb1b36a67f2293c51d3a3222183f62c51e477"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ms/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ms/thunderbird-68.1.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7490a8169079569143c63f85e7da299d28ea423fb95265e2e86ec724ff0da641e24a2e9ea612d180d523973522f40c250bfd56e66ee39b28cb9acf57f6be6831"; + sha512 = "29190352e1bbfe30b1e98d2a7fa20268488d82aefbdb4de1f8c2e197ed9f196be8256050f48d71ec6475b707d93d0570002fb175cd88fac89aca5e7140a7cbfe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nb-NO/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/nb-NO/thunderbird-68.1.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "7256820ea97851319e51616f6eb45617983e76e74b46ae62a02e22d13e2dd6abd590fd265aa6c88ac14b2f0276219580b6b9fbd956f1eaa38e6a93329b9c9621"; + sha512 = "8e076d0967b0b79ac2cc9ade63e1bea4d27db1c050f792f1d1da01758a576fad884fdda32a02d58d45cf4c615f38c44bebc80c6e864ee076212f280398602892"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/nl/thunderbird-68.1.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "00f32145c861abd8f151d7840d0f01eb9d4190df65e5a179f999f3149477f2de7f796782eb7ef912fcbec005d65c76974185d1c0105dea862cbc22c821bc906d"; + sha512 = "7bee338542f949d86700d9b67d26c059232ba96cba991e491e6380f1ef914e7ee2747c9c73907e393bcc83c7f05ec6e656d869980c2c03ba0a548ae120793030"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nn-NO/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/nn-NO/thunderbird-68.1.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "3ac255b5bb4b352833fd56d5aceaba6d0ada571630a993729970ae99d5067f05ba22e6ef50fa7dd099c0eb5874f11aeed32718c56a80538e28b401ee6b7900a2"; + sha512 = "33b67ce4100a61461a238189e06b623a067e5f1b550fe5f20b5686f597408f3d7eaf45c92bbf5ffe58ff96c99fac9b9e282b024e40829d4d9d4422e54cb7293b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/pl/thunderbird-68.1.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "19ab4bde9314dbed1bca7565698a7b1231767ef9cc792a49e7e9d679453ae8209e6f68c63ea0a24bd9e3a97328dceeedd109bfe28038108b52b9dad366f28787"; + sha512 = "860c606fffb3ae85193b4c919783c94ea1a84c2579316cef98adc247d7d595b01dc6c2e84662641c7285dfc65097f710d7d2605efd960847739ab4acfc296836"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pt-BR/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/pt-BR/thunderbird-68.1.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "68e28b657b885e7823dca0d091f2609556d560a50b5e6c285cdf467ae2b09743406baa2e544f17997519c219e0d4e8911115d30e7b0c35f09b956e28b311f8d8"; + sha512 = "3093207072a79d9556c4e1ca2fa75d990a3952d583f0a4fe8c850a4911b1af19e3ac08a357d239d66b22c397f6722b8625fee03ca1f2b6a8f21dc61fca348541"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pt-PT/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/pt-PT/thunderbird-68.1.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "41623568d2e78b821a89480836f8d8c739f6983b80ce26017d12fd9363016158fa6c629e030f63aba6e730e554b7717fd2ee58e0246aa82b46fe55d5d6be9933"; + sha512 = "5d29ed9a8e8c768a3749801dc191b27aecf7994a4afa02e70de823ed1eabe4e936bd7686830359aa48321681396aff29ead762ab28c7bda6f8aec36117e8cadc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/rm/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/rm/thunderbird-68.1.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "a2cabac0ff5e3bb4a8dde4e884ba4647792e0935ef0a61b56470c67d3ba9c2310a07c2d2da51f7b4cb5fc3e841dd385a2c64ff29d263333a91e2044a4ad3190e"; + sha512 = "cf342acfbb9ab92b7bf483ad3227730dc3923ee107ae42a0fb05c6070256e43a4d3c1647c1fa2c4dec7adbc8c018a185bd3d91e598d09eac43ec679d3c25063b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ro/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ro/thunderbird-68.1.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2e9da10d1f88352687175fa48fb70f8a73cf3ab1d84958a79c4a46526b3640e264d98611806bb234f579d616fe7d1dbb2d4c6ba55a389363034f85a97283bb64"; + sha512 = "ae13fc229198a5c5327dd4d9d948f1a5eaf699877c48c1c961ca084e79075f479f4b270fed1c9ce22f420fecd4332a30594d4d2dc87bb114d1e3518e3a4a7071"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ru/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/ru/thunderbird-68.1.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5f4bd3d3657479446ff070cfdb33e16a527c6f1615f37fb4c4e32c12b89c62d5649fa5c3d826723be47fa9795575bd33ccf37c2aebb555c218aba8f9d68ec3a9"; + sha512 = "f51b1f99c16af5f24702f0bfd433c71c7ae899ded5f101aea2dcdc16f1cc9e1b7b18f26a4fd0ca9296c5e9007067e35bd9cc322bddfe07f58795147547fc0c56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/si/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/si/thunderbird-68.1.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b47d2aea81327089445c9f57a1508406c534907c7b574006886828846e6deaab04e35de2781d55d882f05c0a89f65fa7c386547d6581064af4fc3bf4e879e379"; + sha512 = "26bc664b1623523d644ee231666a4489421ba31d1f0b52b5f4a4164343672333070c3781c577e370e7d97d42b61783077c74d1f38d37565776c752a2310c3a1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sk/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sk/thunderbird-68.1.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "4295204bb89789704da6830d33e92a77df165737c291c74a94fa532309c89505fb796151e0855b4e0bad8658fecaadc9978580ac72e2a2f24a4022909bb64aa2"; + sha512 = "46470afe078d1ef2e48b3732fdc02ff3c9104a727b4d94cae1b9c54f6d2b4771e5784cfb3e6350ab8a205f8ba010a82a2b2fe92313eb351496a19a99df75179a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sl/thunderbird-68.1.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "598fe5bd04e04a73db04eb630e02dd7cc7af34d0381e6877626c8885bc4b879e1f35362afb8cfeb1bbafffc5b7ea14c8efe9b35b5e30056d04fa0126b8663679"; + sha512 = "9bb5b0c979fede4dfdaf8f4965bfed1ad78d14168efb797fc216ac2527434047c3e6b65eb9dd1e607f55b22f6f28e49b0ff58c272c0708cf5ae1f9ce96b2c796"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sq/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sq/thunderbird-68.1.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "0b657daedc98db51179cebf547d5f278d2d632bdb552878b4af29427ab8fad62f8d6c1ab2c3a38cbd8e67b670d6d613bdb1d4f535a0c69d0d1ca607d0b10bd43"; + sha512 = "440870b75e47aa277c5453bd997709d2f9e59e0aa86e2fa7f5aa95ad39b139d8e9b7b8a7dd44765d8f8d5ec18c5ce6a284ab40d4aca01b251bcd9e2183be4976"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sr/thunderbird-68.1.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "10efa11b9c9ba56142c8a321a25a7e875f3d02fd17f73bd3061ffc71823aeb1269f9a864aae88a4fc434d1c4a01d227c0be605ffa7f4ef6421db98c0141c839e"; + sha512 = "bced610dbc95e7cab982f40376fb7cce8e672f8533a66816f01667ba69d73dfcb00e95a80b42273c1ec7ada9cef8c14af1c426cda2f8425e3f77a3a0e393a611"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sv-SE/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/sv-SE/thunderbird-68.1.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c77d10b35edef7e59f4e6c48cd4352c4fb7d05b0140aba12be42b3e3a3df609ebc86f2f5a3993fa172ec0ac118726314bc9042335101241637481a2e1a4d1c00"; + sha512 = "af139912f563710b05c274d1b89012e27a3997b582d379e3561011fed7c77994447c3054433e0fd4b5db8417d5b43b63e840d313cef1fc7a8aa7baf0655982e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/tr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/tr/thunderbird-68.1.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "3d52693efb05379802d62fb9e40c4b1856b45ee948032634d4c4bde7bbae67327f963e0f1096fd5d7a15d4341af1ecf3d9ee96eed45146859d8e8e5d403d660a"; + sha512 = "50693e4638f8fea5a7f609924ef65c8d7ea4f4ffff79320651481e1a7f5cdf69edc2fd987137a0d655077959cbd8f32218d2f78fd55790084e2d46d3ecd70cf6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/uk/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/uk/thunderbird-68.1.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "c09734ab8e6428c6ed270887a0add934a7058d5e9c895864b1128e0fd39d57e13789bab38cafaf7cdbac1a71c8884407698c4bdfcf48aeec6604a457ed57c48d"; + sha512 = "c24943567c110ce8cff6da066d0bd0081621d8c397e6569c57b63eef3098963a55215083aa655fa9c98adf9babfcedecfd72204c1a68604c851e1a5c1a1b0102"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/uz/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/uz/thunderbird-68.1.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "083a83ae3c6083934fbe49f1e65ceadc5b5459f0f29ae0df9901b6d9b29d0a105cbde94357c1ee0a9677ec923fd1d419c618db0e843cdf320c087108990b89ec"; + sha512 = "e02a86c848a013a84824246db3e29e889e1f5cc1b743a3a9b567b914a46100a808779fc13b897b04e8c698e14cf474fcea907e25e937e5c8b4ccb997f06d8e85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/vi/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/vi/thunderbird-68.1.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6ba1573c9a170d1d827b6d17941c25e3852f7b66be2eaf7a3e9ab02278f19a38b801d7b9b0c266dc4f38f1190f9c83990eaa51f4734ddb38f43ea3e1bd23b72b"; + sha512 = "de6d6794796f5b60cfffa9eee92906237fd692b21ffc3925c7866ea9660d26366f5fd3c847b2dfecc418b631c6241dad4e509e58e391c414a37587c6185c2655"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/zh-CN/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/zh-CN/thunderbird-68.1.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "74ee429901cb520d07361a4b621c9be06253cf93300f0f91e3633d3b375e4e9a6a58823d4bbfed60519734ca5705f2cd0da4bdc7db0f578ec300f1d705e9b7b1"; + sha512 = "d5835538fe615544a07e93a2088b65eae6c3c36b75ca2b9f6605974d929a36dd226d848e2394611809538106f56c1703ebedb5c0776593e998935bd322a4e27d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/zh-TW/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/zh-TW/thunderbird-68.1.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "d720029e0720fa972d694712a85bdae94b1ff51213c4e56b84dff6d293a2a9831f5cd4efeb44070010eba1486b9358929f64546ce7ebb7cee29a7bcd4a1cd650"; + sha512 = "9dfaa7dc83725fa795cf1b2e45e7af760dc6c38999b05a0968e46d4b5676a4b9f705ebb63ff400ec6600d83a6be26eb4c2638671a539b59b6ea37002ea9b97ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ar/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ar/thunderbird-68.1.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "823b3cf50f8d23d1d0ba8583d2b10146e2eb0ff4a9401527557fae8e8db997ecc66d0bf5a091323bbd37dd6222bacb73fb9818de8740963b929a8893e4ec9391"; + sha512 = "17733249e5c2c33899fde89a5b2dea2592fe0414419c235f4d853917990a05664d52a05f1f1a290ece4bdb3646008b0aa0af1e495e5b8af0c08f5b9962bed5aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ast/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ast/thunderbird-68.1.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "f0087ab3189e8fd194d2ef6d5d2f9c3e14d592d5217a8fea19ba5189e806f9d484332f9d342a15549651a75bcfa673f21cd7666265fc185ec58c814814902ec4"; + sha512 = "95b40d08b988146db7175232c9d9be92175cc3fdd73ba5e205e6543dbdb9e6e33579edeec73b6961a7ace574d3466c162d0665ffbd3705de15b7ea4cf6d7b77d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/be/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/be/thunderbird-68.1.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "edb358214e93142d73c92ab3dcf6240cd08614c2d0e9ea506492023be46d7b7f6273dc767ae034762c052db3b0a093dd027187afb272b2a55fc3126b06ffb78a"; + sha512 = "d2f4ad38d81306c1637ae8612221bb462409373b3cfa70a08d0f2872aceccd8087835eccc014f4009680e9e36b6cfecc9bcb95328dcb8f6c9ef11c432e2d3c6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/bg/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/bg/thunderbird-68.1.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "f3268fced7a81b5046332f975906ac79b8ab5ac888dc1c81085dd7cd1b1a414988208d426bd305f67cbd913c58de857c844809ae6e6ab5a2a520d7d6b149b731"; + sha512 = "f2c74a0609eff929202d13719fce167577b2ae0e1a0c98b75b359bfcddcb531907a466e184ece24d904bd592ab41654f2dcc2500defece0aede3be3826dcc8eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/br/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/br/thunderbird-68.1.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "c1be2ec4d4e64a2a9b32b974eecd182ad9d1fa23b775769e8535e742479ed6be2a222272d7c5b141393f0c752d4af704758912bbac1c17f445b3bf277c12eb9a"; + sha512 = "1f1ff89743c398443a18230ec0eadeb51a8d57633bb7c242f7003e472b0ea206dde50a9d20880ddfbc9ee36a3ca28135662ed21d6e8cb779627120c70f0aedea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ca/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ca/thunderbird-68.1.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ac0c2508b89812ba63d0bb770adc2292127243fe31bf140a4ab88c953750fc2f699c5ed2afb9a400cec48dc14d927b08dc96d5b110e2f2d90e81d1532ba9d916"; + sha512 = "608232b5bc7a93cd786d84662e59e3b186bb1de51cbe0f720cf4e80e65a93e09a24f06abfba63785c0cdba997a6fa871497998f1953f57a98ea6b9e224235ffe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cak/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/cak/thunderbird-68.1.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "4d73beb37469131b7e7747c85a73027e1eaf008100eee21e27d36b4736ffdb4cc3ca3606726e36033de64504f058ec9d4193797a09c2a591675636a5c00fc890"; + sha512 = "5e77fc07093e5b2cbb345f21b48415a5c7d987ab0a82540f398ef33c7051f1917fb448fe23401ec3683c87379aeecb287be5ffcf6a124df9a464401f242d1e3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cs/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/cs/thunderbird-68.1.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "635ec13ec9fd688ccb9c690ccb4d64228f1f47755ce24c4806f5f47655af1279b9ee758fe15c0fcbd43c830edf66383bfa3d84d35137209a4af41aa59565f554"; + sha512 = "036304985db3ecccbe50a9b3d8c19dcc269f7c6987c1101c9443ea5fb2d14e71390ccdf6f0000c972af631863398a02cba1c05566c6be4ab3e79396c049e0e16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cy/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/cy/thunderbird-68.1.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "afb546562f92c93639a407598d9c6654b64776cb68db7ddb07c0d17f83d122d9e7bb974238ee5cdb90876bca3ea30356cc5eef28b11ccf082ef72c0343dc42d0"; + sha512 = "4de3a065234e921f9ae7250409ba24bc54230af61b4993c3686a77e1e165874995f7c60b45ab136c6b3f3047461e86c19207952b870019df06dd164054b65dc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/da/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/da/thunderbird-68.1.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f7b7d183312d11d02200890afe4e81c793b658729119d9f81ac2ca58714244ece9d64d1b9d9f34c79f1d00b574e24192ce066debf873c4b740c35208cfaec16e"; + sha512 = "69e190f9263438c88b445821b56b93c052613fd67a1f1918b135c719e4358bea46d3a79bc135d50b254fa686d8cba013daf89d40ccc5212062cb177bdab4d667"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/de/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/de/thunderbird-68.1.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "e6b3ba227c8e84273e6dadcb59d6691187512666efcb63244740a56273c5b765c65d21607e4f07a508e5e63ed0812162ad767fcb1140b89b2c155da945586179"; + sha512 = "ce4cf8c1e11f4813ce173bd08ceed9ef26b2117771ca87ef16c001e1a49f5385a6a3ecf4bf7561d48aa6c7e63d307c2fbde77ef8a51fa0aa9b66f4f98386bff3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/dsb/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/dsb/thunderbird-68.1.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "84d39965568de9c87c280beb43330aec4ba6cdebf59a9c4f566b6bc01fbe15cc3987e87d9c24a9e746283cc54ec1ebaaff99952de7ff0aa9b6f05f36b1295d09"; + sha512 = "9007c92825220ff9685c599b1c6e39fe3e96888621ce5dd15f5ef9d812c09a29ef72a6eb2f68cd8eab78b5519b6c26cc957ed04f3c9798ea0305fa4f5c8bb962"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/el/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/el/thunderbird-68.1.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "0942b5c8c7ee792d264824c6837d5857679feae9073fd2451b92dc0f31290360a24f7cd708e550955e798d2decb9f0c3a21dc8ba7bb5f226ba8ba9f502ef870f"; + sha512 = "e619576813260ec68a26226a83a540c58aea7e87d3b0ca35f6ae7bd9e0dcaaf54ab12f57cebf669060191e3affc42df1585a3ce4aa18f82f6afe469b85de495c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/en-GB/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/en-GB/thunderbird-68.1.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "12fb5086fd012d85f35a41125b7e5ebf37ec34e9215db9b2a4c67f924d3bfa738698ba15bfa2e51f8cbe0d81cdfe5de4bfecd54b0fe6cc7163c753444e56bb9e"; + sha512 = "0810f25326d8a08628aa55d5c15e6144f833454019087fa20f2c128bbaa4380f9f2a07714b0d8ac0f3fabb5b6065e7b2efe6e80975e5e47e81749da9f4e6be94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/en-US/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/en-US/thunderbird-68.1.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "6004186b0b27165a4d54191a9c2daef34b580c2d97b1e0472e8d8d863e3df51ed56ef17abb7c6944f4da214772780b5c69785b9ad22ca26ba1a8f0390beedc19"; + sha512 = "adc1dddf36116435b3948810cd9d647febfc97d62443032100b0f2d722913aa051d44244f057c29cb8c6cf494fc67b3044b83ebfd5eacbc36b6cd9c88361078e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/es-AR/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/es-AR/thunderbird-68.1.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6a547a1d0450de1089df18baae81100d3fb9934c963459ec83ae81504e7a1ec7abf595766c84fe8d321f901150a68b7e172888028f3b992b4b6b74ba98ca4efe"; + sha512 = "a9433a5de45477f432c6906b640909880650443e5e3a65a839e9c055d887befedc8c22c76675700886dc128ad190fa0ecdbbf2c5f18e650219b33a78105eac63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/es-ES/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/es-ES/thunderbird-68.1.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "e1256da3c8938776b11444790f20a68f056f7407f444f0884dfa1c52260309d4adfc64fe95168dd8263e4aea650362ab9fa08930559c7f0e97b3489c172c81fd"; + sha512 = "a128e46d7d2cce449a261f857a221232d2d89a7d999bc074ad5d1aec741f766516f3882cc2603d6284458208c2ed36dcb81e214039222c9c15450e96e73d0283"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/et/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/et/thunderbird-68.1.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "a5d7cd5e3171d44dbf91f067231301940e8a622a6729333512b49bc037022bc2058fa548c044a40b7ebea5d3199402276a34eeec5cb21b2070d7cfd96737def1"; + sha512 = "521d004b432fd27ed6b167263253b3a3c89aa22ee5e06a4a434da6948a8c2af4fe27e17a1ef962e7caedf7d15ab27b98384545069abfaaf41871cd5878fdbf72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/eu/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/eu/thunderbird-68.1.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "08047c83e28397d265712dbd5a533799b2bba97d90f83b93be8377a544226ea0dff22f5b5e2cd5314c24608825048f3e59c6fc348959d63e1acb81d10d687f46"; + sha512 = "df8afc11cddf0c06d05bee455833bc5d786789a709baeade7b64e8f815c42f399fca1442a8b64271fea7e45fed4408ee923293cec953e0406b093f0b94120861"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fi/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/fi/thunderbird-68.1.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "ae407ee0dde2be8a8f89979b5dcacebd13fcfa42fddce48773e8f26ffbb503acc6b17a90170a0d72d550400397c17a725f9bf6f65d842f0f281fc58eaf9dbc53"; + sha512 = "51e05f21e01dfa0fc3c5d0463d80e87a38e50dff612a7632f9a5cd440f037a438a555e3640cdddd794ebe04eb2cc15c549db7ac829c91ac488b73b66808496a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/fr/thunderbird-68.1.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a776215a9ba91de0500cc7fda245afa19a49b51b60089c55444aa452c5aca06cf3b95e66448147cdbc3df063348c28bbde3f3c2a6e19deed26e1b33dec565b25"; + sha512 = "9448860f48fd93383a24fead6af1102af855270749e817f720e2afac152949e47fcc9ce6fd0d2c60d3dd958c855af47a54a38e85975acf05496a7f67d2af72fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fy-NL/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/fy-NL/thunderbird-68.1.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "5302a5709fc4485eff607fd0b5e75f15bb600a14d20661cc4f7280b0bf5c156a40a51045182ff0d31c89d4009c5a516015843ec9fef1fb1134cfa80c511c05ad"; + sha512 = "e9a27da8b86e2ec3593056a19001dd656b8bde07edc918ec18f266de377c697eb0ea3a10fedb223e58db53ae5970d2b9753b46fa87db938e5568283ba136bd2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ga-IE/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ga-IE/thunderbird-68.1.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "4b9cfa317f8ae5accb2c96731bd7fcbaf2eebaaee76bc7383d247cac9db6708b7c4c03d2faf3a6e7e6620b3eb696e9bb3fd18c3dfd1f3ce12e4bc65bb86955ed"; + sha512 = "b346fe3863ab7944ac33a8204eea7a458a0131c879eae26be66928bed930aa29ba74a5b0e39aa939f0320fb8e5fb0a5e31599235daed526f920b92240763633f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/gd/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/gd/thunderbird-68.1.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "8738b93fd18972456158c28d4146ec8548e97339d7b4ff044ace814213d27940b02f9b889b5809525d5bba46a5b3ff4a570c14b3b9a5fe276b4aec515b62055b"; + sha512 = "e921a3c2720aad333febe7e1d69579eeda4f641fe32c1b6235fb6c01480ab7c87bcb47020b0dc2e4225746b277d8c6b288aaec86125ad48da9fbe3452f30e01a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/gl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/gl/thunderbird-68.1.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "c556343f99d39f6ff41f0b05af606ada89e6b95938886f8d0b1ccd7b77f336ae40a8debb003d2bfc865548c5e9e055859d6d353e169a4f2ee7ada7cb8687cc47"; + sha512 = "dd581aab660e96d7b0283bacab74d5635610301fbf40e95bc85edb5e177492f2a9c786a4fa722024fd57e2f2158fa339c161fba605ae428b5c03fa983b70d176"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/he/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/he/thunderbird-68.1.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "b6eed03bdebfc334c8852a15989c024883b99f600b9aa58f8344976b63f1f9590aa9b78a2a27b081a1e5256443801f01c1f638f1e4f8c0c2a78e695a5e2f590a"; + sha512 = "2ab68acb57eadab585bedaef3f79369cd7a0c08030d24bc3361a0e08ff796f28f345cae15fbd78bd1fe2c275f8d4fb7058194ef44dcddd3e8f92b69f92482321"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/hr/thunderbird-68.1.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "aa4527614db13978d03cf07444109dbc63b7788a2cff924b5566c98d9316031f1c0fb74839b5be78030959f85147c1c1e50edca5605b5cbe2ad3bbbb257c24ad"; + sha512 = "975be725774e200f39b77cbb16ad364fb5d901ef46a85da9f297b61140e5be61cbf48de9f2ea0236d4580a27be97e87c195b92d9286133ac5aac2a35b1b7e5f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hsb/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/hsb/thunderbird-68.1.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "92b1e17c825a60da17bc9942b689337246f301843637fe420284fe89aad4ab2f30101201330d5319a7e6a2bd87567bf7aa7b35bfbc13b1399ed54973afacf4ec"; + sha512 = "5d501e9b7a39a518da0a82c1a89f398adaa449753b4dadc6ff8fa610bfc152016e6f70c1a944cc85e72fcaea5aba21a04d5abea2f2e045ca1c9212a37d31c461"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hu/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/hu/thunderbird-68.1.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "5e0c03de66a9098e290fb93545cb46be41d7e91c865cb3fcff9dee7d141fa113cf7bfc14cbbf1e8f9e3979e6602116081958c22a83ea043015cc5adfb738e5ea"; + sha512 = "4cf2c82e4d965c3ff51e40823f876811834cf7602d9cca30011346c2bdb6e222b7d37f28db79b6507350cd833db312aaf30c13ae245c93a6b1118d9abb132571"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hy-AM/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/hy-AM/thunderbird-68.1.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "3df1da5c3d18ee3705e5d5013a752920863fdcee8a1c021bfde28603862a7c56e60a65b46b98af5d66fc5066c1580ab5484d86dd278d64d5d800b3840361b812"; + sha512 = "d13d91b889903bdbbae1e12b96f07bfc6f5a6cb734a45fb87402ac44df9fcca703e067b1d1554a41c9b7e2e31703021eeeedd3ecd8b27536b548a3b2d89a1f27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/id/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/id/thunderbird-68.1.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "786a5839f311df656fd4a0687819a47589f5a6ebac6f76e1f643136286d43b2f27744dfcc116341a8905b5e1da4ec0ad1f1eb4998e188d2e87ea487c6826fb32"; + sha512 = "7c199788cead727742dfebbcdf6ddfe4491be31a3f4dcc7ae05d25413101036cad7fae399f6b390002f55f60214ea66399d5bfdc515557351b309d174b83fa55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/is/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/is/thunderbird-68.1.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "53e4f76d41e1f8af240ecec249bd3ef3c787c6ff69320694bc682a876a76be22ed59abf0bc83691c7ea96d1e16f5a4c859e2b62528c99261f562012dbd035a9f"; + sha512 = "33ac7dae65efc4792f92fed4eb0062302ef601f6bceef4d1eaa6b4a7fd75427607e8ebd7f6df70073bcbcc89f057b0689e365cea960428b5e57f9f1e810d6e48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/it/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/it/thunderbird-68.1.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "8ecb5594e5252be84f97a55b37f5089220a3e5c1565686fe02f00d94a1418a9460e4c1f25724243c82b3c9442eb8cfbff3c3c9470971921469f2fd71aec66860"; + sha512 = "231acc8648e2e377a8ca6d22c273957506fd1c21f226ddd681fd3a91940cb151df4f0eb05885ec0325629bb0cfdd3ed500af6047970b43b898a37586e4612502"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ja/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ja/thunderbird-68.1.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "7f9ed4fbdc0549c6ab704f80676218980a4b2609086437f57e22e9750e5a34d7506c1ee43ec48031a28322cdf4dcde6bd14c05fd032244acf33310fb6aa8e9a2"; + sha512 = "90b8ca0d72fef8fbeae34027c95e3391452d72b53b40ecd59b1d2d2b07c6ef2e4d787bb2e927bf3d4b7837ea4cf2f10a0d3ccb0a6c98992e6fd857717c8ab04a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ka/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ka/thunderbird-68.1.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "bab15aa28fc92850d374f76ae9898c9408176db9b9e19cbdb49f7b586172c20eed0cb358f3cd4b5fcc2a4740188c0f041cf617a63743a42648c7e33dd0fb79e8"; + sha512 = "271415dafa136d326b89ea3a58b852e2526c86f45d63f383fa250ace14f71b1b915dac3810a04507d9ca4437c640065520f9f3d9d032cb7eb84aad1f7b3517ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/kab/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/kab/thunderbird-68.1.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "26b1055333e508666dd24706da824c5cf9d5f87d1d1cb1c4d42894b836412205a7cc7ff73f764d8f2a1852138923bb02a6b2a2c3c92d1fe9307529533b6360e9"; + sha512 = "c0b4fe65e9937bf897e7512ff6f267993c324c772232317e1314ce035a282f313b8385eee8c13e7b131eb0fabaa1b62345fbcd6289a5172d78aa3abf7f716bb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/kk/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/kk/thunderbird-68.1.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "d946c82a8c35d82147812ef16e4573ae559dbfe65f4a6e5fc7dd107fb57fc6ba2a47f8a3655344e9e6172628692ad7815045830ee27bb10aab0d71483936d6ac"; + sha512 = "b8c7ddd098540ef8354eda1f2a3a06987d11cb7e0c4af4e170d507ec540e743a7d2527188c18e045df99576ed44990a800e7f7ce212042eb03b02339be9f86af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ko/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ko/thunderbird-68.1.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3b9d9e70c097a1b7958c6854bc2da121f44921962d873e7f90fee85ce2214725223482aebcd503205e32501648c774199eced7ff34effb428dbc738f1ba4b963"; + sha512 = "a33dbf6ef3aef69644261ea1c1cf3986fcda5c9d0b28996c46e3d8e53d3d7f8e9e6b62f1b03f2816267b483a84295ad99e888cf76c5c192e9a9dbadd78ce7d8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/lt/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/lt/thunderbird-68.1.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "0cf99a6aec58d2f56f6a52fc5fee17b9e1d5abd0ece53073cc392c71452e1415c94ad0af003dd0a97fc5c6744a1a2243aef69dc44b831be51108b769e5bff87d"; + sha512 = "3bf1cd599707a2728fbf46beadb7d8d1832c0c271e98647ac7d2de1be78b8c1b5d0af4ac246af01eaf4b2a57154f6068065fbbb2019346b663cafeb40edd5b71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ms/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ms/thunderbird-68.1.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "8b4697a312aafdd88a5ecdf898a796bddb91e80b4c8c9c342fce765ee0f4dd494114324a51d6379468756a44bc71cb6f46b8fabc7ca733d9d85d08069f18526d"; + sha512 = "563c413b21e2fda6f412a1826b1191097d4df1ade8d12e031522e122bedea6ae23a2d3b047e870030c9b4901a5869c9439107d8a7ebc6380c758bd741e0b4128"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nb-NO/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/nb-NO/thunderbird-68.1.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "ad6275f8343dd36ed039524875b41ab9c8bafd2a1e54291b98c16b0ab35f9bea1bfee3fce86070317fad2f25d46d0aa9ef0824e4ad88e0879a33ae753c61ab2d"; + sha512 = "c9062949faf5cbfe8bde2b0f330f76b438e1606360364a90f0e35026fd52952d6aff7c6925fd1ce569b24f41409d0b63540dbeb0ae82260604d5faaee723bc2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/nl/thunderbird-68.1.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "49f586a62969e6ea5638eb95f812e7d4a891ef55f381633792ed0820ad098cc527dc9490c3a1ce52246526f0a8cf00eb16666c6a7f932a68c6d440e151b452cd"; + sha512 = "b8b385db8fd2385a88d12c1ba23bf812592beca14e44d9c33456ebad16a40db8e7d886779565a4d617fc56f7a6d651dc8da171b1c727481895d05777bc0eb3c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nn-NO/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/nn-NO/thunderbird-68.1.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "1f04f2bf7a60472eff1b546608cfb26e41f31a273d1037e0d73530029a757dfcd95e2c1b85a6990b6f7eec28138835fe096266a00dd094b4db74007cd59ef00d"; + sha512 = "3c88ea8dffc71524402416d9222c859dafc5bd5799651a948bb318a7d2f91ca2c00fa4158e6019949f9a1d72a2d85a0c9d2a3c9a8caf052e8743fcb5dd0dccb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/pl/thunderbird-68.1.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "f232e4b6cfcea81ed70e56e9812b8e0783205f49b846d29338ad09457db9a18e4fbb35738bf5e9abce42855c13c1839605aa343cb7d33d0110b68d634183e697"; + sha512 = "c6ba1f98ebc44af63d8cd8052fd306d3a8920c33eb5b3be563c0fe203d5d07806bc5db7ff88847c3ee2d82c62d0811a086fa91e8253eec3a3977091569f40a20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pt-BR/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/pt-BR/thunderbird-68.1.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "2527ec08fc23d01712574e3c8419273ac82111c5f2b4b6040cd8f3292aeadb36021029b01bc319d8ca52177db39f1a446acd5537a6e8f42800eb22c3e2d7cb30"; + sha512 = "cbd4c0f1b14cb04b98ef6f2e4ce53d655b58ae9a11047eeb1959ac1c4ef4370507194dd1149372fd1dad4ceedf91c39f3bde4fdf07b5d925f27dc8eb5041be67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pt-PT/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/pt-PT/thunderbird-68.1.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "c91d9d0becade1508a3212693f5fcdeb917fe5df5d63b54de125b76786dc3787a7f5f220eb48add1dd1eee95f7eb120b1c1dc85dc0bd91688c883be9219f3d7d"; + sha512 = "ec08c628708a7bbcb00df2122e5fc463e1b0e1c031e9130369ddfee12db3cfe9219f7939756fc47abab8514c6cea642bb653ee420818ad625a33caada7005993"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/rm/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/rm/thunderbird-68.1.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "45a4f608eb5e64f24ee385328a3a568aa2ad3284169019423c8b414790779cd079c2d73b290716f18227210ab5eff50625bd6688498bc027228b8fff51fda5b6"; + sha512 = "4520dfb1529220e40cf2e1aca44cbc2af750fcceee3639d7ef334e9488034b18bc6e73b5b7a37204346da53a44da099f4f7f65d5b3dbdeac6d6934918c02cca3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ro/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ro/thunderbird-68.1.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e344d838e2f79dd8ff79cf2e7ff2a1d8f6c7e64f29cf870d8a6fad9b3dee31de6c0a80d3007dd498dffb816c00dc8429150bc6b49a5b6eb10b633a4e942ca725"; + sha512 = "49e54dd1cca8038ab6c34e9980b6b36117aa157b6555ba440f0d7c8c4d909253989b9a50d25c7c18529136fa26d0ff94474d17e43156afba171948c9c05e16a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ru/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/ru/thunderbird-68.1.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "8dbfd4f8969703623388a55e790b722933f2c1faf702ff5c7fdfe3cdab8f62fc4ea69f9303edf94a41a71be1b8c5a2ddfa5509d4c8abe260c91b7075349afe64"; + sha512 = "6d297592bcf0c9b97c40f1053a95385e6c2510aa0ddfafd25085bc6a954fb5460f59f18f65477d8c93af829cd2a053b389b5dcec35a7ac7766d72c29064e5687"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/si/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/si/thunderbird-68.1.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "f1808e9648caa00afab0609dac1cb564dbf6e5bef75446071997cc9913da8470e54cb254282fc6e8b839e88b003ef18426609a97cd1affb93659fcb519913a5c"; + sha512 = "f602557748517324943b5ff276f4efdeca1c5083662bc9f0b0bdba8c10510cee834b3883870a98d51d406f58e338a09d0589b3bc0891bfbd88b895cca02fd360"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sk/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sk/thunderbird-68.1.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "7d5b480a44dae0d2f5348261ecad04348ebb7943a757fe83c0fb154da251b423ba21840c5d1fbf8d7979dd30c2d5e7b18e90d0ad033a1e96d6f6587407a24cc9"; + sha512 = "7b6980d2b5131bd9a43a29efa2f1e97c60e15410a63224d839548d777fd8b4c4d65ccfc7756227cf900f7420b12231c3d48f062133cb6f21bbdcdcdb179f2e47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sl/thunderbird-68.1.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f76e1f01b8da8a2ba344dd3bedfa4301df03fabf9848fa189d522995cd48d81f8d00f11e01722868acb1993d4e79977122e04e3d208629b2e398c715777194e1"; + sha512 = "ecc38fb4fde66b7b213b1cfeb8ab170b3e685d0a28c7e071e19a85509ec74e79fb6eb61104c47f0eef1a77e1e1a52b292469a364747eeccc701c522452c58351"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sq/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sq/thunderbird-68.1.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "cff32ee84324724dea5612e5b48b22adc63d8b9428c5937f84c94da83bcf5f2aadda6ab81c5f9bced6d693689bc38bf15c764d4ab4809cacec3bb54cd82745f7"; + sha512 = "3ff668c6ed28bdb2f3d388ab8ecb1bf3b2b38bb29046b8559f7b9f9c6fa32db226c4620f472ba5a982b473e3e3f4aee04aa3746e57738b512dcb37fdfd5ecfc5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sr/thunderbird-68.1.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "96d25f7d952e204751cd601932713418cd495d11364430a37ecfa36333113a6132209b8e8f0ec337799ed02b71b388f43e22a53fa168f17e4d15e7594170299a"; + sha512 = "4c71511375333802f903cb632963933054a969c02a3fb23f4416e0cb3c21e18147bbffb28572f8ac90aa5bc3c4138b25590c42610c20a14b5e8eddb1edf28c28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sv-SE/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/sv-SE/thunderbird-68.1.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "8bc790d7951469e2dfa2499622464cf55427a6bc93dec50b18f014ac079ec0579b91a11680e4104f7d6a38f60d467e9fb3c9ee7ab83b64f8dae2c1e979150bd3"; + sha512 = "5d7d569f4eb9ed738f54139a90e9a01e9e771a553af193357d45765bd54815a096ddc31ac69620d6f14516e8f41f1c0fb8f16a848e13273d0c18b9c047d85fb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/tr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/tr/thunderbird-68.1.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "2c40fa3e6ecfb68507897e669bed229ed98e1b4a3998b55b59523d3cec1fc5553cfacbd9be3d55f7a32b612ee662dfda7c8a21a4c26c750d48b87d31368a9942"; + sha512 = "fc8892f85032d9fcce76c3fa971531f4039b8bb9e1812776bb3e7c5b68474543b5db4007f79e81abc1685c74f0574201236aab8a2df05ac10fcaade7c57ca3c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/uk/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/uk/thunderbird-68.1.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "5eee26a500c1d4bf71222987523cc3e5f144aca02c17c88a01d4b68f9ac5e1298407460c69504d0a7b1e5727755cb32e2ae523cd97766419848c1b6dc0a30bf0"; + sha512 = "80335f326bde31f4b1e269cd756b4b41ff3a632023f09447abf6d1964381f8f9657a4f47ed6af63a3eb0cd4e84e5bced595eec07cc0a9e30ad8d3cf3d08026df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/uz/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/uz/thunderbird-68.1.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "51a0fc8dc30cc82f7d3b222167aaa8ea0225b4136ebacee38687cdc1235c0720da14cd2a3e1875a4c4bfa3bb8fd9045541ca6df736115312ac49a2db2ef83639"; + sha512 = "2434a8a063b0d1019220579bc83160217d5c269b24ad83a9ed0969425a1fc9d9ed8b190c291d87c34379928aa6c2329d3b5ad287b44177dd61f680081cd7caf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/vi/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/vi/thunderbird-68.1.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "bb02dd69a8c8d514666fedb9d7de520f6ea89740956ddcd9d7f90175bca6f7bcf79b573c6e5ecd6fdfcdd15aa2a35881e8877074fbb795019eccff52cb943a91"; + sha512 = "0e33f1a2f8cd67bdb523180af0b8afa5fbbb3628b0b9407f2a4ae609c7155b33fd85a1f23d9b74097fefb045fd0b437f58971cc4c4d5f391398d6ea7429b921e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/zh-CN/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/zh-CN/thunderbird-68.1.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "408599229da40b2ce1a23ec1e5b12c7f4a24fb63524d792d50764cdfbcc6774dd7f651ba2dce46bccd94937e24b4b08d8bf37b6fb839c61540dfbf36f6d3e6b2"; + sha512 = "27d1d9b3c30ab1dd863362139f91b79ffb7e36e87ff1f7f07162ea3e86a58962136e43cca3212e4263908f63dfe3a3c53bb3db3085e5b4bf07e0ff88408822d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/zh-TW/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/zh-TW/thunderbird-68.1.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "d75c9bfc6234fa0ddc56b7c1dace76b789e29c0cb03ff17395eeba020a82431e457271e95117731963f2666295b94746d0370bf0e85f9c3646836830684bca45"; + sha512 = "2141f0ad5d11daf3a94f3a737801ec0234a7f2d869320d4859d771ab92a6e59bf13139b4048a7239640635051a9228e6cbf55746402ed35cb398d93a3d129439"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index f2b4cfb4bef..1617ccd7dd1 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -25,11 +25,11 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.0"; + version = "68.1.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "2cz583rwfpj4z5cwg2vfy4ha0pz4xs9g7li078rmk6x19haiv8s9fwijd82xgxax0afn8wk80bq5kd8yz38l9432f6bar8xnwb21y4i"; + sha512 = "06036nawpm987q33567nhz55qybbcl55h5rdhjbhck5qmyj1qi383xqac5niwyk7c0gaq4ygwc5a24pysf85crjdway2zmqyjxp2apb"; }; # from firefox, but without sound libraries diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 647b708e102..30491470392 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, python2 +{ stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkgconfig, python2 , boost, db, openssl, geoip, libiconv, miniupnpc , srcOnly, fetchgit }: @@ -17,12 +17,13 @@ let in stdenv.mkDerivation rec { pname = "twister"; - version = "0.9.34"; + version = "2019-08-19"; - src = fetchurl { - url = "https://github.com/miguelfreitas/twister-core/" - + "archive/v${version}.tar.gz"; - sha256 = "1bi8libivd9y2bn9fc7vbc5q0jnal0pykpzgri6anqaww22y58jq"; + src = fetchFromGitHub { + owner = "miguelfreitas"; + repo = "twister-core"; + rev = "31faf3f63e461ea0a9b23081567a4a552cf06873"; + sha256 = "0xh1lgnl9nd86jr0mp7m8bkd7r5j4d6chd0y73h2xv4aq5sld0sp"; }; configureFlags = [ @@ -40,12 +41,6 @@ in stdenv.mkDerivation rec { boostPython db openssl geoip miniupnpc libiconv ]; - patches = stdenv.lib.singleton (fetchpatch { - url = "https://github.com/miguelfreitas/twister-core/commit/" - + "dd4f5a176958ea6ed855dc3fcef79680c1c0c92c.patch"; - sha256 = "06fgmqnjyl83civ3ixiq673k8zjgm8n2w4w46nsh810nprqim8s6"; - }); - postPatch = '' sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \ src/init.cpp diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 60ea01ae451..a585e7f948b 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, qtgraphicaleffects, qtquickcontrols2, full -, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem, mkDerivation }: +, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, mkDerivation }: let - version = "1.1.6-1"; + version = "1.2.2-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -10,24 +10,13 @@ let To work, gnome-keyring service must be enabled. ''; - - desktopItem = makeDesktopItem { - name = "protonmail-bridge"; - exec = "protonmail-bridge"; - icon = "protonmail-bridge"; - comment = stdenv.lib.replaceStrings ["\n"] [" "] description; - desktopName = "ProtonMail Bridge"; - genericName = "ProtonMail Bridge for Linux"; - categories = "Utility;Security;Network;Email"; - }; - in mkDerivation { pname = "protonmail-bridge"; inherit version; src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "108dql9q5znsqjkrs41pc6psjbg5bz09rdmjl036xxbvsdvq4a8r"; + sha256 = "16hfa07wdqcns79395wjdglg2cjyblqgz1hx8rl15qm7n5f24ckl"; }; sourceRoot = "."; @@ -37,12 +26,10 @@ in mkDerivation { ''; installPhase = '' - mkdir -p $out/{bin,lib,share/applications} - mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + mkdir -p $out/{bin,lib,share} cp -r usr/lib/protonmail/bridge/protonmail-bridge $out/lib - cp usr/share/icons/protonmail/ProtonMail_Bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg - cp ${desktopItem}/share/applications/* $out/share/applications + cp -r usr/share $out ln -s $out/lib/protonmail-bridge $out/bin/protonmail-bridge ''; @@ -67,6 +54,10 @@ in mkDerivation { --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${rpath}" \ $out/lib/protonmail-bridge + + substituteInPlace $out/share/applications/ProtonMail_Bridge.desktop \ + --replace "/usr/" "$out/" \ + --replace "Exec=protonmail-bridge" "Exec=$out/bin/protonmail-bridge" ''; buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ]; diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index e79ca515b51..f426a7c3a58 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -28,12 +28,9 @@ in stdenv.mkDerivation rec { " echo \"Connecting...\"" \ " sed -ri 's@${expectedUpdateResolvPath}@${actualUpdateResolvePath}@g' \"\$openvpn_config\"; echo \"Connecting...\"" cp protonvpn-cli.sh "$out/bin/protonvpn-cli" - ln -s "$out/bin/protonvpn-cli" "$out/bin/pvpn" - ''; - - postInstallPhase = '' - wrapProgram $out/protonvpn-cli \ + wrapProgram $out/bin/protonvpn-cli \ --prefix PATH : ${lib.makeBinPath [ coreutils openvpn python dialog wget update-resolv-conf ]} + ln -s "$out/bin/protonvpn-cli" "$out/bin/pvpn" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix deleted file mode 100644 index 8d21f64765d..00000000000 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ /dev/null @@ -1,215 +0,0 @@ -{ stdenv -, lib -, fetchurl -, requireFile -, makeWrapper -, libredirect -, busybox -, file -, makeDesktopItem -, tzdata -, cacert -, glib -, gtk2 -, atk -, gdk-pixbuf -, cairo -, pango -, gnome3 -, xorg -, libpng12 -, freetype -, fontconfig -, gtk_engines -, alsaLib -, libidn -, zlib -, version ? "13.10.0" -}: - -let - # In 56e1bdc7f9c (libidn: 1.34 -> 1.35), libidn.so.11 became libidn.so.12. - # Citrix looks for the former so we build version 1.34 to please the binary - libidn_134 = libidn.overrideDerivation (_: rec { - name = "libidn-1.34"; - src = fetchurl { - url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; - }; - }); - - versionInfo = let - supportedVersions = { - "13.10.0" = { - major = "13"; - minor = "10"; - patch = "0"; - x64hash = "7025688C7891374CDA11C92FC0BA2FA8151AEB4C4D31589AD18747FAE943F6EA"; - x86hash = "2DCA3C8EDED11C5D824D579BC3A6B7D531EAEDDCBFB16E91B5702C72CAE9DEE4"; - x64suffix = "20"; - x86suffix = "20"; - homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; - }; - }; - - # break an evaluation for old Citrix versions rather than exiting with - # an "attribute name not found" error to avoid confusion. - deprecatedVersions = let - versions = [ "13.8.0" "13.9.0" "13.9.1" ]; - in - lib.listToAttrs - (lib.forEach versions - (v: lib.nameValuePair v (throw "Unsupported citrix_receiver version: ${v}"))); - in - deprecatedVersions // supportedVersions; - - citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }: - stdenv.mkDerivation rec { - pname = "citrix-receiver"; - version = "${major}.${minor}.${patch}"; - inherit homepage; - - prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; - - src = requireFile rec { - name = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz"; - sha256 = if stdenv.is64bit then x64hash else x86hash; - message = '' - In order to use Citrix Receiver, you need to comply with the Citrix EULA and download - the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: - - ${homepage} - - (if you do not find version ${version} there, try at - https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/ - or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux") - - Once you have downloaded the file, please use the following command and re-run the - installation: - - nix-prefetch-url file://\$PWD/${name} - ''; - }; - - dontBuild = true; - - sourceRoot = "."; - - buildInputs = [ - makeWrapper - busybox - file - gtk2 - gdk-pixbuf - ]; - - libPath = stdenv.lib.makeLibraryPath [ - glib - gtk2 - atk - gdk-pixbuf - cairo - pango - gnome3.dconf - xorg.libX11 - xorg.libXext - xorg.libXrender - xorg.libXinerama - xorg.libXfixes - libpng12 - libidn_134 - zlib - gtk_engines - freetype - fontconfig - alsaLib - stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null) - ]; - - desktopItem = makeDesktopItem { - name = "wfica"; - desktopName = "Citrix Receiver"; - genericName = "Citrix Receiver"; - exec = "wfica"; - icon = "wfica"; - comment = "Connect to remote Citrix server"; - categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; - mimeType = "application/x-ica"; - }; - - installPhase = '' - runHook preInstall - - export ICAInstDir="$out/opt/citrix-icaclient" - - sed -i \ - -e 's,^main_install_menu$,install_ICA_client,g' \ - -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \ - -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \ - -e 's,/bin/true,true,g' \ - ./${prefixWithBitness}/hinst - - # Run the installer... - bash ./${prefixWithBitness}/hinst CDROM "`pwd`" - - echo "Deleting broken links..." - for link in `find $ICAInstDir -type l ` - do - [ -f "$link" ] || rm -v "$link" - done - - echo "Expanding certificates..." - # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates - pushd "$ICAInstDir/keystore/cacerts" - awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt - popd - - echo "Patching executables..." - find $ICAInstDir -type f -exec file {} \; | - grep 'ELF.*executable' | - cut -f 1 -d : | - grep -vi '\(.dll\|.so\)$' | # added as a workaround to https://github.com/NixOS/nixpkgs/issues/41729 - while read f - do - echo "Patching ELF intrepreter and rpath for $f" - chmod u+w "$f" - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$ICAInstDir:$libPath" "$f" - done - - echo "Wrapping wfica..." - mkdir "$out/bin" - - makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ - --add-flags "-icaroot $ICAInstDir" \ - --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set LD_LIBRARY_PATH "$libPath" \ - --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone" - - echo "We arbitrarily set the timezone to UTC. No known consequences at this point." - echo UTC > "$ICAInstDir/timezone" - - echo "Installing desktop item..." - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - - # We introduce a dependency on the source file so that it need not be redownloaded everytime - echo $src >> "$out/share/nix_dependencies.pin" - - runHook postInstall - ''; - - meta = with stdenv.lib; { - license = stdenv.lib.licenses.unfree; - inherit homepage; - description = "Citrix Receiver"; - maintainers = with maintainers; [ obadz a1russell ma27 ]; - platforms = platforms.linux; - }; - }; - -in citrixReceiverForVersion (lib.getAttr version versionInfo) diff --git a/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix b/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix deleted file mode 100644 index 63587030b38..00000000000 --- a/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ citrix_receiver, extraCerts ? [], symlinkJoin }: - -let - - mkCertCopy = certPath: - "cp ${certPath} $out/opt/citrix-icaclient/keystore/cacerts/"; - -in - -if builtins.length extraCerts == 0 then citrix_receiver else symlinkJoin { - name = "citrix-with-extra-certs-${citrix_receiver.version}"; - paths = [ citrix_receiver ]; - - postBuild = '' - ${builtins.concatStringsSep "\n" (map mkCertCopy extraCerts)} - - sed -i -E "s,-icaroot (.+citrix-icaclient),-icaroot $out/opt/citrix-icaclient," $out/bin/wfica - ''; -} diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 3e93dcc4440..aa0870ea858 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.49.2"; + version = "1.49.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1a90fr7cw78qhwdgkjwshap345jk1ipm3nnk7xf3nayiyibvk5dg"; + sha256 = "0dd5xrbf62n4y77zzaai1rc069ism1ikvcw43hzja3mzwfa0sqqa"; }; modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03"; diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index af2fd82ddb0..97088f36041 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -57,6 +57,12 @@ let cp -r --no-preserve=mode $src/src/* $src/LICENSE $srcDir ''; + postPatch = '' + # django-cors-headers 3.x requires a scheme for allowed hosts + substituteInPlace $out/share/paperless/paperless/settings.py \ + --replace "localhost:8080" "http://localhost:8080" + ''; + buildPhase = let # Paperless has explicit runtime checks that expect these binaries to be in PATH extraBin = lib.makeBinPath [ imagemagick7 ghostscript optipng tesseract unpaper ]; diff --git a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix index c1e0f7da30f..465da386247 100644 --- a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix +++ b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub -, pytest, pytest-django, django }: +, pytest_4, pytest-django, django }: buildPythonPackage { pname = "django-crispy-forms"; @@ -19,7 +19,7 @@ buildPythonPackage { export sourceRoot=source- ''; - checkInputs = [ pytest pytest-django django ]; + checkInputs = [ pytest_4 pytest-django django ]; checkPhase = '' PYTHONPATH="$(pwd):$PYTHONPATH" \ diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index adbd4c30a39..79e4b8debc9 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { ''; propagatedBuildInputs = with python3Packages; [ - paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil + paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil setuptools ]; makeWrapperArgs = [ diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 2cd441794a4..3c5ae4c4b0a 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman, boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2, -podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools }: +podofo, poppler, poppler_data, python2, qtimageformats, qttools, harfbuzzFull }: let pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); @@ -20,7 +20,7 @@ mkDerivation rec { buildInputs = [ qtbase cairo pixman boost cups fontconfig freetype hunspell libjpeg libtiff libxml2 lcms2 podofo poppler - poppler_data pythonEnv harfbuzz qtimageformats qttools + poppler_data pythonEnv qtimageformats qttools harfbuzzFull ]; meta = { diff --git a/pkgs/applications/office/softmaker/desktop_items.nix b/pkgs/applications/office/softmaker/desktop_items.nix new file mode 100644 index 00000000000..6975da06456 --- /dev/null +++ b/pkgs/applications/office/softmaker/desktop_items.nix @@ -0,0 +1,42 @@ +{ makeDesktopItem, pname, suiteName }: + +{ + planmaker = makeDesktopItem { + name = "${pname}-planmaker"; + desktopName = "${suiteName} PlanMaker"; + icon = "${pname}-pml.png"; + categories = "Application;Office;SpreadSheet;"; + exec = "${pname}-planmaker %F"; + mimeType = "application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12;"; + extraEntries = '' + TryExec=${pname}-planmaker + StartupWMClass=pm + ''; + }; + + presentations = makeDesktopItem { + name = "${pname}-presentations"; + desktopName = "${suiteName} Presentations"; + icon = "${pname}-prl.png"; + categories = "Application;Office;Presentation;"; + exec = "${pname}-presentations %F"; + mimeType = "application/x-prdx;application/x-prvx;application/x-prsx;application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;"; + extraEntries = '' + TryExec=${pname}-presentations + StartupWMClass=pr + ''; + }; + + textmaker = makeDesktopItem { + name = "${pname}-textmaker"; + desktopName = "${suiteName} TextMaker"; + icon = "${pname}-tml.png"; + categories = "Application;Office;WordProcessor;"; + exec = "${pname}-textmaker %F"; + mimeType = "application/x-tmdx;application/x-tmvx;application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/x-pocket-word;application/x-dbf;application/msword-template;"; + extraEntries = '' + TryExec=${pname}-textmaker + StartupWMClass=tm + ''; + }; +} diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix new file mode 100644 index 00000000000..f3e37943bb6 --- /dev/null +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -0,0 +1,15 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "freeoffice"; + version = "970"; + edition = "2018"; + suiteName = "FreeOffice"; + + src = fetchurl { + url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz"; + sha256 = "1maibr4x8mksb32ixvyy2rjn4x9f51191p5fcdj5qwz32pf8h2dr"; + }; + + archive = "freeoffice${edition}.tar.lzma"; +}) diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix new file mode 100644 index 00000000000..9505271db14 --- /dev/null +++ b/pkgs/applications/office/softmaker/generic.nix @@ -0,0 +1,95 @@ +{ stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper + + # Dynamic Libraries +, curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender + +, pname, version, edition, suiteName, src, archive + +, ... +}: + +let + desktopItems = import ./desktop_items.nix { + inherit makeDesktopItem pname suiteName; + }; + shortEdition = builtins.substring 2 2 edition; +in stdenv.mkDerivation rec { + inherit pname version edition shortEdition src; + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ + curl + libGL + libX11 + libXext + libXmu + libXrandr + libXrender + stdenv.cc.cc.lib + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + runHook preUnpack + + mkdir installer + tar -C installer -xf ${src} + mkdir ${pname} + tar -C ${pname} -xf installer/${archive} + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + cp -r ${pname} $out/share/${pname}${edition} + + # Wrap rather than symlinking, so that the programs can determine + # their resource path. + mkdir -p $out/bin + makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker + makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations + makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker + + for size in 16 32 48 64 96 128 256 512 1024; do + mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps + + for app in pml prl tml; do + ln -s $out/share/${pname}${edition}/icons/''${app}_''${size}.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/${pname}-''${app}.png + done + + mkdir -p $out/share/icons/hicolor/''${size}x''${size}/mimetypes + + for mimetype in pmd prd tmd; do + ln -s $out/share/${pname}${edition}/icons/''${mimetype}_''${size}.png \ + $out/share/icons/hicolor/''${size}x''${size}/mimetypes/application-x-''${mimetype}.png + done + done + + # Add desktop items + ${desktopItems.planmaker.buildCommand} + ${desktopItems.presentations.buildCommand} + ${desktopItems.textmaker.buildCommand} + + # Add mime types + install -D -t $out/share/mime/packages ${pname}/mime/softmaker-*office*${shortEdition}.xml + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "An office suite with a word processor, spreadsheet and presentation program"; + homepage = "https://www.softmaker.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ danieldk ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix new file mode 100644 index 00000000000..26fe420d6a3 --- /dev/null +++ b/pkgs/applications/office/softmaker/softmaker_office.nix @@ -0,0 +1,15 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "softmaker-office"; + version = "970"; + edition = "2018"; + suiteName = "SoftMaker Office"; + + src = fetchurl { + url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; + sha256 = "14f94p1jms41s2iz5sa770rcyfp4mv01r6jjjis9amx37zrc8yid"; + }; + + archive = "office${edition}.tar.lzma"; +}) diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 450ee34262b..7c5c8f72440 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "todoman"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "051qjdpwif06x7qspnb4pfwdhb8nnmz99yqcp4kla5hv0n3jh0w9"; + sha256 = "1c0jh9bi2xfjc7w4kka68mygl00zkp2qxhffnipmfvvykfjmlhk0"; }; LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux @@ -19,7 +19,7 @@ buildPythonApplication rec { buildInputs = [ glibcLocales ]; propagatedBuildInputs = with python3.pkgs; - [ atomicwrites click click-log configobj humanize icalendar parsedatetime + [ atomicwrites click click-log click-repl configobj humanize icalendar parsedatetime python-dateutil pyxdg tabulate urwid ]; checkInputs = with python3.pkgs; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index d8ffbb74e6b..33e4de0d95a 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = http://www.htslib.org/; platforms = platforms.unix; - maintainers = [ maintainers.mimadrid ]; + maintainers = [ maintainers.mimame ]; }; } diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 412b55f5916..04699a84b69 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "A visualization tool for interactive exploration of genomic datasets"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = [ maintainers.mimadrid ]; + maintainers = [ maintainers.mimame ]; }; } diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index dd1a53472db..daa2925de7c 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = http://www.htslib.org/; platforms = platforms.unix; - maintainers = [ maintainers.mimadrid ]; + maintainers = [ maintainers.mimame ]; }; } diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 3d169f50104..f31dd0daa5c 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libGLU_combined zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs cairo curl openssl boost - swig python + swig (python.withPackages (ps: with ps; [ wxPython ])) ] ++ optional (oceSupport) opencascade ++ optional (ngspiceSupport) libngspice; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index a04ec0bb16c..99e9d856a71 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -28,7 +28,7 @@ let "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; "8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2"; - "8.10+beta2" = "0jk7pwydhd17ab7ii69zvi4sgrr630q2lsxhckaj3sz55cpjlhal"; + "8.10+beta3" = "08c7q97jyblsf7dhk8jf1fx1cp9qr3dr5s42wigx10wh7i6j7pca"; }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index ad82d7572e3..90b1b367a7c 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -104,9 +104,7 @@ stdenv.mkDerivation rec { description = "A free computer algebra system (CAS)"; homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; license = licenses.gpl3Plus; - ## xcas is buildable on darwin but there are specific instructions I could - ## not test - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.symphorien ]; }; } diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix index eecb37dd743..f407358d8f2 100644 --- a/pkgs/applications/science/math/lrcalc/default.nix +++ b/pkgs/applications/science/math/lrcalc/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = http://math.rutgers.edu/~asbuch/lrcalc/; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index bd116b02e29..e9c8b688fb9 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = ''Programs for computing automorphism groups of graphs and digraphs''; license = licenses.asl20; maintainers = with maintainers; [ raskin timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; homepage = http://pallini.di.uniroma1.it/; }; } diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 75a46bb182a..05c0c0e8ec6 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { homepage = http://pynac.org; license = licenses.gpl3; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index b4d82b9583c..d0625201a37 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1z2d32dcvdd66114j3km58xfk80hc5rd0zrh2fgz1azv8r4cqq1b"; + sha256 = "11q9f4p67ckbxd962jchgmwqnbp7v9ghix88c5hn3vaxvgwiw5hl"; }; patchPhase = '' diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index ccb139203ac..fccd1489e11 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { description = "A CAS for polynomial computations"; maintainers = with maintainers; [ raskin timokau ]; # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'` - platforms = subtractLists platforms.i686 platforms.linux; + platforms = subtractLists platforms.i686 platforms.unix; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = http://www.singular.uni-kl.de; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 90278a744f1..ec9ea0b8533 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://www.cs.waikato.ac.nz/ml/weka/; description = "Collection of machine learning algorithms for data mining tasks"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.mimadrid ]; + maintainers = [ stdenv.lib.maintainers.mimame ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 2e19012af87..8ed3deed804 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1mhsngbwbgdwl70wj7850zg94534lasihwv2ryifardm35mkh48k"; + sha256 = "125vgr8vqbmy2nsm1yl0h0q8p49lxxqfw5cmxzbx1caklcn4rryc"; }; buildInputs = [jre makeWrapper]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://www.cytoscape.org; description = "A general platform for complex network analysis and visualization"; license = stdenv.lib.licenses.lgpl21; - maintainers = [stdenv.lib.maintainers.mimadrid]; + maintainers = [stdenv.lib.maintainers.mimame]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index d9b5e170497..261ae3317f2 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,26 +1,32 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "git-lfs"; - version = "2.7.2"; - - goPackagePath = "github.com/git-lfs/git-lfs"; + version = "2.8.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "1nf40rbdz901vsahg5cm09pznpina6wimmxl0lmh8pn0mi51yzvc"; + sha256 = "17x9q4g1acf51bxr9lfmd2ym7w740n4ghdi0ncmma77kwabw9d3x"; }; + modSha256 = "1rjscc52rh8kxa64canw3baljllp1c639nsn89hs5b86c8v1jav7"; + + patches = [ + (fetchpatch { + # Build fails on v2.8.0 with go 1.13 due to invalid dependency version: + # go: github.com/git-lfs/go-ntlm@v0.0.0-20190307203151-c5056e7fa066: invalid pseudo-version: does not match version-control timestamp (2019-04-01T17:57:52Z) + # TODO: Remove once https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01 lands in a release. + url = "https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01.patch"; + sha256 = "17nmnlkknglqhzrky5caskbscrjp7kp9b5mfqznh1jx2hbxzlpbj"; + }) + ]; + + subPackages = [ "." ]; + preBuild = '' - pushd go/src/github.com/git-lfs/git-lfs go generate ./commands - popd - ''; - - postInstall = '' - rm -v $bin/bin/{man,script,cmd} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index b26548ebe99..0128eb9da2c 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "1.13.5.1"; + version = "1.13.6"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "13rp0fq76a6qlw60pnipkgfng25i0ygyk66y30jv7hy8ip4aa92n"; + sha256 = "1a12h84anf3sshkkcv30ljgibb35gmh01bmi6sicyhxbn1hrfi3w"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index fa93ff41a4a..0299d4ab48e 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "6.1.4"; + version = "6.2.0"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "10m6pwdwdxj6x64bc7mrvlvwkgqrd5prh9xx7xhvbz55q6gx4vdr"; + sha256 = "1kvp0fbixpynb0wh8px1qm6gnxwc5ml2q0vwsll0pa8zrjdz4q3k"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 168827c3548..5342a0697ab 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -60,6 +60,6 @@ python3.pkgs.buildPythonApplication rec { homepage = http://meldmerge.org/; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ jtojnar mimadrid ]; + maintainers = with maintainers; [ jtojnar mimame ]; }; } diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index a15a4cd5999..2e216369de9 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -2,10 +2,14 @@ # # Derivation patches HandBrake to use Nix closure dependencies. # +# NOTE: 2019-07-19: This derivation does not currently support the native macOS +# GUI--it produces the "HandbrakeCLI" CLI version only. In the future it would +# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that +# requires invoking the Xcode build system, which is non-trivial for now. { stdenv, lib, fetchurl, # Main build tools - python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, + python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, lzma, # Processing, video codecs, containers ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, # Codecs, audio @@ -14,20 +18,34 @@ libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, harfbuzz, # Optical media libdvdread, libdvdnav, libdvdcss, libbluray, - useGtk ? true, wrapGAppsHook ? null, - intltool ? null, - glib ? null, - gtk3 ? null, - libappindicator-gtk3 ? null, - libnotify ? null, - gst_all_1 ? null, - dbus-glib ? null, - udev ? null, - libgudev ? null, - hicolor-icon-theme ? null, + # Darwin-specific + AudioToolbox ? null, + Foundation ? null, + libobjc ? null, + VideoToolbox ? null, + # GTK + # NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus, + # which in turn depends on systemd. systemd is not supported on Darwin, so + # for now we disable GTK GUI support on Darwin. (It may be possible to remove + # this restriction later.) + useGtk ? !stdenv.isDarwin, wrapGAppsHook ? null, + intltool ? null, + glib ? null, + gtk3 ? null, + libappindicator-gtk3 ? null, + libnotify ? null, + gst_all_1 ? null, + dbus-glib ? null, + udev ? null, + libgudev ? null, + hicolor-icon-theme ? null, + # FDK useFdk ? false, fdk_aac ? null }: +assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null + && libobjc != null && VideoToolbox != null; + stdenv.mkDerivation rec { pname = "handbrake"; version = "1.2.2"; @@ -45,12 +63,13 @@ stdenv.mkDerivation rec { ffmpeg-full libogg libtheora x264 x265 libvpx libopus lame libvorbis a52dec speex libsamplerate libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz - libdvdread libdvdnav libdvdcss libbluray + libdvdread libdvdnav libdvdcss libbluray lzma ] ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev hicolor-icon-theme ] ++ lib.optional useFdk fdk_aac + ++ lib.optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, # look at ./make/configure.py search "enable_nvenc" ++ lib.optional stdenv.isLinux nv-codec-headers; @@ -59,13 +78,16 @@ stdenv.mkDerivation rec { # (default distribution bundles&builds 3rd party libs), # don't trigger cmake build dontUseCmakeConfigure = true; - enableParallelBuilding = true; + # cp: cannot create regular file './internal_defaults.json': File exists + enableParallelBuilding = false; preConfigure = '' patchShebangs scripts substituteInPlace libhb/module.defs \ --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 + substituteInPlace libhb/module.defs \ + --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 # Force using nixpkgs dependencies sed -i '/MODULES += contrib/d' make/include/main.defs @@ -75,8 +97,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-df-fetch" "--disable-df-verify" - (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk") - (if useFdk then "--enable-fdk-aac" else "") + (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk") + (if useFdk then "--enable-fdk-aac" else "") + (if stdenv.isDarwin then "--disable-xcode" else "") ]; # NOTE: 2018-12-27: Check NixOS HandBrake test if changing diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 04ddbbb8c06..af917981e1c 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { (enableFeature withGUI "qt") ]; + CXXFLAGS = optional stdenv.cc.isClang "-std=c++14"; + dontWrapQtApps = true; postFixup = optionalString withGUI '' wrapQtApp $out/bin/mkvtoolnix-gui diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 176c4be4946..3edee15db5f 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -7,13 +7,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; mkDerivation rec { pname = "shotcut"; - version = "19.08.16"; + version = "19.09.14"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "0alnnfgimfs8fjddkcfx4pzyijwz5dgnqic5qazaza6f4kf60801"; + sha256 = "1cl8ba1n0h450r4n5mfqmyjaxvczs3m19blwxslqskvmxy5my3cn"; }; enableParallelBuilding = true; @@ -30,13 +30,16 @@ mkDerivation rec { prePatch = '' sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp + sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp NICE=$(type -P nice) sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp + # Fix VAAPI auto-config: https://github.com/mltframework/shotcut/issues/771 + sed 's#"-vaapi_device" << ":0"#"-vaapi_device" << "/dev/dri/renderD128"#' -i src/docks/encodedock.cpp ''; qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" - "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2 ]}" + "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2]}" "--prefix PATH : ${mlt}/bin" ]; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 0d2d0278cc3..07b6d024990 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { project = "cri-o"; - version = "1.15.1"; + version = "1.15.2"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -26,7 +26,7 @@ buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "0yjj03qwwb6g05pzavimgj14p6805m3w8qqpl4fp4fpmbrsx4sb0"; + sha256 = "0fiizxwxdq87h943421ivgw49jndk23yjz3saf1rzmn7g3xh2pn4"; }; outputs = [ "bin" "out" ]; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index e7f6fad79f9..ad860b07bdf 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ cdrkit ] ++ kernel.moduleBuildDependencies; + postPatch = '' + substituteInPlace src/vboxguest-${version}/vboxvideo/vbox_ttm.c \ + --replace "<ttm/" "<drm/ttm/" + ''; + unpackPhase = '' ${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then '' isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index 042b01e8678..d3c2ed9060c 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -38,11 +38,11 @@ let in callPackage (import ./generic.nix (rec { - version = "4.10.0"; + version = "4.10.4"; src = fetchurl { url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; - sha256 = "0i38ap5b5m1kix6xb0vn9ya1yab35adyc98bzfnbq4lb7w1afqh2"; + sha256 = "0ipkr7b3v3y183n6nfmz7q3gnzxa20011df4jpvxi6pmr8cpnkwh"; }; # Sources needed to build tools and firmwares. @@ -52,12 +52,9 @@ callPackage (import ./generic.nix (rec { url = https://xenbits.xen.org/git-http/qemu-xen.git; # rev = "refs/tags/qemu-xen-${version}"; # use revision hash - reproducible but must be updated with each new version - rev = "b79708a8ed1b3d18bee67baeaf33b3fa529493e2"; - sha256 = "1yxxad6nvlfmrbgyc8ix19qmrsn1rx4zpyiqnfi4x4kg94acwa5w"; + rev = "qemu-xen-${version}"; + sha256 = "0laxvhdjz1njxjvq3jzw2yqvdr9gdn188kqjf2gcrfzgih7xv2ym"; }; - patches = [ - qemuMemfdBuildFix - ]; buildInputs = qemuDeps; postPatch = '' # needed in build but /usr/bin/env is not available in sandbox @@ -151,17 +148,16 @@ callPackage (import ./generic.nix (rec { ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; - patches = with xsa; flatten [ - XSA_252 - XSA_253 - XSA_255_1 - XSA_255_2 - XSA_256 + NIX_CFLAGS_COMPILE = [ + # Fix build on Glibc 2.24. + "-Wno-error=deprecated-declarations" + # Fix build with GCC 8 + "-Wno-error=maybe-uninitialized" + "-Wno-error=stringop-truncation" + "-Wno-error=format-truncation" + "-Wno-error=array-bounds" ]; - # Fix build on Glibc 2.24. - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - postPatch = '' # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror. sed 1i'#include <sys/sysmacros.h>' \ diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 1608fabf4b2..c7568d99062 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -167,8 +167,15 @@ callPackage (import ./generic.nix (rec { xenpmdpatch ]; - # Fix build on Glibc 2.24. - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = [ + # Fix build on Glibc 2.24 + "-Wno-error=deprecated-declarations" + # Fix build with GCC8 + "-Wno-error=maybe-uninitialized" + "-Wno-error=stringop-truncation" + "-Wno-error=format-truncation" + "-Wno-error=array-bounds" + ]; postPatch = '' # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror. diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix index de692820d8f..26cdbc1f65f 100644 --- a/pkgs/applications/virtualization/xen/xsa-patches.nix +++ b/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -66,30 +66,12 @@ in { sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f"; }); - # 4.8 - XSA_202 = (xsaPatch { - name = "202"; - sha256 = "0j1d5akcjgx8w2c6w6p9znv77fkmps0880m2xgpbgs1ra9grshm1"; - }); - - # 4.8 - XSA_203 = (xsaPatch { - name = "203"; - sha256 = "1s1q7xskvpg87ivwfaiqr0cj3ajdkhkhpmpikfkvq127h8hhmd8j"; - }); - # 4.5 XSA_204_45 = (xsaPatch { name = "204-4.5"; sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp"; }); - # 4.8 - XSA_204 = (xsaPatch { - name = "204-4.8"; - sha256 = "0rs498s4w2alz3h6jhlr2y0ni630vhggmxbrd1p1p3gcv8p6zzrr"; - }); - # 4.5 XSA_206_45 = [ (xsaPatch { @@ -190,86 +172,12 @@ in { }) ]; - # 4.8 - XSA_206 = [ - (xsaPatch { - name = "206-4.8/0001-xenstored-apply-a-write-transaction-rate-limit"; - sha256 = "1c81d93i3qx7l38f9af0sd84w5x51zvn262mzl25ilcklql4kzl6"; - }) - (xsaPatch { - name = "206-4.8/0002-xenstored-Log-when-the-write-transaction-rate-limit-"; - sha256 = "0b8iw409wi1x6p0swpnr51lcdlla1lgxjv5f910sj4wl96bca84q"; - }) - (xsaPatch { - name = "206-4.8/0003-oxenstored-comments-explaining-some-variables"; - sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p"; - }) - (xsaPatch { - name = "206-4.8/0004-oxenstored-handling-of-domain-conflict-credit"; - sha256 = "020rw7hgc0dmhr4admz91kd99b4z1bdpji47nsy1255bjgvwc01k"; - }) - (xsaPatch { - name = "206-4.8/0005-oxenstored-ignore-domains-with-no-conflict-credit"; - sha256 = "1ilhcgyn803bxvfbqv0ihfrh9jfpp0lidkv7i4613f9v9vjm8q0h"; - }) - (xsaPatch { - name = "206-4.8/0006-oxenstored-add-transaction-info-relevant-to-history-"; - sha256 = "1dbd9pzda6hn9wj9pck44dlgz9nxvch3bzgrpaivanww8llxdfzz"; - }) - (xsaPatch { - name = "206-4.8/0007-oxenstored-support-commit-history-tracking"; - sha256 = "1jfr56c22fqkhj6fnv1ha7zsid86zm9l0nihpb8m932xgc4a6h9h"; - }) - (xsaPatch { - name = "206-4.8/0008-oxenstored-only-record-operations-with-side-effects-"; - sha256 = "1y845hj8krjdrirbd2jx4jqgnylwjv7bxnk7474lkld5kdnlbjyf"; - }) - (xsaPatch { - name = "206-4.8/0009-oxenstored-discard-old-commit-history-on-txn-end"; - sha256 = "1lcr9gz2b77x74sr1flfymyyz4xzs04iv88rc1633ibyqxmvk0lx"; - }) - (xsaPatch { - name = "206-4.8/0010-oxenstored-track-commit-history"; - sha256 = "1qwnivak4y038mpby75aaz0y70r0l3yc3hsz6wl5x0b74q6yy0ja"; - }) - (xsaPatch { - name = "206-4.8/0011-oxenstored-blame-the-connection-that-caused-a-transa"; - sha256 = "0p2w5ddyhc6d95dnlxzc5k77j063p02d53ab7m7ijfm7m6gknq8y"; - }) - (xsaPatch { - name = "206-4.8/0012-oxenstored-allow-self-conflicts"; - sha256 = "1571l81m30cbmqm4pk33q33p3dy58sfy2lnkl2wbgl2b3mkk657l"; - }) - (xsaPatch { - name = "206-4.8/0013-oxenstored-do-not-commit-read-only-transactions"; - sha256 = "15985wl635w22dddjyx5l97b5p6m55mzv5ygk7xr0jx7mi192f9x"; - }) - (xsaPatch { - name = "206-4.8/0014-oxenstored-don-t-wake-to-issue-no-conflict-credit"; - sha256 = "08672w4gaf2n3r8xy09h874gh5lg2vnrkjzq6xzvzdhdl092mipw"; - }) - (xsaPatch { - name = "206-4.8/0015-oxenstored-transaction-conflicts-improve-logging"; - sha256 = "0ck98ms0py8wjsc38pbx6222x7n6l90zckfa7m7nnszsyc0sxxad"; - }) - (xsaPatch { - name = "206-4.8/0016-oxenstored-trim-history-in-the-frequent_ops-function"; - sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8"; - }) - ]; - # 4.5 - 4.8 XSA_207 = (xsaPatch { name = "207"; sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc"; }); - # 4.8 - XSA_210 = (xsaPatch { - name = "210"; - sha256 = "02mykxqxnsrd0sr4ij022j8y7618wzi2a6j6j761vx8qgmh11xai"; - }); - # 4.5 - 4.8 XSA_212 = (xsaPatch { name = "212"; @@ -282,12 +190,6 @@ in { sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm"; }); - # 4.8 - XSA_213 = (xsaPatch { - name = "213-4.8"; - sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2"; - }); - # 4.5 - 4.8 XSA_214 = (xsaPatch { name = "214"; @@ -306,12 +208,6 @@ in { sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4"; }); - # 4.6 - 4.8 - XSA_217 = (xsaPatch { - name = "217"; - sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj"; - }); - # 4.5 XSA_218_45 = [ (xsaPatch { @@ -332,46 +228,18 @@ in { }) ]; - # 4.8 - XSA_218 = [ - (xsaPatch { - name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race"; - sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd"; - }) - (xsaPatch { - name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry"; - sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc"; - }) - (xsaPatch { - name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses"; - sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9"; - }) - ]; - # 4.5 XSA_219_45 = (xsaPatch { name = "219-4.5"; sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm"; }); - # 4.8 - XSA_219 = (xsaPatch { - name = "219-4.8"; - sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq"; - }); - # 4.5 XSA_220_45 = (xsaPatch { name = "220-4.5"; sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp"; }); - # 4.8 - XSA_220 = (xsaPatch { - name = "220-4.8"; - sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5"; - }); - # 4.5 - 4.8 XSA_221 = (xsaPatch { name = "221"; @@ -390,18 +258,6 @@ in { }) ]; - # 4.8 - XSA_222 = [ - (xsaPatch { - name = "222-1"; - sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2"; - }) - (xsaPatch { - name = "222-2-4.8"; - sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin"; - }) - ]; - # 4.5 - 4.8 XSA_223 = (xsaPatch { name = "223"; @@ -428,32 +284,6 @@ in { }) ]; - # 4.8 - XSA_224 = [ - (xsaPatch { - name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; - sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4"; - }) - (xsaPatch { - name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to"; - sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck"; - }) - (xsaPatch { - name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m"; - sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2"; - }) - (xsaPatch { - name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; - sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f"; - }) - ]; - - # 4.6 - 4.8 - XSA_225 = (xsaPatch { - name = "225"; - sha256 = "0lcp2bs0r849xnvhrdf8s821v36cqdbzk8lwz6chrjhjalk6ha2g"; - }); - # 4.5 XSA_226_45 = [ (xsaPatch { @@ -466,42 +296,12 @@ in { }) ]; - # 4.8 - 4.9 - XSA_226 = [ - (xsaPatch { - name = "226-4.9/0001-gnttab-dont-use-possibly-unbounded-tail-calls"; - sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg"; - }) - (xsaPatch { - name = "226-4.9/0002-gnttab-fix-transitive-grant-handling"; - sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc"; - }) - ]; - # 4.5 XSA_227_45 = (xsaPatch { name = "227-4.5"; sha256 = "1qfjfisgqm4x98qw54x2qrvgjnvvzizx9p1pjhcnsps9q6g1y3x8"; }); - # 4.8 - 4.9 - XSA_227 = (xsaPatch { - name = "227"; - sha256 = "0zdcm43i5n08rh7rrnb0fcssvd4fgawwmizsa16w2ak7pzvgmg94"; - }); - - # 4.8 - XSA_228_48 = (xsaPatch { - name = "228-4.8"; - sha256 = "085pnzwyv0rdb51hv5vhbhwfyxl0wg8sxcm912gjq8z7da5cv10n"; - }); - - # 4.9 - XSA_228 = (xsaPatch { - name = "228"; - sha256 = "0c9nvfpnr5ira7ha3fszhvvh71nsxrvmzrab56xwjhl2dbw2yy23"; - }); - # 4.5 - 4.9 XSA_230 = (xsaPatch { name = "230"; @@ -514,12 +314,6 @@ in { sha256 = "06gwx2f1lg51dfk2b4zxp7wv9c4pxdi87pg2asvmxqc78ir7l5s6"; }); - # 4.8 - 4.9 - XSA_231 = (xsaPatch { - name = "231-4.9"; - sha256 = "09r8xxq2fd52wrk6i0y0sk3nbidfg6pzzrkx327hfmdjj76iyz3b"; - }); - # 4.5 - 4.9 XSA_232 = (xsaPatch { name = "232"; @@ -538,42 +332,18 @@ in { sha256 = "1ji6hbgybb4gbgz5l5fis9midnvjbddzam8d63377rkzdyb3yz9f"; }); - # 4.8 - XSA_234_48 = (xsaPatch { - name = "234-4.8"; - sha256 = "08n1pf7z5y67dmay1ap39bi81clgkx82fpmfn7jsh8k4aw94jrsa"; - }); - - # 4.9 - XSA_234 = (xsaPatch { - name = "234-4.9"; - sha256 = "1znmxg432is0virw8321gax8zqq2zcmi2pc5p2j31sixylixsvzx"; - }); - # 4.5 XSA_235_45 = (xsaPatch { name = "235-4.5"; sha256 = "0hhgnql2gji111020z4wiyzg23wqs6ymanb67rg11p4qad1fp3ff"; }); - # 4.8 - 4.9 - XSA_235 = (xsaPatch { - name = "235-4.9"; - sha256 = "1rj4jkmh79wm30jq9f8x65qv3al8l91zc3m5s23q0x6abn3pfb9z"; - }); - # 4.5 XSA_236_45 = (xsaPatch { name = "236-4.5"; sha256 = "0hcla86x81wykssd2967gblp7fzx61290p4ls4v0hcyxdg2bs2yz"; }); - # 4.8 - 4.9 - XSA_236 = (xsaPatch { - name = "236-4.9"; - sha256 = "0vqxy7mgflga05l33j3488fwxmdw3p9yxj4ylhk9n3nw8id72ghq"; - }); - # 4.5 XSA_237_45 = [ (xsaPatch { @@ -598,78 +368,18 @@ in { }) ]; - # 4.8 - XSA_237_48 = [ - (xsaPatch { - name = "237-4.8/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; - sha256 = "0qjisp37lwi2611mp7fbbm1s7m0bx726rrg79dnxs2mj0skw59iv"; - }) - (xsaPatch { - name = "237-4.8/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; - sha256 = "05q1dny13jrqhjfwak7r635mqp9chpibjvn8b7d90japc1nzpq62"; - }) - (xsaPatch { - name = "237-4.8/0003-x86-MSI-disallow-redundant-enabling"; - sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd"; - }) - (xsaPatch { - name = "237-4.8/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; - sha256 = "06nrq0bx3p9ipab2r1why6qm4g32dj0x5q24hfkwc6ih0l9xwf8h"; - }) - (xsaPatch { - name = "237-4.8/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; - sha256 = "1nbg7bjw2hv55gnkhf6chkh35va6brs08acq1d5jxncl6kv0amc1"; - }) - ]; - - # 4.9 - XSA_237 = [ - (xsaPatch { - name = "237-4.9/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; - sha256 = "1cbl24mqxa62h0wgsnrpcs6y6vs53znzj7g8dfsbmf74xwrd4px6"; - }) - (xsaPatch { - name = "237-4.9/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; - sha256 = "0p60148j18b78pxz0dx5ymh1gyrhg2cgmxq0jxmbk090bc4jql35"; - }) - (xsaPatch { - name = "237-4.9/0003-x86-MSI-disallow-redundant-enabling"; - sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd"; - }) - (xsaPatch { - name = "237-4.9/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; - sha256 = "0q95z5641amni53agimnzbspva53p0hz5wl16zaz2yhnjasj5pzr"; - }) - (xsaPatch { - name = "237-4.9/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; - sha256 = "0bnqx9w7ppgx8wxj2zw09z0rkv1jzn3r0bd76cz0r22wz29fsdp2"; - }) - ]; - # 4.5 XSA_238_45 = (xsaPatch { name = "238-4.5"; sha256 = "1x2fg5vfv5jc084h5gjm6fq0nxjpzvi96px3sqzz4pvsvy4y4i1z"; }); - # 4.8 - 4.9 - XSA_238 = (xsaPatch { - name = "238"; - sha256 = "1cbmg1bi5ajh7qbwsl92ynaxw2c3p7i24p3wds81r4n93r0y5dxk"; - }); - # 4.5 XSA_239_45 = (xsaPatch { name = "239-4.5"; sha256 = "06bi8q3973yajxsdj7pcqarvb56q2gisxdiy0cpbyffbmpkfv3h6"; }); - # 4.8 - 4.9 - XSA_239 = (xsaPatch { - name = "239"; - sha256 = "1a9r8j7167s43ds5i7v7mm4y970vjnbhhkrjzpmzlcx8kcz96vh3"; - }); - # 4.5 XSA_240_45 = [ (xsaPatch { @@ -682,42 +392,12 @@ in { }) ]; - # 4.8 - XSA_240_48 = [ - (xsaPatch { - name = "240-4.8/0001-x86-limit-linear-page-table-use-to-a-single-level"; - sha256 = "0m44qhhqk2pdwqg8g28pypqrylq6iw00k9qrzf6qd0iza2y42kgj"; - }) - (xsaPatch { - name = "240-4.8/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; - sha256 = "1jd720wvngj9wq3fprdhakxvqlff0jd8zcx2pd3vsn2qvjbvr2gf"; - }) - ]; - - # 4.9 - XSA_240 = [ - (xsaPatch { - name = "240-4.9/0001-x86-limit-linear-page-table-use-to-a-single-level"; - sha256 = "1759ni80aifakm44g4cc6pnmbcn1xjic8j66fvj0vibm0wqk6xck"; - }) - (xsaPatch { - name = "240-4.9/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; - sha256 = "0g6dpi006p5cjxw5d8h33p0429fdmdm6nqzj0m63ralpqvns3ib5"; - }) - ]; - # 4.5 - 4.8 XSA_241 = (xsaPatch { name = "241-4.8"; sha256 = "16zb75kzs98f4mdxhbyczk5mbh9dvn6j3yhfafki34x1dfdnq4pj"; }); - # 4.9 - XSA_241_49 = (xsaPatch { - name = "241-4.9"; - sha256 = "0xlhin7wkhmlnbp9mqcbq3q4drdwb5la482ja9nwkhi8i867p6wc"; - }); - # 4.5 - 4.9 XSA_242 = (xsaPatch { name = "242-4.9"; @@ -736,30 +416,12 @@ in { }) ]; - # 4.8 - XSA_243_48 = (xsaPatch { - name = "243-4.8"; - sha256 = "1q60zn55l9wpq45nrxh0av59sjz0jg8pkjm1gkyywkdsgg4fg5z4"; - }); - - # 4.9 - XSA_243 = (xsaPatch { - name = "243"; - sha256 = "06fnbnh9zlsbkqih9ipnb7a8gly54m7lp17d854j1r370ad3c4yg"; - }); - # 4.5 XSA_244_45 = (xsaPatch { name = "244-4.5"; sha256 = "05ci3vdl1ywfjpzcvsy1k52whxjk8pxzj7dh3r94yqasr56i5v2l"; }); - # 4.8 - 4.9 - XSA_244 = (xsaPatch { - name = "244"; - sha256 = "10308xsgmhb0vg6fk0ql8v94zifv6dcv6vkaicryfp405yj2rzkm"; - }); - # 4.5 - 4.9 XSA_245 = [ (xsaPatch { @@ -780,26 +442,6 @@ in { }) ]; - # 4.8 - 4.9 - XSA_246 = [ - (xsaPatch { - name = "246-4.9"; - sha256 = "0z68vm0z5zvv9gm06pxs9kxq2q9fdbl0l0cm71ggzdplg1vw0snz"; - }) - ]; - - # 4.8 - XSA_247_48 = [ - (xsaPatch { - name = "247-4.8/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu"; - sha256 = "0kvjrk90n69s721c2qj2df5raml3pjk6bg80aig353p620w6s3xh"; - }) - (xsaPatch { - name = "247-4.8/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas"; - sha256 = "1s9kv6h6dd8psi5qf5l5gpk9qhq8blckwhl76cjbldcgi6imb3nr"; - }) - ]; - # 4.5 XSA_247_45 = [ (xsaPatch { @@ -820,14 +462,6 @@ in { }) ]; - # 4.8 - XSA_248_48 = [ - (xsaPatch { - name = "248-4.8"; - sha256 = "1ycw29q22ymxg18kxpr5p7vhpmp8klssbp5gq77hspxzz2mb96q1"; - }) - ]; - # 4.5 .. 4.9 XSA_249 = [ (xsaPatch { @@ -835,6 +469,7 @@ in { sha256 = "0v6ngzqhkz7yv4n83xlpxfbkr2qyg5b1cds7ikkinm86hiqy6agl"; }) ]; + # 4.5 XSA_250_45 = [ (xsaPatch { @@ -842,13 +477,7 @@ in { sha256 = "0pqldl6qnl834gvfp90z247q9xcjh3835s2iffnajz7jhjb2145d"; }) ]; - # 4.8 ... - XSA_250 = [ - (xsaPatch { - name = "250"; - sha256 = "1wpigg8kmha57sspqqln3ih9nbczsw6rx3v72mc62lh62qvwd7x8"; - }) - ]; + # 4.5 XSA_251_45 = [ (xsaPatch { @@ -856,81 +485,4 @@ in { sha256 = "0lc94cx271z09r0mhxaypyd9d4740051p28idf5calx5228dqjgm"; }) ]; - # 4.8 - XSA_251_48 = [ - (xsaPatch { - name = "251-4.8"; - sha256 = "079wi0j6iydid2zj7k584w2c393kgh588w7sjz2nn4039qn8k9mq"; - }) - ]; - # 4.8 - XSA_252_49 = [ - (xsaPatch { - name = "252-4.9"; - sha256 = "03sbn90nlkk5ba1n168rxjkc7x3mqj7rfqvspbwblmwikfbnms2n"; - }) - ]; - # 4.8 - XSA_255_49_1= [ - (xsaPatch { - name = "255-4.9-1"; - sha256 = "0gbin7yxbkq40lvm3gvj1vffavvbng3zpd2m8l1kqyz0rv4vm9zc"; - }) - ]; - # 4.8 - XSA_255_49_2= [ - (xsaPatch { - name = "255-4.9-2"; - sha256 = "0fyg5nnyfpfr80qq83pr64zjp5w1nx94bdblzsjap8gaqcahyr12"; - }) - ]; - # 4.8 - XSA_256_48= [ - (xsaPatch { - name = "256-4.8"; - sha256 = "1w84f717kxwx0h3rw18r4f8pl0l1h5xlj5fy80sr0ws4xkp1qdn4"; - }) - ]; - - - # 4.10 - XSA_252 = [ - (xsaPatch { - name = "252"; - sha256 = "0v4sg20dnvnwrjh3x69gk81v2kmcql7g2s044vg3wcxhzvij1rrn"; - }) - ]; - - # 4.10 - XSA_253 = [ - (xsaPatch { - name = "253"; - sha256 = "0445vzlzy3gd499xraqh5r4qjar6qr0y3813h22jy1n84nhxz27i"; - }) - ]; - - # 4.10 - XSA_255_1 = [ - (xsaPatch { - name = "255-1"; - sha256 = "05g2f3ji1rrjlw3yw4nrns50pnmsib8ybrf64scr1817mj0q9myr"; - }) - ]; - - # 4.10 - XSA_255_2 = [ - (xsaPatch { - name = "255-2"; - sha256 = "08wbngw5z0f9g8di59hww3hhi7j9z49bpc4xlwn5akfcwbgf0961"; - }) - ]; - - # 4.10 - XSA_256 = [ - (xsaPatch { - name = "256"; - sha256 = "1hicwhbwj6k25px55f4ncx1c5xiihi8pfvsb3kv57k7kaicb7pza"; - }) - ]; - } diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 1f84403c10f..9e55d1172cb 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -189,6 +189,7 @@ rec { # libraries not on the upstream include list, but nevertheless expected # by at least one appimage libtool.lib # for Synfigstudio + at-spi2-core ]; }; } diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 83e21c8945d..37b25232b96 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1,4 +1,5 @@ { + buildPackages, cacert, callPackage, closureInfo, @@ -47,7 +48,7 @@ rec { , imageDigest , sha256 , os ? "linux" - , arch ? "amd64" + , arch ? buildPackages.go.GOARCH # This is used to set name to the pulled image , finalImageName ? imageName @@ -540,7 +541,7 @@ rec { configJson = let pure = writeText "${baseName}-config.json" (builtins.toJSON { inherit created config; - architecture = "amd64"; + architecture = buildPackages.go.GOARCH; os = "linux"; }); impure = runCommand "${baseName}-standard-dynamic-date.json" @@ -658,7 +659,7 @@ rec { baseJson = let pure = writeText "${baseName}-config.json" (builtins.toJSON { inherit created config; - architecture = "amd64"; + architecture = buildPackages.go.GOARCH; os = "linux"; }); impure = runCommand "${baseName}-config.json" diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index ce1bf800276..4634d32f6ac 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -86,6 +86,10 @@ stdenv.mkDerivation (args // { ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' [target."${rustHostConfig}"] "linker" = "${ccForHost}" + ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633 + stdenv.lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' + "rustflags" = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ] + ''} ''} EOF diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 371ab13c528..335cab7c45e 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -719,7 +719,7 @@ rec { { name, fullName, size ? 4096, urlPrefix , packagesList ? "", packagesLists ? [packagesList] , packages, extraPackages ? [], postInstall ? "" - , extraDebs ? [] + , extraDebs ? [], createRootFS ? defaultCreateRootFS , QEMU_OPTS ? "", memSize ? 512 }: let @@ -729,7 +729,7 @@ rec { }; in (fillDiskWithDebs { - inherit name fullName size postInstall QEMU_OPTS memSize; + inherit name fullName size postInstall createRootFS QEMU_OPTS memSize; debs = import expr {inherit fetchurl;} ++ extraDebs; }) // {inherit expr;}; diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix index e9f4fbd4867..1fffbd9dcb1 100644 --- a/pkgs/data/fonts/agave/default.nix +++ b/pkgs/data/fonts/agave/default.nix @@ -2,18 +2,18 @@ let pname = "agave"; - version = "10"; + version = "14"; in fetchurl { name = "${pname}-${version}"; - url = "https://github.com/agarick/agave/releases/download/v${version}/agave-r.ttf"; + url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf"; downloadToTemp = true; recursiveHash = true; postFetch = '' - install -D $downloadedFile $out/share/fonts/truetype/agave-r.ttf + install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf ''; - sha256 = "1mfj6a9sp00mjz7420yyrbbs5bqks3fz2slwgcppklxnz0890r9f"; + sha256 = "14hr6cdn5xbfpszj4qyfqbwmjyrkmi83yl0g9j3y3jw561jwy27j"; meta = with lib; { description = "truetype monospaced typeface designed for X environments"; diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index 589acbcee5c..33e7283147a 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.7"; + version = "3.10"; in fetchzip { name = "inter-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "1ja1v3605vp09azpabgmk710kic85zxwi4kksmqj9z805fmxddp6"; + sha256 = "029fjpgdml8qx2cqn4rnh2xm3z4cnh74jlzjb8pbfm2azsnvi6r1"; meta = with lib; { homepage = https://rsms.me/inter/; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index f7fce315e8c..4864edde71d 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,5 +1,5 @@ { - stdenv, lib, + stdenv, lib, pkgs, fetchFromGitHub, fetchurl, nodejs, ttfautohint-nox, otfcc, @@ -8,7 +8,9 @@ design ? [], upright ? [], italic ? [], oblique ? [], family ? null, weights ? [], # Custom font set name. Required if any custom settings above. - set ? null + set ? null, + # Extra parameters. Can be used for ligature mapping. + extraParameters ? null }: assert (design != []) -> set != null; @@ -19,38 +21,43 @@ assert (family != null) -> set != null; assert (weights != []) -> set != null; let - installPackageLock = import ./package-lock.nix { inherit fetchurl lib; }; + system = builtins.currentSystem; + nodePackages = import ./node-packages.nix { inherit pkgs system nodejs; }; in let pname = if set != null then "iosevka-${set}" else "iosevka"; in let - version = "1.14.3"; + version = "2.3.0"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "be5invis"; repo ="Iosevka"; rev = "v${version}"; - sha256 = "0ba8hwxi88bp2jb9xfhk95nnlv8ykl74cv62xr4ybzm3b8ahpwqf"; + sha256 = "1qnbxhx9wvij9zia226mc3sy8j7bfsw5v1cvxvsbbwjskwqdamvv"; }; in with lib; -let unwords = concatStringsSep " "; in +let quote = str: "\"" + str + "\""; in +let toTomlList = list: "[" + (concatMapStringsSep ", " quote list) +"]"; in +let unlines = concatStringsSep "\n"; in let param = name: options: - if options != [] then "${name}='${unwords options}'" else null; - config = unwords (lib.filter (x: x != null) [ + if options != [] then "${name}=${toTomlList options}" else null; + config = unlines (lib.filter (x: x != null) [ + "[buildPlans.${pname}]" (param "design" design) (param "upright" upright) (param "italic" italic) (param "oblique" oblique) - (if family != null then "family='${family}'" else null) + (if family != null then "family=\"${family}\"" else null) (param "weights" weights) ]); - custom = design != [] || upright != [] || italic != [] || oblique != [] - || family != null || weights != []; + installNodeModules = unlines (lib.mapAttrsToList + (name: value: "mkdir -p node_modules/${name}\n cp -r ${value.outPath}/lib/node_modules/. node_modules") + nodePackages); in stdenv.mkDerivation { @@ -58,33 +65,25 @@ stdenv.mkDerivation { nativeBuildInputs = [ nodejs ttfautohint-nox otfcc ]; - passAsFile = [ "installPackageLock" ]; - installPackageLock = installPackageLock ./package-lock.json; - - preConfigure = '' - HOME=$TMPDIR - source "$installPackageLockPath"; - npm --offline rebuild - ''; + passAsFile = [ "config" "extraParameters" ]; + config = config; + extraParameters = extraParameters; configurePhase = '' - runHook preConfigure - - ${optionalString custom ''make custom-config set=${set} ${config}''} - - runHook postConfigure + mkdir -p node_modules/.bin + ${installNodeModules} + ${optionalString (set != null) ''mv "$configPath" private-build-plans.toml''} + ${optionalString (extraParameters != null) ''cat "$extraParametersPath" >> parameters.toml''} ''; - makeFlags = lib.optionals custom [ "custom" "set=${set}" ]; + buildPhase = '' + npm run build -- ttf::${pname} + ''; installPhase = '' - runHook preInstall - fontdir="$out/share/fonts/$pname" install -d "$fontdir" install "dist/$pname/ttf"/* "$fontdir" - - runHook postInstall ''; enableParallelBuilding = true; @@ -98,6 +97,6 @@ stdenv.mkDerivation { ''; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan jfrankenau ttuegel ]; + maintainers = with maintainers; [ cstrahan jfrankenau ttuegel babariviere ]; }; } diff --git a/pkgs/data/fonts/iosevka/generate.sh b/pkgs/data/fonts/iosevka/generate.sh new file mode 100644 index 00000000000..e7d675b9e76 --- /dev/null +++ b/pkgs/data/fonts/iosevka/generate.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +node2nix --nodejs-10 --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ./../../../development/node-packages/node-env.nix diff --git a/pkgs/data/fonts/iosevka/node-packages-generated.nix b/pkgs/data/fonts/iosevka/node-packages-generated.nix new file mode 100644 index 00000000000..310e0161628 --- /dev/null +++ b/pkgs/data/fonts/iosevka/node-packages-generated.nix @@ -0,0 +1,4257 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "@babel/code-frame-7.5.5" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz"; + sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw=="; + }; + }; + "@babel/highlight-7.5.0" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz"; + sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ=="; + }; + }; + "JSONStream-1.3.5" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz"; + sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ=="; + }; + }; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + }; + "acorn-7.0.0" = { + name = "acorn"; + packageName = "acorn"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz"; + sha512 = "PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ=="; + }; + }; + "acorn-jsx-5.0.2" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz"; + sha512 = "tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw=="; + }; + }; + "ajv-6.10.2" = { + name = "ajv"; + packageName = "ajv"; + version = "6.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; + sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; + }; + }; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + }; + "ansi-escapes-3.2.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; + "ansi-regex-4.1.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; + "are-we-there-yet-1.1.5" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "astral-regex-1.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; + sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "atob-2.1.2" = { + name = "atob"; + packageName = "atob"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.8.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; + "bezier-js-2.4.3" = { + name = "bezier-js"; + packageName = "bezier-js"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.4.3.tgz"; + sha512 = "qAz1iAGoSE+kk5guAMyvoUgfHq+e5JwK5jRHh2/tuk4XDRUuECrrHLouN27jAzjhlJD2vAsBHofCi5sOn1jcbQ=="; + }; + }; + "bindings-1.5.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; + }; + }; + "bluebird-3.5.5" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz"; + sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "bufferstreams-2.0.1" = { + name = "bufferstreams"; + packageName = "bufferstreams"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-2.0.1.tgz"; + sha512 = "ZswyIoBfFb3cVDsnZLLj2IDJ/0ppYdil/v2EGlZXvoefO689FokEmFEldhN5dV7R2QBxFneqTJOMIpfqhj+n0g=="; + }; + }; + "callsites-3.1.0" = { + name = "callsites"; + packageName = "callsites"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; + "chardet-0.7.0" = { + name = "chardet"; + packageName = "chardet"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; + }; + }; + "child-process-promise-2.2.1" = { + name = "child-process-promise"; + packageName = "child-process-promise"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz"; + sha1 = "4730a11ef610fad450b8f223c79d31d7bdad8074"; + }; + }; + "chownr-1.1.2" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz"; + sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="; + }; + }; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; + "cli-width-2.2.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + }; + }; + "clipper-lib-1.0.0" = { + name = "clipper-lib"; + packageName = "clipper-lib"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz"; + sha1 = "e902ceb26e28ee5cfa6014abdf790a51efff4ecb"; + }; + }; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + }; + "cliui-4.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; + sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; + }; + }; + "cliui-5.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; + }; + }; + "clone-2.1.2" = { + name = "clone"; + packageName = "clone"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; + sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "combined-stream-1.0.8" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; + }; + }; + "complex.js-2.0.11" = { + name = "complex.js"; + packageName = "complex.js"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/complex.js/-/complex.js-2.0.11.tgz"; + sha512 = "6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "cross-spawn-4.0.2" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; + sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + }; + }; + "cross-spawn-5.1.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + }; + }; + "cross-spawn-6.0.5" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "6.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + }; + }; + "css-2.2.4" = { + name = "css"; + packageName = "css"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css/-/css-2.2.4.tgz"; + sha512 = "oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw=="; + }; + }; + "css-parse-2.0.0" = { + name = "css-parse"; + packageName = "css-parse"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz"; + sha1 = "a468ee667c16d81ccf05c58c38d2a97c780dbfd4"; + }; + }; + "cubic2quad-1.1.1" = { + name = "cubic2quad"; + packageName = "cubic2quad"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz"; + sha1 = "69b19c61a3f5b41ecf2f1d5fae8fb03415aa8b15"; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + }; + }; + "debug-4.1.1" = { + name = "debug"; + packageName = "debug"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "decimal.js-10.2.0" = { + name = "decimal.js"; + packageName = "decimal.js"; + version = "10.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz"; + sha512 = "vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw=="; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "doctrine-3.0.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; + "end-of-stream-1.4.1" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; + sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; + }; + }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "escape-latex-1.2.0" = { + name = "escape-latex"; + packageName = "escape-latex"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz"; + sha512 = "nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw=="; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "escodegen-1.12.0" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz"; + sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg=="; + }; + }; + "escodegen-1.3.3" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; + sha1 = "f024016f5a88e046fd12005055e939802e6c5f23"; + }; + }; + "escope-1.0.3" = { + name = "escope"; + packageName = "escope"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz"; + sha1 = "759dce8496c4248fec2d0caaf4108bcf3f1a7f5d"; + }; + }; + "eslint-scope-5.0.0" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz"; + sha512 = "oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw=="; + }; + }; + "eslint-utils-1.4.2" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz"; + sha512 = "eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q=="; + }; + }; + "eslint-visitor-keys-1.1.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; + sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="; + }; + }; + "esmangle-1.0.1" = { + name = "esmangle"; + packageName = "esmangle"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz"; + sha1 = "d9bb37b8f8eafbf4e6d4ed6b7aa2956abbd3c4c2"; + }; + }; + "espree-6.1.1" = { + name = "espree"; + packageName = "espree"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz"; + sha512 = "EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ=="; + }; + }; + "esprima-1.1.1" = { + name = "esprima"; + packageName = "esprima"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; + sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; + }; + }; + "esprima-3.1.3" = { + name = "esprima"; + packageName = "esprima"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + }; + }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; + "esquery-1.0.1" = { + name = "esquery"; + packageName = "esquery"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz"; + sha512 = "SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA=="; + }; + }; + "esrecurse-4.2.1" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; + sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; + }; + }; + "esshorten-1.1.1" = { + name = "esshorten"; + packageName = "esshorten"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz"; + sha1 = "174f96b7cc267e46872d814e7db7c290bdff61a9"; + }; + }; + "estraverse-1.5.1" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; + sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; + }; + }; + "estraverse-2.0.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz"; + sha1 = "5ae46963243600206674ccb24a09e16674fcdca1"; + }; + }; + "estraverse-4.1.1" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz"; + sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; + }; + }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "esutils-1.0.0" = { + name = "esutils"; + packageName = "esutils"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; + sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + }; + "execa-0.7.0" = { + name = "execa"; + packageName = "execa"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + }; + "execa-1.0.0" = { + name = "execa"; + packageName = "execa"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "external-editor-3.1.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fast-deep-equal-2.0.1" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + }; + }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; + "fast-levenshtein-1.0.7" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz"; + sha1 = "0178dcdee023b92905193af0959e8a7639cfdcb9"; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; + "figures-2.0.0" = { + name = "figures"; + packageName = "figures"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + }; + "file-entry-cache-5.0.1" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; + }; + }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + }; + }; + "find-up-1.1.2" = { + name = "find-up"; + packageName = "find-up"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + }; + "find-up-2.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + }; + "find-up-3.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + }; + }; + "first-chunk-stream-2.0.0" = { + name = "first-chunk-stream"; + packageName = "first-chunk-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz"; + sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; + }; + }; + "flat-cache-2.0.1" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz"; + sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; + }; + }; + "flatted-2.0.1" = { + name = "flatted"; + packageName = "flatted"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz"; + sha512 = "a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.3.3" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "fraction.js-4.0.12" = { + name = "fraction.js"; + packageName = "fraction.js"; + version = "4.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.12.tgz"; + sha512 = "8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA=="; + }; + }; + "fs-extra-3.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"; + sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; + }; + }; + "fs-extra-4.0.3" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz"; + sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg=="; + }; + }; + "fs-extra-6.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz"; + sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="; + }; + }; + "fs-minipass-1.2.6" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz"; + sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ=="; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; + "get-caller-file-1.0.3" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; + }; + }; + "get-caller-file-2.0.5" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; + }; + }; + "get-stream-3.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "glob-7.1.4" = { + name = "glob"; + packageName = "glob"; + version = "7.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; + }; + }; + "glob-parent-5.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz"; + sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg=="; + }; + }; + "globals-11.12.0" = { + name = "globals"; + packageName = "globals"; + version = "11.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; + }; + }; + "graceful-fs-4.2.2" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz"; + sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "hosted-git-info-2.8.4" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz"; + sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "ignore-4.0.6" = { + name = "ignore"; + packageName = "ignore"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; + }; + }; + "import-fresh-3.1.0" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz"; + sha512 = "PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "inquirer-6.5.2" = { + name = "inquirer"; + packageName = "inquirer"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz"; + sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; + }; + }; + "invert-kv-1.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + }; + "invert-kv-2.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "javascript-natural-sort-0.7.1" = { + name = "javascript-natural-sort"; + packageName = "javascript-natural-sort"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz"; + sha1 = "f9e2303d4507f6d74355a73664d1440fb5a0ef59"; + }; + }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + }; + "js-yaml-3.13.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stable-stringify-without-jsonify-1.0.1" = { + name = "json-stable-stringify-without-jsonify"; + packageName = "json-stable-stringify-without-jsonify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "jsonfile-3.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"; + sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; + }; + }; + "jsonfile-4.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + }; + "jsonparse-1.3.1" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "lcid-1.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + }; + "lcid-2.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; + }; + }; + "levn-0.2.5" = { + name = "levn"; + packageName = "levn"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"; + sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054"; + }; + }; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + }; + "load-json-file-1.1.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + }; + "load-json-file-2.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + }; + "locate-path-2.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + }; + "locate-path-3.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + }; + }; + "lodash-4.17.15" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.15"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; + }; + }; + "lru-cache-4.1.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; + }; + }; + "map-age-cleaner-0.1.3" = { + name = "map-age-cleaner"; + packageName = "map-age-cleaner"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; + sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="; + }; + }; + "mathjs-5.10.3" = { + name = "mathjs"; + packageName = "mathjs"; + version = "5.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mathjs/-/mathjs-5.10.3.tgz"; + sha512 = "ySjg30BC3dYjQm73ILZtwcWzFJde0VU6otkXW/57IjjuYRa3Qaf0Kb8pydEuBZYtqW2OxreAtsricrAmOj3jIw=="; + }; + }; + "megaminx-0.3.3" = { + name = "megaminx"; + packageName = "megaminx"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz"; + sha512 = "lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw=="; + }; + }; + "mem-1.1.0" = { + name = "mem"; + packageName = "mem"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; + sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + }; + }; + "mem-4.3.0" = { + name = "mem"; + packageName = "mem"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; + sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; + }; + }; + "microbuffer-1.0.0" = { + name = "microbuffer"; + packageName = "microbuffer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/microbuffer/-/microbuffer-1.0.0.tgz"; + sha1 = "8b3832ed40c87d51f47bb234913a698a756d19d2"; + }; + }; + "mime-db-1.40.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.40.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; + }; + }; + "mime-types-2.1.24" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.24"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; + }; + }; + "mimic-fn-1.2.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "minipass-2.5.1" = { + name = "minipass"; + packageName = "minipass"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-2.5.1.tgz"; + sha512 = "dmpSnLJtNQioZFI5HfQ55Ad0DzzsMAb+HfokwRTNXwEQjepbTkl5mtIlSVxGIkOkxlpX7wIn5ET/oAd9fZ/Y/Q=="; + }; + }; + "minizlib-1.2.2" = { + name = "minizlib"; + packageName = "minizlib"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz"; + sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ=="; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "mute-stream-0.0.7" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + }; + }; + "nan-2.14.0" = { + name = "nan"; + packageName = "nan"; + version = "2.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + }; + "nice-try-1.0.5" = { + name = "nice-try"; + packageName = "nice-try"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + }; + "node-gyp-4.0.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-4.0.0.tgz"; + sha512 = "2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA=="; + }; + }; + "node-version-1.2.0" = { + name = "node-version"; + packageName = "node-version"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz"; + sha512 = "ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ=="; + }; + }; + "nopt-3.0.6" = { + name = "nopt"; + packageName = "nopt"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + }; + }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "onetime-2.0.1" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + }; + "optionator-0.3.0" = { + name = "optionator"; + packageName = "optionator"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz"; + sha1 = "9715a8b5f5e7586cff06c8249e039cd7364d3f54"; + }; + }; + "optionator-0.8.2" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-locale-1.4.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + }; + }; + "os-locale-2.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; + sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA=="; + }; + }; + "os-locale-3.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; + sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + }; + }; + "p-defer-1.0.0" = { + name = "p-defer"; + packageName = "p-defer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "p-is-promise-2.1.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"; + sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; + }; + }; + "p-limit-1.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; + sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; + }; + }; + "p-limit-2.2.1" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz"; + sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg=="; + }; + }; + "p-locate-2.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + }; + "p-locate-3.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; + "pako-1.0.10" = { + name = "pako"; + packageName = "pako"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz"; + sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="; + }; + }; + "parent-module-1.0.1" = { + name = "parent-module"; + packageName = "parent-module"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; + "path-exists-2.1.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "path-parse-1.0.6" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + }; + }; + "path-type-1.1.0" = { + name = "path-type"; + packageName = "path-type"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + }; + "path-type-2.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + }; + "patrisika-0.21.0" = { + name = "patrisika"; + packageName = "patrisika"; + version = "0.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz"; + sha1 = "b82c27f7d4041522dc5c31b43b7c6efb19e47482"; + }; + }; + "patrisika-scopes-0.11.1" = { + name = "patrisika-scopes"; + packageName = "patrisika-scopes"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz"; + sha512 = "UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w=="; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "prelude-ls-1.1.2" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "progress-2.0.3" = { + name = "progress"; + packageName = "progress"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; + }; + }; + "promise-polyfill-6.1.0" = { + name = "promise-polyfill"; + packageName = "promise-polyfill"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz"; + sha1 = "dfa96943ea9c121fca4de9b5868cb39d3472e057"; + }; + }; + "proper-lockfile-3.2.0" = { + name = "proper-lockfile"; + packageName = "proper-lockfile"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-3.2.0.tgz"; + sha512 = "iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA=="; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "psl-1.4.0" = { + name = "psl"; + packageName = "psl"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; + sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + }; + "read-pkg-2.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + }; + "read-pkg-up-1.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + }; + "read-pkg-up-2.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + }; + "readable-stream-2.3.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; + }; + }; + "regexpp-2.0.1" = { + name = "regexpp"; + packageName = "regexpp"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz"; + sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="; + }; + }; + "request-2.88.0" = { + name = "request"; + packageName = "request"; + version = "2.88.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "require-main-filename-2.0.0" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; + }; + }; + "resolve-1.12.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz"; + sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w=="; + }; + }; + "resolve-from-4.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; + "resumer-0.0.0" = { + name = "resumer"; + packageName = "resumer"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; + sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; + }; + }; + "retry-0.12.0" = { + name = "retry"; + packageName = "retry"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + }; + "rimraf-2.2.8" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + }; + }; + "rimraf-2.6.3" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; + }; + }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; + "run-async-2.3.0" = { + name = "run-async"; + packageName = "run-async"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + }; + }; + "rxjs-6.5.3" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz"; + sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + }; + "seed-random-2.2.0" = { + name = "seed-random"; + packageName = "seed-random"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz"; + sha1 = "2a9b19e250a817099231a5b99a4daf80b7fbed54"; + }; + }; + "semaphore-async-await-1.5.1" = { + name = "semaphore-async-await"; + packageName = "semaphore-async-await"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz"; + sha1 = "857bef5e3644601ca4b9570b87e9df5ca12974fa"; + }; + }; + "semver-5.3.0" = { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "semver-6.3.0" = { + name = "semver"; + packageName = "semver"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "slice-ansi-2.1.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; + }; + }; + "source-map-0.1.43" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.43"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; + sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "source-map-0.7.3" = { + name = "source-map"; + packageName = "source-map"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; + }; + }; + "source-map-resolve-0.5.2" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; + sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; + }; + }; + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "spdx-correct-3.1.0" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; + }; + }; + "spdx-exceptions-2.2.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + }; + }; + "spdx-expression-parse-3.0.0" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + }; + }; + "spdx-license-ids-3.0.5" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + }; + }; + "split-1.0.1" = { + name = "split"; + packageName = "split"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; + sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "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"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + }; + }; + "string-width-3.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; + "strip-ansi-5.2.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; + }; + }; + "strip-bom-2.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "strip-bom-buf-1.0.0" = { + name = "strip-bom-buf"; + packageName = "strip-bom-buf"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz"; + sha1 = "1cb45aaf57530f4caf86c7f75179d2c9a51dd572"; + }; + }; + "strip-bom-stream-3.0.0" = { + name = "strip-bom-stream"; + packageName = "strip-bom-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz"; + sha1 = "956bcc5d84430f69256a90ed823765cd858e159c"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; + "strip-json-comments-3.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz"; + sha512 = "VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="; + }; + }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "table-5.4.6" = { + name = "table"; + packageName = "table"; + version = "5.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz"; + sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; + }; + }; + "tar-4.4.10" = { + name = "tar"; + packageName = "tar"; + version = "4.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz"; + sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; + }; + }; + "temp-0.8.3" = { + name = "temp"; + packageName = "temp"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz"; + sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59"; + }; + }; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; + "tiny-emitter-2.1.0" = { + name = "tiny-emitter"; + packageName = "tiny-emitter"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz"; + sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="; + }; + }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; + }; + }; + "tough-cookie-2.4.3" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + }; + }; + "ts-process-promises-1.0.2" = { + name = "ts-process-promises"; + packageName = "ts-process-promises"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-process-promises/-/ts-process-promises-1.0.2.tgz"; + sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg=="; + }; + }; + "tslib-1.10.0" = { + name = "tslib"; + packageName = "tslib"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz"; + sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="; + }; + }; + "tslib-1.9.3" = { + name = "tslib"; + packageName = "tslib"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz"; + sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "typed-function-1.1.0" = { + name = "typed-function"; + packageName = "typed-function"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-function/-/typed-function-1.1.0.tgz"; + sha512 = "TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA=="; + }; + }; + "typo-geom-0.5.1" = { + name = "typo-geom"; + packageName = "typo-geom"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.5.1.tgz"; + sha512 = "nj81m0eqRMpK6NcwkGlT9r3CbwjCQhsFU6SBUuYW9TDveqIdi/QUFGkikoImtE1C6OzY2LvuVMSG8rx/ZTCGtQ=="; + }; + }; + "universalify-0.1.2" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; + }; + }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "uuid-3.3.3" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz"; + sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="; + }; + }; + "v8-compile-cache-2.1.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz"; + sha512 = "usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="; + }; + }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "which-1.3.1" = { + name = "which"; + packageName = "which"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + }; + "which-module-1.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; + "wrap-ansi-2.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + }; + "wrap-ansi-5.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "write-1.0.3" = { + name = "write"; + packageName = "write"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz"; + sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; + }; + }; + "y18n-3.2.1" = { + name = "y18n"; + packageName = "y18n"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; + sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + }; + }; + "y18n-4.0.0" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + }; + }; + "yallist-2.1.2" = { + name = "yallist"; + packageName = "yallist"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + }; + "yallist-3.0.3" = { + name = "yallist"; + packageName = "yallist"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz"; + sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="; + }; + }; + "yargs-12.0.5" = { + name = "yargs"; + packageName = "yargs"; + version = "12.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz"; + sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; + }; + }; + "yargs-6.6.0" = { + name = "yargs"; + packageName = "yargs"; + version = "6.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + sha1 = "782ec21ef403345f830a808ca3d513af56065208"; + }; + }; + "yargs-8.0.2" = { + name = "yargs"; + packageName = "yargs"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; + sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; + }; + }; + "yargs-parser-11.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "11.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; + }; + }; + "yargs-parser-13.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "13.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; + sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; + }; + }; + "yargs-parser-4.2.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; + }; + }; + "yargs-parser-7.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; + sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + }; + }; + }; +in +{ + caryll-shapeops = nodeEnv.buildNodePackage { + name = "caryll-shapeops"; + packageName = "caryll-shapeops"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz"; + sha512 = "3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og=="; + }; + dependencies = [ + sources."bezier-js-2.4.3" + sources."clipper-lib-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Boolean operations and overlap removal for curves."; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + libspiro-js = nodeEnv.buildNodePackage { + name = "libspiro-js"; + packageName = "libspiro-js"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz"; + sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "JavaScript libspiro port"; + homepage = https://github.com/be5invis/libspiro-js; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + megaminx = nodeEnv.buildNodePackage { + name = "megaminx"; + packageName = "megaminx"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/megaminx/-/megaminx-0.9.0.tgz"; + sha512 = "1UcxrUXXYboLWS3AJ2NuLckLi3YR7eJiO5LsYAWHZjYE0mmSqJ2ogSt6JrG8YINyogW9/TUWpL1ojwbRsSbyXw=="; + }; + dependencies = [ + sources."JSONStream-1.3.5" + sources."child-process-promise-2.2.1" + sources."clone-2.1.2" + sources."complex.js-2.0.11" + sources."core-util-is-1.0.2" + sources."cross-spawn-4.0.2" + sources."decimal.js-10.2.0" + sources."escape-latex-1.2.0" + sources."first-chunk-stream-2.0.0" + sources."fraction.js-4.0.12" + sources."fs-extra-3.0.1" + sources."graceful-fs-4.2.2" + sources."inherits-2.0.4" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."javascript-natural-sort-0.7.1" + sources."jsonfile-3.0.1" + sources."jsonparse-1.3.1" + sources."lru-cache-4.1.5" + sources."mathjs-5.10.3" + sources."node-version-1.2.0" + sources."process-nextick-args-2.0.1" + sources."promise-polyfill-6.1.0" + sources."pseudomap-1.0.2" + sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" + sources."seed-random-2.2.0" + sources."string_decoder-1.1.1" + sources."strip-bom-buf-1.0.0" + sources."strip-bom-stream-3.0.0" + sources."through-2.3.8" + sources."tiny-emitter-2.1.0" + sources."tslib-1.9.3" + sources."typed-function-1.1.0" + sources."typo-geom-0.5.1" + sources."universalify-0.1.2" + sources."util-deprecate-1.0.2" + sources."which-1.3.1" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A typeface manipulation toolkit"; + homepage = "https://github.com/caryll/Megaminx#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + object-assign = nodeEnv.buildNodePackage { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "ES2015 `Object.assign()` ponyfill"; + homepage = "https://github.com/sindresorhus/object-assign#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + otfcc-ttcize = nodeEnv.buildNodePackage { + name = "otfcc-ttcize"; + packageName = "otfcc-ttcize"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.8.0.tgz"; + sha512 = "0RFgy9TDsgTF/1UJ8bSQ4heTYRatDz3HOXXh8d3WyXReqeOU+edgkbG4ERMFPdzFnA+SgqKTnPRg+2pduZsmSQ=="; + }; + dependencies = [ + sources."JSONStream-1.3.5" + sources."ansi-regex-2.1.1" + sources."camelcase-4.1.0" + sources."child-process-promise-2.2.1" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."code-point-at-1.1.0" + sources."cross-spawn-4.0.2" + sources."cubic2quad-1.1.1" + sources."decamelize-1.2.0" + sources."error-ex-1.3.2" + (sources."execa-0.7.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + ]; + }) + sources."find-up-2.1.0" + sources."fs-extra-4.0.3" + sources."get-caller-file-1.0.3" + sources."get-stream-3.0.0" + sources."graceful-fs-4.2.2" + sources."hosted-git-info-2.8.4" + sources."invert-kv-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-stream-1.1.0" + sources."isexe-2.0.0" + sources."jsonfile-4.0.0" + sources."jsonparse-1.3.1" + sources."lcid-1.0.0" + sources."load-json-file-2.0.0" + sources."locate-path-2.0.0" + sources."lru-cache-4.1.5" + (sources."megaminx-0.3.3" // { + dependencies = [ + sources."fs-extra-3.0.1" + sources."jsonfile-3.0.1" + ]; + }) + sources."mem-1.1.0" + sources."mimic-fn-1.2.0" + sources."node-version-1.2.0" + sources."normalize-package-data-2.5.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."os-locale-2.1.0" + sources."os-tmpdir-1.0.2" + 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."parse-json-2.2.0" + sources."path-exists-3.0.0" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."path-type-2.0.0" + sources."pify-2.3.0" + sources."promise-polyfill-6.1.0" + sources."pseudomap-1.0.2" + sources."read-pkg-2.0.0" + sources."read-pkg-up-2.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.12.0" + sources."rimraf-2.2.8" + sources."semver-5.7.1" + 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."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.5" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."strip-ansi-3.0.1" + sources."strip-bom-3.0.0" + sources."strip-eof-1.0.0" + sources."temp-0.8.3" + sources."through-2.3.8" + sources."universalify-0.1.2" + sources."validate-npm-package-license-3.0.4" + sources."which-1.3.1" + sources."which-module-2.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."y18n-3.2.1" + sources."yallist-2.1.2" + sources."yargs-8.0.2" + sources."yargs-parser-7.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + license = "Apache 2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + primitive-quadify-off-curves = nodeEnv.buildNodePackage { + name = "primitive-quadify-off-curves"; + packageName = "primitive-quadify-off-curves"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/primitive-quadify-off-curves/-/primitive-quadify-off-curves-0.6.3.tgz"; + sha512 = "NlkjdjHbXycTBGo9SDozAvOdmFDDOXuy4/rgmHsg1AB11QUbujybclmYWx1uPEgAELnh23S16KL5sD5uw540Ww=="; + }; + dependencies = [ + sources."complex.js-2.0.11" + sources."decimal.js-10.2.0" + sources."escape-latex-1.2.0" + sources."fraction.js-4.0.12" + sources."javascript-natural-sort-0.7.1" + sources."mathjs-5.10.3" + sources."seed-random-2.2.0" + sources."tiny-emitter-2.1.0" + sources."tslib-1.9.3" + sources."typed-function-1.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Quadify a Cubic with only off-curve points"; + license = "APLv2"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + toml = nodeEnv.buildNodePackage { + name = "toml"; + packageName = "toml"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz"; + sha512 = "y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "TOML parser for Node.js (parses TOML spec v0.4.0)"; + homepage = "https://github.com/BinaryMuse/toml-node#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + topsort = nodeEnv.buildNodePackage { + name = "topsort"; + packageName = "topsort"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz"; + sha1 = "2e5e0ee8a1439417f101d5b9b2d035e620263321"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Topological sort in JavaScript"; + homepage = https://github.com/samuelneff/topsort; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + ttf2woff = nodeEnv.buildNodePackage { + name = "ttf2woff"; + packageName = "ttf2woff"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.1.tgz"; + sha1 = "871832240024b09db9570904c7c1928b8057c969"; + }; + dependencies = [ + sources."argparse-1.0.10" + sources."microbuffer-1.0.0" + sources."pako-1.0.10" + sources."sprintf-js-1.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Convert TTF font to WOFF"; + homepage = "https://github.com/fontello/ttf2woff#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + ttf2woff2 = nodeEnv.buildNodePackage { + name = "ttf2woff2"; + packageName = "ttf2woff2"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-3.0.0.tgz"; + sha512 = "5/Web6B0lF/STNAQ0d5vAlRRquuWsNj8wOmKQ9ql9Bsgbx8MsLnNzaBG9vBcSE4s4Ry1QOr/MyUrDUIVgVPEfw=="; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ajv-6.10.2" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."bindings-1.5.0" + sources."brace-expansion-1.1.11" + sources."bufferstreams-2.0.1" + sources."caseless-0.12.0" + sources."chownr-1.1.2" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."ecc-jsbn-0.1.2" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."file-uri-to-path-1.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fs-minipass-1.2.6" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."getpass-0.1.7" + sources."glob-7.1.4" + sources."graceful-fs-4.2.2" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-unicode-2.0.1" + sources."http-signature-1.2.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-fullwidth-code-point-1.0.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.5.1" + sources."minizlib-1.2.2" + sources."mkdirp-0.5.1" + sources."nan-2.14.0" + sources."node-gyp-4.0.0" + sources."nopt-3.0.6" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.1" + sources."psl-1.4.0" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."readable-stream-2.3.6" + sources."request-2.88.0" + sources."rimraf-2.7.1" + 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."sshpk-1.16.1" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."tar-4.4.10" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.3" + sources."verror-1.10.0" + sources."which-1.3.1" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + sources."yallist-3.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Convert TTF files to WOFF2 ones."; + homepage = https://github.com/nfroidure/ttf2woff2; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + unorm = nodeEnv.buildNodePackage { + name = "unorm"; + packageName = "unorm"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz"; + sha512 = "b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "JavaScript Unicode 8.0 Normalization - NFC, NFD, NFKC, NFKD. Read <http://unicode.org/reports/tr15/> UAX #15 Unicode Normalization Forms."; + homepage = "https://github.com/walling/unorm#readme"; + license = "MIT or GPL-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + verda = nodeEnv.buildNodePackage { + name = "verda"; + packageName = "verda"; + version = "1.0.0-4"; + src = fetchurl { + url = "https://registry.npmjs.org/verda/-/verda-1.0.0-4.tgz"; + sha512 = "DKr2WdWlPwJvmqCcjs6LPaBOacFQUdk6+u7tqwkxYKbHa0Touff7Y6x+YAWbnT1dace5Qlv/CRr6YBEaB08r3A=="; + }; + dependencies = [ + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."bluebird-3.5.5" + sources."camelcase-5.3.1" + sources."chalk-2.4.2" + sources."cli-cursor-2.1.0" + (sources."cliui-4.1.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."code-point-at-1.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."cross-spawn-6.0.5" + sources."decamelize-1.2.0" + sources."end-of-stream-1.4.1" + sources."escape-string-regexp-1.0.5" + sources."execa-1.0.0" + sources."fast-deep-equal-2.0.1" + sources."find-up-3.0.0" + sources."fs-extra-6.0.1" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + sources."graceful-fs-4.2.2" + sources."has-flag-3.0.0" + sources."invert-kv-2.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-stream-1.1.0" + sources."isexe-2.0.0" + sources."jsonfile-4.0.0" + sources."lcid-2.0.0" + sources."locate-path-3.0.0" + sources."map-age-cleaner-0.1.3" + (sources."mem-4.3.0" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) + sources."mimic-fn-1.2.0" + sources."nice-try-1.0.5" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.1.0" + sources."p-limit-2.2.1" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."path-exists-3.0.0" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."proper-lockfile-3.2.0" + sources."pump-3.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.12.0" + sources."restore-cursor-2.0.0" + sources."retry-0.12.0" + sources."semaphore-async-await-1.5.1" + sources."semver-5.7.1" + 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."split-1.0.1" + sources."stack-trace-0.0.9" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."strip-ansi-5.2.0" + sources."strip-eof-1.0.0" + sources."supports-color-5.5.0" + sources."through-2.3.8" + sources."ts-process-promises-1.0.2" + sources."tslib-1.10.0" + sources."universalify-0.1.2" + sources."which-1.3.1" + sources."which-module-2.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."wrappy-1.0.2" + sources."y18n-4.0.0" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Build Directly."; + license = "APLv2"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + yargs = nodeEnv.buildNodePackage { + name = "yargs"; + packageName = "yargs"; + version = "14.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-14.0.0.tgz"; + sha512 = "ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow=="; + }; + dependencies = [ + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."camelcase-5.3.1" + sources."cliui-5.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."decamelize-1.2.0" + sources."emoji-regex-7.0.3" + sources."find-up-3.0.0" + sources."get-caller-file-2.0.5" + sources."is-fullwidth-code-point-2.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.2.1" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."path-exists-3.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."set-blocking-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."which-module-2.0.0" + sources."wrap-ansi-5.1.0" + sources."y18n-4.0.0" + sources."yargs-parser-13.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "yargs the modern, pirate-themed, successor to optimist."; + homepage = https://yargs.js.org/; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + colors = nodeEnv.buildNodePackage { + name = "colors"; + packageName = "colors"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz"; + sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "get colors in your node.js console"; + homepage = https://github.com/Marak/colors.js; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + patel = nodeEnv.buildNodePackage { + name = "patel"; + packageName = "patel"; + version = "0.33.1"; + src = fetchurl { + url = "https://registry.npmjs.org/patel/-/patel-0.33.1.tgz"; + sha512 = "zOv5DhGH2r4cRKnZfOlHmWqxBp9nMGnC3F/NZbUqFCYMA65RXiv8q1F96/6dm2ANR6xvCe+xLODQSb49IFoYQg=="; + }; + dependencies = [ + sources."amdefine-1.0.1" + sources."ansi-regex-2.1.1" + sources."camelcase-3.0.0" + sources."cliui-3.2.0" + sources."code-point-at-1.1.0" + sources."decamelize-1.2.0" + sources."deep-is-0.1.3" + sources."error-ex-1.3.2" + sources."escodegen-1.12.0" + (sources."escope-1.0.3" // { + dependencies = [ + sources."estraverse-2.0.0" + ]; + }) + (sources."esmangle-1.0.1" // { + dependencies = [ + sources."escodegen-1.3.3" + sources."esprima-1.1.1" + sources."estraverse-1.5.1" + sources."esutils-1.0.0" + sources."fast-levenshtein-1.0.7" + sources."levn-0.2.5" + sources."optionator-0.3.0" + sources."source-map-0.1.43" + sources."wordwrap-0.0.3" + ]; + }) + sources."esprima-3.1.3" + (sources."esshorten-1.1.1" // { + dependencies = [ + sources."estraverse-4.1.1" + ]; + }) + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."fast-levenshtein-2.0.6" + sources."find-up-1.1.2" + sources."get-caller-file-1.0.3" + sources."graceful-fs-4.2.2" + sources."hosted-git-info-2.8.4" + sources."invert-kv-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-utf8-0.2.1" + sources."lcid-1.0.0" + sources."levn-0.3.0" + sources."load-json-file-1.1.0" + sources."normalize-package-data-2.5.0" + sources."number-is-nan-1.0.1" + sources."optionator-0.8.2" + sources."os-locale-1.4.0" + sources."parse-json-2.2.0" + sources."path-exists-2.1.0" + sources."path-parse-1.0.6" + sources."path-type-1.1.0" + sources."patrisika-0.21.0" + sources."patrisika-scopes-0.11.1" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prelude-ls-1.1.2" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.12.0" + sources."resumer-0.0.0" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."source-map-0.6.1" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.5" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."through-2.3.8" + sources."type-check-0.3.2" + sources."validate-npm-package-license-3.0.4" + sources."which-module-1.0.0" + sources."wordwrap-1.0.0" + sources."wrap-ansi-2.1.0" + sources."y18n-3.2.1" + sources."yargs-6.6.0" + sources."yargs-parser-4.2.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A Patrisika-based Example Language"; + homepage = "https://github.com/be5invis/patel#readme"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + patrisika-scopes = nodeEnv.buildNodePackage { + name = "patrisika-scopes"; + packageName = "patrisika-scopes"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz"; + sha512 = "UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "patrisika-scopes ================ A library for Patrisika's scopes."; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + eslint = nodeEnv.buildNodePackage { + name = "eslint"; + packageName = "eslint"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-6.4.0.tgz"; + sha512 = "WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA=="; + }; + dependencies = [ + sources."@babel/code-frame-7.5.5" + sources."@babel/highlight-7.5.0" + sources."acorn-7.0.0" + sources."acorn-jsx-5.0.2" + sources."ajv-6.10.2" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."argparse-1.0.10" + sources."astral-regex-1.0.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."callsites-3.1.0" + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."concat-map-0.0.1" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."debug-4.1.1" + sources."deep-is-0.1.3" + sources."doctrine-3.0.0" + sources."emoji-regex-7.0.3" + sources."escape-string-regexp-1.0.5" + sources."eslint-scope-5.0.0" + sources."eslint-utils-1.4.2" + sources."eslint-visitor-keys-1.1.0" + sources."espree-6.1.1" + sources."esprima-4.0.1" + sources."esquery-1.0.1" + sources."esrecurse-4.2.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."external-editor-3.1.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" + sources."figures-2.0.0" + sources."file-entry-cache-5.0.1" + sources."flat-cache-2.0.1" + sources."flatted-2.0.1" + sources."fs.realpath-1.0.0" + sources."functional-red-black-tree-1.0.1" + sources."glob-7.1.4" + sources."glob-parent-5.0.0" + sources."globals-11.12.0" + sources."has-flag-3.0.0" + sources."iconv-lite-0.4.24" + sources."ignore-4.0.6" + sources."import-fresh-3.1.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."inquirer-6.5.2" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" + sources."is-promise-2.1.0" + sources."isexe-2.0.0" + sources."js-tokens-4.0.0" + sources."js-yaml-3.13.1" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."levn-0.3.0" + sources."lodash-4.17.15" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.1.2" + sources."mute-stream-0.0.7" + sources."natural-compare-1.4.0" + sources."nice-try-1.0.5" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optionator-0.8.2" + sources."os-tmpdir-1.0.2" + sources."parent-module-1.0.1" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."prelude-ls-1.1.2" + sources."progress-2.0.3" + sources."punycode-2.1.1" + sources."regexpp-2.0.1" + sources."resolve-from-4.0.0" + sources."restore-cursor-2.0.0" + sources."rimraf-2.6.3" + sources."run-async-2.3.0" + sources."rxjs-6.5.3" + sources."safer-buffer-2.1.2" + sources."semver-6.3.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."slice-ansi-2.1.0" + sources."sprintf-js-1.0.3" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) + sources."strip-json-comments-3.0.1" + sources."supports-color-5.5.0" + (sources."table-5.4.6" // { + dependencies = [ + sources."string-width-3.1.0" + ]; + }) + sources."text-table-0.2.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."tslib-1.10.0" + sources."type-check-0.3.2" + sources."uri-js-4.2.2" + sources."v8-compile-cache-2.1.0" + sources."which-1.3.1" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."write-1.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "An AST-based pattern checker for JavaScript."; + homepage = https://eslint.org/; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + stylus = nodeEnv.buildNodePackage { + name = "stylus"; + packageName = "stylus"; + version = "0.54.7"; + src = fetchurl { + url = "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz"; + sha512 = "Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug=="; + }; + dependencies = [ + sources."atob-2.1.2" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" + (sources."css-2.2.4" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."css-parse-2.0.0" + sources."debug-3.1.0" + sources."decode-uri-component-0.2.0" + sources."fs.realpath-1.0.0" + sources."glob-7.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."resolve-url-0.2.1" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-6.3.0" + sources."source-map-0.7.3" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."urix-0.1.0" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Robust, expressive, and feature-rich CSS superset"; + homepage = https://github.com/stylus/stylus; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +}
\ No newline at end of file diff --git a/pkgs/data/fonts/iosevka/node-packages.json b/pkgs/data/fonts/iosevka/node-packages.json new file mode 100644 index 00000000000..468f788f9f3 --- /dev/null +++ b/pkgs/data/fonts/iosevka/node-packages.json @@ -0,0 +1,20 @@ +[ + "caryll-shapeops", + "libspiro-js", + "megaminx", + "object-assign", + "otfcc-ttcize", + "primitive-quadify-off-curves", + "toml", + "topsort", + "ttf2woff", + "ttf2woff2", + "unorm", + "verda", + "yargs", + "colors", + "patel", + "patrisika-scopes", + "eslint", + "stylus" +] diff --git a/pkgs/data/fonts/iosevka/node-packages.nix b/pkgs/data/fonts/iosevka/node-packages.nix new file mode 100644 index 00000000000..41e23864c44 --- /dev/null +++ b/pkgs/data/fonts/iosevka/node-packages.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{pkgs ? import <nixpkgs> { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + +let + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages-generated.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +}
\ No newline at end of file diff --git a/pkgs/data/fonts/iosevka/package-lock.json b/pkgs/data/fonts/iosevka/package-lock.json deleted file mode 100644 index 54de11a1f42..00000000000 --- a/pkgs/data/fonts/iosevka/package-lock.json +++ /dev/null @@ -1,1025 +0,0 @@ -{ - "name": "iosevka", - "version": "1.14.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "JSONStream": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz", - "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=", - "requires": { - "jsonparse": "1.3.1", - "through": "2.3.8" - } - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "bezier-js": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.5.tgz", - "integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg==" - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" - }, - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" - }, - "caryll-shapeops": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz", - "integrity": "sha512-3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==", - "requires": { - "bezier-js": "2.2.5", - "clipper-lib": "1.0.0" - } - }, - "child-process-promise": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz", - "integrity": "sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=", - "requires": { - "cross-spawn": "4.0.2", - "node-version": "1.1.0", - "promise-polyfill": "6.1.0" - } - }, - "clipper-lib": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz", - "integrity": "sha1-6QLOsm4o7lz6YBSr33kKUe//Tss=" - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - } - }, - "clone": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", - "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=" - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, - "coffee-script": { - "version": "1.12.7", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz", - "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==" - }, - "cross-spawn": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", - "requires": { - "lru-cache": "4.1.1", - "which": "1.3.0" - } - }, - "cubic2quad": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz", - "integrity": "sha1-abGcYaP1tB7PLx1fro+wNBWqixU=" - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" - }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "requires": { - "clone": "1.0.3" - } - }, - "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", - "requires": { - "is-arrayish": "0.2.1" - } - }, - "escodegen": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", - "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", - "requires": { - "esprima": "3.1.3", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.5.7" - } - }, - "escope": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz", - "integrity": "sha1-dZ3OhJbEJI/sLQyq9BCLzz8af10=", - "requires": { - "estraverse": "2.0.0" - }, - "dependencies": { - "estraverse": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz", - "integrity": "sha1-WuRpYyQ2ACBmdMyySgnhZnT83KE=" - } - } - }, - "esmangle": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz", - "integrity": "sha1-2bs3uPjq+/Tm1O1reqKVarvTxMI=", - "requires": { - "escodegen": "1.3.3", - "escope": "1.0.3", - "esprima": "1.1.1", - "esshorten": "1.1.1", - "estraverse": "1.5.1", - "esutils": "1.0.0", - "optionator": "0.3.0", - "source-map": "0.1.43" - }, - "dependencies": { - "escodegen": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz", - "integrity": "sha1-8CQBb1qI4Eb9EgBQVek5gC5sXyM=", - "requires": { - "esprima": "1.1.1", - "estraverse": "1.5.1", - "esutils": "1.0.0", - "source-map": "0.1.43" - } - }, - "esprima": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz", - "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk=" - }, - "estraverse": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz", - "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=" - }, - "esutils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz", - "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=" - }, - "fast-levenshtein": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz", - "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=" - }, - "levn": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz", - "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=", - "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" - } - }, - "optionator": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz", - "integrity": "sha1-lxWotfXnWGz/BsgkngOc1zZNP1Q=", - "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "1.0.7", - "levn": "0.2.5", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "0.0.3" - } - }, - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "requires": { - "amdefine": "1.0.1" - } - }, - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" - } - } - }, - "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" - }, - "esshorten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz", - "integrity": "sha1-F0+Wt8wmfkaHLYFOfbfCkL3/Yak=", - "requires": { - "escope": "1.0.3", - "estraverse": "4.1.1", - "esutils": "2.0.2" - }, - "dependencies": { - "estraverse": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz", - "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI=" - } - } - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.3.0" - } - } - } - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" - }, - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" - } - }, - "fs-extra": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", - "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", - "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "3.0.1", - "universalify": "0.1.1" - } - }, - "get-caller-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" - }, - "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" - }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "requires": { - "builtin-modules": "1.1.1" - } - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" - }, - "jsonfile": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", - "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", - "requires": { - "graceful-fs": "4.1.11" - } - }, - "jsonparse": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=" - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "requires": { - "invert-kv": "1.0.0" - } - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" - } - }, - "libspiro-js": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz", - "integrity": "sha1-hmUrAAmm2E6nmlMgvcpfAGEu5Dk=" - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" - }, - "dependencies": { - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - } - } - }, - "lru-cache": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", - "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" - } - }, - "megaminx": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz", - "integrity": "sha512-lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==", - "requires": { - "JSONStream": "1.3.2", - "child-process-promise": "2.2.1", - "cubic2quad": "1.1.1", - "fs-extra": "3.0.1", - "which": "1.3.0" - } - }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", - "requires": { - "mimic-fn": "1.2.0" - } - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" - }, - "node-version": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz", - "integrity": "sha512-t1V2RFiaTavaW3jtQO0A2nok6k7/Gghuvx2rjvICuT0B0dYaObBQ4U0xHL+ZTPFZodt1LMYG2Vi2nypfz4/AJg==" - }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.1" - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "requires": { - "path-key": "2.0.1" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, - "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" - } - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "requires": { - "lcid": "1.0.0" - } - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" - }, - "p-limit": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", - "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", - "requires": { - "p-try": "1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "requires": { - "p-limit": "1.2.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" - }, - "pad": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/pad/-/pad-1.2.1.tgz", - "integrity": "sha512-cx/l/K+9UjGXJmoYolvP0l3cEUyB9BUdUL3wj3uwskIiApboLsinvsXxU9nSNg9Luz2ZyH0zzJNbqgLSNtfIDw==", - "requires": { - "coffee-script": "1.12.7", - "wcwidth": "1.0.1" - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "requires": { - "error-ex": "1.3.1" - } - }, - "patel": { - "version": "0.32.1", - "resolved": "https://registry.npmjs.org/patel/-/patel-0.32.1.tgz", - "integrity": "sha1-nnC2sj/XqcgsV57VkbivpSF+YhI=", - "requires": { - "escodegen": "1.9.0", - "esmangle": "1.0.1", - "patrisika": "0.21.0", - "resumer": "0.0.0", - "yargs": "6.6.0" - }, - "dependencies": { - "yargs": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", - "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", - "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "4.2.1" - } - } - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "requires": { - "pinkie-promise": "2.0.1" - } - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - }, - "patrisika": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz", - "integrity": "sha1-uCwn99QEFSLcXDG0O3xu+xnkdII=", - "requires": { - "patrisika-scopes": "0.11.0" - } - }, - "patrisika-scopes": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.0.tgz", - "integrity": "sha1-BSqddkoWXgs0zDW2ViqIJCA2tAM=" - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "requires": { - "pinkie": "2.0.4" - } - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" - }, - "promise-polyfill": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", - "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=" - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" - }, - "resumer": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz", - "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=", - "requires": { - "through": "2.3.8" - } - }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "requires": { - "shebang-regex": "1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "optional": true - }, - "spdx-correct": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", - "requires": { - "spdx-license-ids": "1.2.2" - } - }, - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=" - }, - "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=" - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "requires": { - "is-utf8": "0.2.1" - } - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" - }, - "toml": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz", - "integrity": "sha512-O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA==" - }, - "topsort": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz", - "integrity": "sha1-Ll4O6KFDlBfxAdW5stA15iAmMyE=" - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "requires": { - "prelude-ls": "1.1.2" - } - }, - "universalify": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", - "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=" - }, - "unorm": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz", - "integrity": "sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA=" - }, - "validate-npm-package-license": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", - "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" - } - }, - "wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "requires": { - "defaults": "1.0.3" - } - }, - "which": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", - "requires": { - "isexe": "2.0.0" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" - } - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" - }, - "yargs": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", - "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", - "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "7.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "requires": { - "locate-path": "2.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" - }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" - } - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" - } - }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "requires": { - "pify": "2.3.0" - } - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" - } - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "3.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" - }, - "yargs-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", - "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", - "requires": { - "camelcase": "4.1.0" - } - } - } - }, - "yargs-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", - "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", - "requires": { - "camelcase": "3.0.0" - } - } - } -} diff --git a/pkgs/data/fonts/iosevka/package-lock.nix b/pkgs/data/fonts/iosevka/package-lock.nix deleted file mode 100644 index 546482cc0d2..00000000000 --- a/pkgs/data/fonts/iosevka/package-lock.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ lib, fetchurl }: - -with lib; with builtins; - -let - # Convert a base64-encoded string into a list of quads and padding. - fromBase64 = str: - let - len = stringLength str; - quads = 3 * len - 4 * padding; - padding = - if hasSuffix "==" str then 2 else - if hasSuffix "=" str then 1 else - 0; - chars = stringToCharacters (substring 0 (len - padding) str); - table = { - A = [0 0 0]; - B = [0 0 1]; - C = [0 0 2]; - D = [0 0 3]; - E = [0 1 0]; - F = [0 1 1]; - G = [0 1 2]; - H = [0 1 3]; - I = [0 2 0]; - J = [0 2 1]; - K = [0 2 2]; - L = [0 2 3]; - M = [0 3 0]; - N = [0 3 1]; - O = [0 3 2]; - P = [0 3 3]; - Q = [1 0 0]; - R = [1 0 1]; - S = [1 0 2]; - T = [1 0 3]; - U = [1 1 0]; - V = [1 1 1]; - W = [1 1 2]; - X = [1 1 3]; - Y = [1 2 0]; - Z = [1 2 1]; - a = [1 2 2]; - b = [1 2 3]; - c = [1 3 0]; - d = [1 3 1]; - e = [1 3 2]; - f = [1 3 3]; - g = [2 0 0]; - h = [2 0 1]; - i = [2 0 2]; - j = [2 0 3]; - k = [2 1 0]; - l = [2 1 1]; - m = [2 1 2]; - n = [2 1 3]; - o = [2 2 0]; - p = [2 2 1]; - q = [2 2 2]; - r = [2 2 3]; - s = [2 3 0]; - t = [2 3 1]; - u = [2 3 2]; - v = [2 3 3]; - w = [3 0 0]; - x = [3 0 1]; - y = [3 0 2]; - z = [3 0 3]; - "0" = [3 1 0]; - "1" = [3 1 1]; - "2" = [3 1 2]; - "3" = [3 1 3]; - "4" = [3 2 0]; - "5" = [3 2 1]; - "6" = [3 2 2]; - "7" = [3 2 3]; - "8" = [3 3 0]; - "9" = [3 3 1]; - "+" = [3 3 2]; - "/" = [3 3 3]; - }; - in - take quads (concatMap (c: table.${c}) chars); - - # Convert a list of quads with padding into a base16-encoded string. - toBase16 = quads: - if length quads == 0 then "" else - if length quads == 1 then throw "toBase16: odd quads" else - let - hexad = 4 * elemAt quads 0 + elemAt quads 1; - hexits = "0123456789abcdef"; - in - substring hexad 1 hexits + toBase16 (drop 2 quads); -in - -let - fetchResolved = { resolved, integrity, ... }: - let args = { url = resolved; } // integrityHash integrity; in - fetchurl args; - integrityHash = integrity: - if hasPrefix "sha1-" integrity then integritySHA1 integrity else - if hasPrefix "sha512-" integrity then integritySHA512 integrity else - throw "don't understand integrity: ${integrity}"; - integritySHA1 = integrity: - { sha1 = toBase16 (fromBase64 (removePrefix "sha1-" integrity)); }; - integritySHA512 = integrity: - { sha512 = toBase16 (fromBase64 (removePrefix "sha512-" integrity)); }; -in - -let - depend = name: attrs@{ version, dependencies ? {}, ... }: - { - inherit name version; - src = fetchResolved attrs; - depends = mapAttrsToList depend dependencies; - }; - prepareDepend = { name, src, depends, ... }: - '' - unpackFile '${src}' - mv package '${name}' - mkdir -p '${name}/node_modules' - ( - cd '${name}/node_modules' - ${concatMapStrings prepareDepend depends} - ) - ''; -in - -packageLockFile: - -let - packageLock = fromJSON (readFile packageLockFile); - depends = mapAttrsToList depend packageLock.dependencies; -in - '' - mkdir -p node_modules - ( - cd node_modules - ${concatMapStrings prepareDepend depends} - ) - '' - diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 2d9fbfdae05..7e073bf56d3 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, p7zip }: let - version = "0.8.0"; + version = "0.8.2"; in fetchurl { name = "sarasa-gothic-${version}"; url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - sha256 = "0zafvzrh4180hmz351f1rvs29n8mfxf0qv6mdl7psf1f066dizs6"; + sha256 = "17xkpklb6spi10132lq658fwvrms3fs7ksb9j098z9vaqad1k51q"; recursiveHash = true; downloadToTemp = true; diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix index bea5fea0f9d..5186b9fe4a5 100644 --- a/pkgs/data/fonts/source-sans-pro/default.nix +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -1,9 +1,11 @@ { lib, fetchzip }: -fetchzip { - name = "source-sans-pro-2.045"; +let + version = "3.006"; +in fetchzip { + name = "source-sans-pro-${version}"; - url = https://github.com/adobe-fonts/source-sans-pro/releases/download/2.045R-ro%2F1.095R-it/source-sans-pro-2.045R-ro-1.095R-it.zip; + url = "https://github.com/adobe-fonts/source-sans-pro/releases/download/${version}R/source-sans-pro-${version}R.zip"; postFetch = '' mkdir -p $out/share/fonts/{opentype,truetype,variable} @@ -12,7 +14,7 @@ fetchzip { unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable ''; - sha256 = "0xjdp226ybdcfylbpfsdgnz2bf4pj4qv1wfs6fv22hjxlzqfixf3"; + sha256 = "11jd50cqiq2s0z39rclg73iiw2j5yzgs1glfs9psw5wbbisgysmr"; meta = with lib; { homepage = https://adobe-fonts.github.io/source-sans-pro/; diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 2964b8692dc..f8830bbd211 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,7 +2,7 @@ let pname = "spleen"; - version = "1.0.5"; + version = "1.3.0"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; @@ -10,14 +10,13 @@ in fetchurl { downloadToTemp = true; recursiveHash = true; postFetch = '' - tar xf $downloadedFile --strip=1 + tar xvf $downloadedFile --strip=1 d="$out/share/fonts/X11/misc/spleen" gzip -n9 *.pcf - install -Dm644 *.pcf.gz -t $d - install -Dm644 *.bdf -t $d + install -Dm644 *.{pcf.gz,psfu,bdf} -t $d install -m644 fonts.alias-spleen $d/fonts.alias ''; - sha256 = "0144a0lkkl5qx0a8sapymcayj5lp5cs9nfgpbmg3427n41pkqfbb"; + sha256 = "1l1ksl8xnz1yh7jl8h2g25a7wfm9xgj3lay8ddqzlxzydkkm110q"; meta = with lib; { description = "Monospaced bitmap fonts"; diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index e8784d90e7f..59cff1b0f47 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "vista-fonts-1"; - url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe; + url = https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe; postFetch = '' ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile @@ -21,7 +21,7 @@ fetchzip { done ''; - sha256 = "1q2d24c203vkl6pwk86frmaj6jra49hr9mydq7cnlx4hilqslw3g"; + sha256 = "1l27zg5jraa16zm11d3qz1w7m6f1ih3xy5avww454ylm50fw6z11"; meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; @@ -31,6 +31,5 @@ fetchzip { # Set a non-zero priority to allow easy overriding of the # fontconfig configuration files. priority = 5; - broken = true; # source url is 404 }; } diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/data/icons/papirus-maia-icon-theme/default.nix new file mode 100644 index 00000000000..e15e64c2101 --- /dev/null +++ b/pkgs/data/icons/papirus-maia-icon-theme/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, gtk3 }: + +stdenv.mkDerivation rec { + pname = "papirus-maia-icon-theme"; + version = "2019-07-26"; + + src = fetchFromGitHub { + owner = "Ste74"; + repo = pname; + rev = "90d47c817cc0edeed8b5a90335e669948ff4a116"; + sha256 = "0d6lvdg5nw5wfaq8lxszcws174vg12ywkrqzn6czimhmhp48jf5p"; + }; + + nativeBuildInputs = [ + cmake + gtk3 + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace /usr "$out" + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with stdenv.lib; { + description = "Manjaro variation of Papirus icon theme"; + homepage = https://github.com/Ste74/papirus-maia-icon-theme; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix new file mode 100644 index 00000000000..b7ae27aac68 --- /dev/null +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, gtk3 }: + +stdenv.mkDerivation rec { + pname = "qogir-icon-theme"; + version = "2019-09-15"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = "4e1b6c693615bc2c7c7a11df6f4b90f2e6fb67db"; + sha256 = "1vp1wp4fgmy5af8z8nb3m6wgmb6wbwlvx5smf9dxfcn254hdg8g0"; + }; + + nativeBuildInputs = [ gtk3 ]; + + installPhase = '' + patchShebangs install.sh + mkdir -p $out/share/icons + name= ./install.sh -d $out/share/icons + ''; + + meta = with stdenv.lib; { + description = "A colorful design icon theme for linux desktops"; + homepage = https://github.com/vinceliuice/Qogir-icon-theme; + license = with licenses; [ gpl3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 6952d2da6ba..6569efa2cde 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = http://freedesktop.org/wiki/Software/shared-mime-info; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.mimadrid ]; + maintainers = [ maintainers.mimame ]; }; } diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index da12255e91e..8dcfacadb49 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20190330"; + version = "20190917"; src = fetchFromGitHub { - owner = "NicoHood"; + owner = "arc-design"; repo = pname; rev = version; - sha256 = "16n5svgkpa8azxgyy64zwjjc04r57wfzkdq9igqvbvwkbvx8aa89"; + sha256 = "1qgpk4p2hi5hd4yy0hj93kq1vs0b32wb8qkaj1wi90c8gwddq5wa"; }; nativeBuildInputs = [ @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { optipng inkscape gtk3 - gnome3.gnome-shell ]; propagatedUserEnvPkgs = [ @@ -29,26 +28,23 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postPatch = '' - patchShebangs . - # TODO: remove this after update - ln -s 3.30 common/gnome-shell/3.32 - ''; - preBuild = '' # Shut up inkscape's warnings about creating profile directory export HOME="$NIX_BUILD_ROOT" ''; - configureFlags = [ "--disable-unity" ]; + configureFlags = [ + "--with-gnome-shell=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}" + "--disable-unity" + ]; postInstall = '' install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md ''; meta = with stdenv.lib; { - description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell"; - homepage = https://github.com/NicoHood/arc-theme; + description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell"; + homepage = https://github.com/arc-design/arc-theme; license = licenses.gpl3; maintainers = with maintainers; [ simonvandel romildo ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index 02c1b91a3eb..4a1458ee7a5 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "materia-theme"; - version = "20190831"; + version = "20190912"; src = fetchFromGitHub { owner = "nana-4"; repo = pname; rev = "v${version}"; - sha256 = "19b2wyq38wj3id0an47jln1y3zp5ih3kbrgmfpjp6bbdrmfcyccf"; + sha256 = "07vbql1y9jfd0m34lw1674cfr6217dzg3irk0450kny8sjrrj6dx"; }; nativeBuildInputs = [ glib libxml2 bc ]; diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index 1fc82e8aca2..714e026d32c 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; - version = "2019-05-21"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "f6167740b308715b38567ec660aa5241d964af1b"; - sha256 = "1k57f5vimdrciskjgxqz7k0xybc7b8pwcsii0p6kc8klmyrjrr9c"; + rev = version; + sha256 = "1qffh6jsvy61f29ymw1v9hpjnsvhqin19mp05cys1lnwc7y810zr"; }; buildInputs = [ gtk_engines ]; diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 5d68396a498..869f08154bb 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -38,7 +38,9 @@ let }; deepin-turbo = callPackage ./deepin-turbo { }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; - deepin-wm = callPackage ./deepin-wm { }; + deepin-wm = callPackage ./deepin-wm { + vala = pkgs.vala_0_42; + }; dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { }; dtkcore = callPackage ./dtkcore { }; dtkwidget = callPackage ./dtkwidget { }; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index b2a9d398709..a5724385e41 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, - xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, - luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa, - xkeyboard_config, pcre, +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, alsaLib, bc, + bzip2, efl, gdbm, libXdmcp, libXrandr, libcap, libffi, + libpthreadstubs, libxcb, luajit, mesa, pam, pcre, xcbutilkeysyms, + xkeyboard_config, bluetoothSupport ? true, bluez5, pulseSupport ? !stdenv.isDarwin, libpulseaudio, @@ -17,27 +17,28 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson - ninja (pkgconfig.override { vanilla = true; }) gettext + meson + ninja ]; buildInputs = [ + alsaLib + bc # for the Everything module calculator mode + bzip2 efl + gdbm libXdmcp - libxcb - xcbutilkeysyms libXrandr libffi - pam - alsaLib - luajit - bzip2 libpthreadstubs - gdbm - pcre + libxcb + luajit mesa + pam + pcre + xcbutilkeysyms xkeyboard_config ] ++ stdenv.lib.optional stdenv.isLinux libcap @@ -68,6 +69,9 @@ stdenv.mkDerivation rec { substituteInPlace src/bin/e_import_config_dialog.c \ --replace "e_prefix_bin_get()" "\"${efl}/bin\"" + + substituteInPlace src/modules/everything/evry_plug_calc.c \ + --replace "ecore_exe_pipe_run(\"bc -l\"" "ecore_exe_pipe_run(\"${bc}/bin/bc -l\"" ''; mesonFlags = [ "-Dsystemdunitdir=lib/systemd/user" ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 27ce5d0f078..2f0a21896e9 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -61,6 +61,6 @@ in stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/Boxes; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch b/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch new file mode 100644 index 00000000000..0e1c33773b0 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch @@ -0,0 +1,147 @@ +From 76477def5c103f10d62e604305802d7f5506afd4 Mon Sep 17 00:00:00 2001 +From: worldofpeace <worldofpeace@protonmail.ch> +Date: Sun, 15 Sep 2019 20:14:16 -0400 +Subject: [PATCH] Revert "ClutterActor: Preserve valid paint volumes till the + next relayout/repaint" + +This causes issues for users of mutter like in gala[0]. + +Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536 +[0]: https://github.com/elementary/gala/issues/605 +--- + clutter/clutter/clutter-actor.c | 35 +++++---------------------------- + 1 file changed, 5 insertions(+), 30 deletions(-) + +diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c +index e70892308..8cb60fa07 100644 +--- a/clutter/clutter/clutter-actor.c ++++ b/clutter/clutter/clutter-actor.c +@@ -24,7 +24,7 @@ + + /** + * SECTION:clutter-actor +- * @short_description: The basic element of the scene graph ++ * @short_description: The basic element of the scene graph + * + * The ClutterActor class is the basic element of the scene graph in Clutter, + * and it encapsulates the position, size, and transformations of a node in +@@ -840,7 +840,6 @@ struct _ClutterActorPrivate + guint needs_compute_expand : 1; + guint needs_x_expand : 1; + guint needs_y_expand : 1; +- guint needs_paint_volume_update : 1; + guint had_effects_on_last_paint_volume_update : 1; + }; + +@@ -1511,8 +1510,6 @@ clutter_actor_real_map (ClutterActor *self) + + CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_MAPPED); + +- self->priv->needs_paint_volume_update = TRUE; +- + stage = _clutter_actor_get_stage_internal (self); + priv->pick_id = _clutter_stage_acquire_pick_id (CLUTTER_STAGE (stage), self); + +@@ -2746,7 +2743,6 @@ clutter_actor_real_queue_relayout (ClutterActor *self) + priv->needs_width_request = TRUE; + priv->needs_height_request = TRUE; + priv->needs_allocation = TRUE; +- priv->needs_paint_volume_update = TRUE; + + /* reset the cached size requests */ + memset (priv->width_requests, 0, +@@ -4742,7 +4738,7 @@ clutter_actor_set_rotation_center_internal (ClutterActor *self, + ClutterRotateAxis axis, + const ClutterVertex *center) + { +- ClutterVertex v = CLUTTER_VERTEX_INIT_ZERO; ++ ClutterVertex v = CLUTTER_VERTEX_INIT_ZERO; + GObject *obj = G_OBJECT (self); + ClutterTransformInfo *info; + +@@ -8531,7 +8527,6 @@ clutter_actor_init (ClutterActor *self) + priv->needs_width_request = TRUE; + priv->needs_height_request = TRUE; + priv->needs_allocation = TRUE; +- priv->needs_paint_volume_update = TRUE; + + priv->cached_width_age = 1; + priv->cached_height_age = 1; +@@ -10098,9 +10093,6 @@ clutter_actor_allocate (ClutterActor *self, + return; + } + +- if (CLUTTER_ACTOR_IS_MAPPED (self)) +- self->priv->needs_paint_volume_update = TRUE; +- + if (!stage_allocation_changed) + { + /* If the actor didn't move but needs_allocation is set, we just +@@ -12992,9 +12984,6 @@ clutter_actor_add_child_internal (ClutterActor *self, + child->priv->needs_height_request = TRUE; + child->priv->needs_allocation = TRUE; + +- if (CLUTTER_ACTOR_IS_MAPPED (child)) +- child->priv->needs_paint_volume_update = TRUE; +- + /* we only queue a relayout here, because any possible + * redraw has already been queued either by show() or + * by our call to queue_redraw() above +@@ -14130,7 +14119,7 @@ clutter_actor_get_anchor_point_gravity (ClutterActor *self) + * + * Since: 0.6 + * +- * Deprecated: 1.12: Use #ClutterActor:pivot-point and ++ * Deprecated: 1.12: Use #ClutterActor:pivot-point and + * clutter_actor_set_translation() instead. + */ + void +@@ -14178,7 +14167,7 @@ clutter_actor_move_anchor_point (ClutterActor *self, + * + * Since: 0.6 + * +- * Deprecated: 1.12: Use #ClutterActor:pivot-point and ++ * Deprecated: 1.12: Use #ClutterActor:pivot-point and + * clutter_actor_set_translation() instead. + */ + void +@@ -14230,7 +14219,7 @@ clutter_actor_move_anchor_point_from_gravity (ClutterActor *self, + * + * Since: 0.6 + * +- * Deprecated: 1.12: Use #ClutterActor:pivot-point and ++ * Deprecated: 1.12: Use #ClutterActor:pivot-point and + * clutter_actor_set_translation() instead. E.g. For %CLUTTER_GRAVITY_CENTER set + * pivot_point to (0.5,0.5) and the translation to (width/2,height/2). + */ +@@ -17567,19 +17556,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) + + if (priv->paint_volume_valid) + { +- /* If effects are applied, the actor paint volume +- * needs to be recomputed on each paint, since those +- * paint volumes could change over the duration of the +- * effect. +- * +- * We also need to update the paint volume if we went +- * from having effects to not having effects on the last +- * paint volume update. */ +- if (!priv->needs_paint_volume_update && +- priv->current_effect == NULL && +- !has_paint_volume_override_effects && +- !priv->had_effects_on_last_paint_volume_update) +- return &priv->paint_volume; + clutter_paint_volume_free (&priv->paint_volume); + } + +@@ -17588,7 +17564,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) + if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume)) + { + priv->paint_volume_valid = TRUE; +- priv->needs_paint_volume_update = FALSE; + return &priv->paint_volume; + } + else +-- +2.22.1 + diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index 41527298ffb..cc00fc5ece4 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -54,6 +54,8 @@ stdenv.mkDerivation rec { url = "https://github.com/elementary/os-patches/commit/d636a44885c5be662997f8e19f7dcd26670b3219.patch"; sha256 = "12pbxk6f39a09jxjam5a5hxl4whp3cifzpck2m7fpp0n98nc63qh"; }) + # See patch commit message + ./0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch ]; configureFlags = [ diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 15dea9b1018..f19114a5442 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atril"; - version = "1.22.1"; + version = "1.22.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0i2wgsksgwhrmajj1lay3iym4dcyj8cdd813yh5mrfz4rkv49190"; + sha256 = "11l78zkxszvsjr74cmk1wff5ycqrzd89y6k36rydv2rb5af2nsfw"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 039d75beb4f..aed08c35a80 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -90,9 +90,7 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-default-settings = callPackage ./desktop/elementary-default-settings { }; - elementary-greeter = callPackage ./desktop/elementary-greeter { - inherit (gnome3) gnome-desktop; - }; + elementary-greeter = callPackage ./desktop/elementary-greeter { }; elementary-print-shim = callPackage ./desktop/elementary-print-shim { }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 8ef85b90a3b..963418feec0 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,12 +1,33 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, substituteAll, meson -, ninja, vala, desktop-file-utils, gtk3, granite, libgee, elementary-settings-daemon -, gnome-desktop, mutter, elementary-icon-theme, wingpanel-with-indicators -, elementary-gtk-theme, nixos-artwork, lightdm, numlockx -, clutter-gtk, libGL, dbus, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, linkFarm +, elementary-greeter +, pantheon +, pkgconfig +, meson +, ninja +, vala +, desktop-file-utils +, gtk3 +, granite +, libgee +, elementary-settings-daemon +, mutter +, elementary-icon-theme +, wingpanel-with-indicators +, elementary-gtk-theme +, nixos-artwork +, lightdm +, gdk-pixbuf +, clutter-gtk +, dbus +, accountsservice +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "3.3.1"; + version = "5.0"; repoName = "greeter"; @@ -14,7 +35,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1vkq4z0hrmvzv4sh2qkxjajdxcycd1zj97a3pc8n4yb858pqfyzc"; + sha256 = "01c8acarxwpakyq69xm4bjwppjf8v3ijmns8masd8raxligb2v8b"; }; passthru = { @@ -22,6 +43,11 @@ stdenv.mkDerivation rec { inherit repoName; attrPath = pname; }; + + xgreeters = linkFarm "pantheon-greeter-xgreeters" [{ + path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop"; + name = "io.elementary.greeter.desktop"; + }]; }; nativeBuildInputs = [ @@ -34,38 +60,32 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - clutter-gtk - elementary-icon-theme + accountsservice + clutter-gtk # else we get could not generate cargs for mutter-clutter-2 elementary-gtk-theme + elementary-icon-theme elementary-settings-daemon - gnome-desktop + gdk-pixbuf granite gtk3 libgee - libGL lightdm mutter wingpanel-with-indicators ]; - patches = [ - (substituteAll { - src = ./gsd.patch; - elementary_settings_daemon = "${elementary-settings-daemon}/libexec/"; - }) - (substituteAll { - src = ./numlockx.patch; - inherit numlockx; - }) - ./01-sysconfdir-install.patch - ./hardcode-theme.patch - ]; - mesonFlags = [ # A hook does this but after wrapGAppsHook so the files never get wrapped. "--sbindir=${placeholder "out"}/bin" # baked into the program for discovery of the greeter configuration "--sysconfdir=/etc" + # We use the patched gnome-settings-daemon + "-Dubuntu-patched-gsd=true" + "-Dgsd-dir=${elementary-settings-daemon}/libexec/" # trailing slash is needed + ]; + + patches = [ + ./sysconfdir-install.patch ]; preFixup = '' @@ -76,18 +96,19 @@ stdenv.mkDerivation rec { # for `wingpanel -g` --prefix PATH : "${wingpanel-with-indicators}/bin" - # TODO: they should be using meson for this - # See: https://github.com/elementary/greeter/blob/19c0730fded4e9ddec5a491f0e78f83c7c04eb59/src/PantheonGreeter.vala#L451 + # for the compositor --prefix PATH : "$out/bin" ) ''; postFixup = '' - substituteInPlace $out/share/xgreeters/io.elementary.greeter.desktop \ - --replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter" - + # Use NixOS default wallpaper substituteInPlace $out/etc/lightdm/io.elementary.greeter.conf \ - --replace "#default-wallpaper=/usr/share/backgrounds/elementaryos-default" "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png" + --replace "#default-wallpaper=/usr/share/backgrounds/elementaryos-default" \ + "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png" + + substituteInPlace $out/share/xgreeters/io.elementary.greeter.desktop \ + --replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch deleted file mode 100644 index bcbf604c6a2..00000000000 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/meson.build b/src/meson.build -index 2450c1a..a908d11 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -1,7 +1,7 @@ - conf_data = configuration_data() - conf_data.set('CONF_DIR', join_paths(get_option('sysconfdir'), 'lightdm')) - conf_data.set('GETTEXT_PACKAGE', meson.project_name()) --conf_data.set('GSD_DIR', '/usr/lib/gnome-settings-daemon/') -+conf_data.set('GSD_DIR', '@elementary_settings_daemon@') - conf_data.set('VERSION', meson.project_version()) - config_header = configure_file ( - input: 'config.vala.in', diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch deleted file mode 100644 index e9263aab736..00000000000 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala -index 11aa4c0..daf4a8a 100644 ---- a/src/PantheonGreeter.vala -+++ b/src/PantheonGreeter.vala -@@ -474,6 +474,10 @@ public static int main (string [] args) { - Gdk.CursorType.LEFT_PTR); - Gdk.get_default_root_window ().set_cursor (cursor); - -+ var settings = Gtk.Settings.get_default (); -+ settings.gtk_icon_theme_name = "elementary"; -+ settings.gtk_theme_name = "elementary"; -+ - var icon_theme = Gtk.IconTheme.get_default (); - icon_theme.add_resource_path ("/io/elementary/greeter/icons"); - diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch deleted file mode 100644 index 2c7766b4284..00000000000 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala -index 11aa4c0..ae7bf7e 100644 ---- a/src/PantheonGreeter.vala -+++ b/src/PantheonGreeter.vala -@@ -163,7 +163,7 @@ public class PantheonGreeter : Gtk.Window { - warning (e.message); - } - if (activate_numlock) { -- Granite.Services.System.execute_command ("/usr/bin/numlockx on"); -+ Granite.Services.System.execute_command ("@numlockx@/bin/numlockx on"); - } - - var screensaver_timeout = 60; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/sysconfdir-install.patch index 626e56ce596..9bacbcf4f98 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/sysconfdir-install.patch @@ -1,14 +1,14 @@ -From 2384bee55a46eac44eb9d329be4c2a097e053ae1 Mon Sep 17 00:00:00 2001 +From 7bb0d507cbb0122f167127b9f6460bd53d8234de Mon Sep 17 00:00:00 2001 From: worldofpeace <worldofpeace@users.noreply.github.com> -Date: Tue, 17 Jul 2018 07:04:18 -0400 -Subject: [PATCH 1/1] 'sysconfdir' will be etc not /etc for install +Date: Sat, 16 Mar 2019 16:07:24 -0400 +Subject: [PATCH] 'sysconfdir' will be etc not /etc for install --- data/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/meson.build b/data/meson.build -index 7621b03..7c08eaf 100644 +index fd54b75..b1120ae 100644 --- a/data/meson.build +++ b/data/meson.build @@ -20,7 +20,7 @@ i18n.merge_file ( @@ -19,7 +19,7 @@ index 7621b03..7c08eaf 100644 + install_dir: join_paths(get_option('prefix'), 'etc', 'lightdm') ) - install_data( + test ( -- -2.17.1 +2.19.2 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index b98c205d491..06f0fc23a39 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -14,6 +14,8 @@ , mutter , json-glib , python3 +, elementary-gtk-theme +, elementary-icon-theme }: stdenv.mkDerivation rec { @@ -44,6 +46,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + elementary-gtk-theme + elementary-icon-theme gala granite gtk3 diff --git a/pkgs/desktops/xfce4-14/default.nix b/pkgs/desktops/xfce4-14/default.nix index 294dfa92c79..0e2c8c1696b 100644 --- a/pkgs/desktops/xfce4-14/default.nix +++ b/pkgs/desktops/xfce4-14/default.nix @@ -93,8 +93,6 @@ makeScope newScope (self: with self; { ## COMMON PARTS WITH XFCE 4.12 - gtk-xfce-engine = callPackage ../xfce/core/gtk-xfce-engine.nix { withGtk3 = false; }; - xfce4-icon-theme = callPackage ../xfce/art/xfce4-icon-theme.nix { }; xfwm4-themes = callPackage ../xfce/art/xfwm4-themes.nix { }; @@ -113,7 +111,6 @@ makeScope newScope (self: with self; { ## ALIASES - - # added 2019-08-18 - xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; + xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18 + gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17 }) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 12d68f0265c..a0fc30c8586 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-error=format-truncation"; /* ** We patch out a very annoying 'feature' in ./configure, which diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index ea305cc5c84..d92d712a3ff 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchgit, flex, bison, pkgconfig, python2, swig, which }: +{ stdenv, lib, fetchgit, flex, bison, pkgconfig, which +, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python2, swig +}: stdenv.mkDerivation rec { pname = "dtc"; - version = "1.5.0"; + version = "1.5.1"; src = fetchgit { url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git"; rev = "refs/tags/v${version}"; - sha256 = "075gj8bbahfdb8dlif3d2dpzjrkyf3bwbcmx96zpwhlgs0da8jxh"; + sha256 = "1jhhfrg22h53lvm2lqhd66pyk20pil08ry03wcwyx1c3ln27k73z"; }; - nativeBuildInputs = [ flex bison pkgconfig swig which ]; - buildInputs = [ python2 ]; + nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python2 swig ]; + buildInputs = lib.optionals pythonSupport [ python2 ]; postPatch = '' patchShebangs pylibfdt/ ''; + makeFlags = lib.optionals (!pythonSupport) [ "NO_PYTHON=1" ]; installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Device Tree Compiler"; homepage = https://git.kernel.org/cgit/utils/dtc/dtc.git; license = licenses.gpl2; # dtc itself is GPLv2, libfdt is dual GPL/BSD diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index c27f2a22670..bede9fa4aa6 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation { description = "Lisp implementation aiming to be small, fast and easy to embed"; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index c8bef546b6d..676fa19d9e8 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; }; - hsPkgs = haskell.packages.ghc864.override { + hsPkgs = haskell.packages.ghc865.override { overrides = self: super: with haskell.lib; let elmPkgs = rec { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { @@ -56,6 +56,8 @@ let */ elm-test = patchBinwrap [elmi-to-json] elmNodePackages.elm-test; elm-verify-examples = patchBinwrap [elmi-to-json] elmNodePackages.elm-verify-examples; + elm-language-server = elmNodePackages."@elm-tooling/elm-language-server"; + # elm-analyse@0.16.4 build is not working elm-analyse = elmNodePackages."elm-analyse-0.16.3"; inherit (elmNodePackages) elm-doc-preview elm-live elm-upgrade elm-xref; diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index 870ad900210..1ffd758ac82 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json index 5ba7e49bfa6..9faaaced709 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.json +++ b/pkgs/development/compilers/elm/packages/node-packages.json @@ -5,5 +5,6 @@ "elm-upgrade", { "elm-analyse": "0.16.3" }, "elm-live", - "elm-xref" + "elm-xref", + "@elm-tooling/elm-language-server" ] diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 7605c377057..45fb96ed693 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -13,6 +13,33 @@ let sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA=="; }; }; + "@nodelib/fs.scandir-2.1.2" = { + name = "_at_nodelib_slash_fs.scandir"; + packageName = "@nodelib/fs.scandir"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.2.tgz"; + sha512 = "wrIBsjA5pl13f0RN4Zx4FNWmU71lv03meGKnqRUoCyan17s4V3WL92f3w3AIuWbNnpcrQyFBU5qMavJoB8d27w=="; + }; + }; + "@nodelib/fs.stat-2.0.2" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.2.tgz"; + sha512 = "z8+wGWV2dgUhLqrtRYa03yDx4HWMvXKi1z8g3m2JyxAx8F7xk74asqPk5LAETjqDSGLFML/6CDl0+yFunSYicw=="; + }; + }; + "@nodelib/fs.walk-1.2.3" = { + name = "_at_nodelib_slash_fs.walk"; + packageName = "@nodelib/fs.walk"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.3.tgz"; + sha512 = "l6t8xEhfK9Sa4YO5mIRdau7XSOADfmh3jCr0evNHdY+HNkW6xuQhgMH7D73VV6WpZOagrW0UludvMTiifiwTfA=="; + }; + }; "@sindresorhus/is-0.7.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; @@ -22,6 +49,42 @@ let sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; }; }; + "@types/events-3.0.0" = { + name = "_at_types_slash_events"; + packageName = "@types/events"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; + sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; + }; + }; + "@types/glob-7.1.1" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz"; + sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; + }; + }; + "@types/minimatch-3.0.3" = { + name = "_at_types_slash_minimatch"; + packageName = "@types/minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; + }; + }; + "@types/node-12.7.5" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "12.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz"; + sha512 = "9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w=="; + }; + }; "accepts-1.3.7" = { name = "accepts"; packageName = "accepts"; @@ -85,13 +148,13 @@ let sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; }; }; - "anymatch-3.0.3" = { + "anymatch-3.1.0" = { name = "anymatch"; packageName = "anymatch"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz"; - sha512 = "c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g=="; + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.0.tgz"; + sha512 = "Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA=="; }; }; "arr-diff-4.0.0" = { @@ -130,6 +193,15 @@ let sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; }; }; + "array-union-2.1.0" = { + name = "array-union"; + packageName = "array-union"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; + }; + }; "array-unique-0.3.2" = { name = "array-unique"; packageName = "array-unique"; @@ -517,13 +589,13 @@ let sha512 = "IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg=="; }; }; - "chokidar-3.0.0" = { + "chokidar-3.0.2" = { name = "chokidar"; packageName = "chokidar"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.0.tgz"; - sha512 = "ebzWopcacB2J19Jsb5RPtMrzmjUZ5VAQnsL0Ztrix3lswozHbiDp+1Lg3AWSKHdwsps/W2vtshA/x3I827F78g=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz"; + sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; "chownr-1.1.2" = { @@ -544,15 +616,6 @@ let sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; - "cli-color-1.2.0" = { - name = "cli-color"; - packageName = "cli-color"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-color/-/cli-color-1.2.0.tgz"; - sha1 = "3a5ae74fd76b6267af666e69e2afbbd01def34d1"; - }; - }; "cliui-5.0.0" = { name = "cliui"; packageName = "cliui"; @@ -616,22 +679,13 @@ let sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; }; }; - "commander-2.9.0" = { - name = "commander"; - packageName = "commander"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; - }; - }; - "commander-3.0.0" = { + "commander-3.0.1" = { name = "commander"; packageName = "commander"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-3.0.0.tgz"; - sha512 = "pl3QrGOBa9RZaslQiqnnKX2J068wcQw7j9AIaBQ9/JEp5RY6je4jKTImg0Bd+rpoONSe7GUFSgkxLeo17m3Pow=="; + url = "https://registry.npmjs.org/commander/-/commander-3.0.1.tgz"; + sha512 = "UNgvDd+csKdc9GD4zjtkHKQbT8Aspt2jCBqNSPp53vAS0L1tS9sXB2TCEOPHJ7kt9bN/niWkYj8T3RQSoMXdSQ=="; }; }; "component-emitter-1.3.0" = { @@ -670,15 +724,6 @@ let sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; - "connect-pushstate-1.1.0" = { - name = "connect-pushstate"; - packageName = "connect-pushstate"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-pushstate/-/connect-pushstate-1.1.0.tgz"; - sha1 = "bcab224271c439604a0fb0f614c0a5f563e88e24"; - }; - }; "content-disposition-0.5.2" = { name = "content-disposition"; packageName = "content-disposition"; @@ -778,6 +823,15 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; + "crocks-0.12.1" = { + name = "crocks"; + packageName = "crocks"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/crocks/-/crocks-0.12.1.tgz"; + sha512 = "2qCRJwBmPlRQXzd50k9gt9PaItultOP8lj/cKSH2Eai9aeBuNqAnDuyolAm9TGn6Pw/4BgbxtPJLU1S+tQ4WMQ=="; + }; + }; "cross-spawn-4.0.0" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -814,15 +868,6 @@ let sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; }; }; - "d-1.0.1" = { - name = "d"; - packageName = "d"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; - sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -886,13 +931,13 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; - "default-gateway-2.7.2" = { + "default-gateway-4.2.0" = { name = "default-gateway"; packageName = "default-gateway"; - version = "2.7.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz"; - sha512 = "lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ=="; + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz"; + sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; }; }; "define-properties-1.1.3" = { @@ -967,6 +1012,15 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; + "dir-glob-3.0.1" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; + }; + }; "duplexer3-0.1.4" = { name = "duplexer3"; packageName = "duplexer3"; @@ -994,13 +1048,23 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "elm-serve-0.4.0" = { - name = "elm-serve"; - packageName = "elm-serve"; - version = "0.4.0"; + "elm-analyse-git://github.com/elm-tooling/elm-analyse#f2a983fc7bab262a3e44b46732735d8510d18876" = { + name = "elm-analyse"; + packageName = "elm-analyse"; + version = "0.16.4"; + src = fetchgit { + url = "git://github.com/elm-tooling/elm-analyse"; + rev = "f2a983fc7bab262a3e44b46732735d8510d18876"; + sha256 = "ce2770330503a0b8fe56eb369a95e9bad13b46676ff76f5303570d731cea4de2"; + }; + }; + "elm-hot-1.1.1" = { + name = "elm-hot"; + packageName = "elm-hot"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-serve/-/elm-serve-0.4.0.tgz"; - sha512 = "NYXzzaJT/zw8v7jzDWGXuvX3/soj+5NTLHxX0n/T6DICbmyDj8kO7rlI2wSKs9UTNjXhZ7quFQEKcgcf/SZksw=="; + url = "https://registry.npmjs.org/elm-hot/-/elm-hot-1.1.1.tgz"; + sha512 = "ZHjoHd2Ev6riNXNQirj3J+GKKXXwedAUikfFBYzlVL/+3CdGs96cpZ7nhAk4c5l//Qa9ymltrqX36mOlr0pPFA=="; }; }; "elm-test-0.19.0-rev6" = { @@ -1048,13 +1112,13 @@ let sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; }; }; - "es-abstract-1.13.0" = { + "es-abstract-1.14.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.13.0"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz"; - sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz"; + sha512 = "DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg=="; }; }; "es-to-primitive-1.2.0" = { @@ -1066,24 +1130,6 @@ let sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; }; }; - "es5-ext-0.10.50" = { - name = "es5-ext"; - packageName = "es5-ext"; - version = "0.10.50"; - src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz"; - sha512 = "KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw=="; - }; - }; - "es6-iterator-2.0.3" = { - name = "es6-iterator"; - packageName = "es6-iterator"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; - sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; - }; - }; "es6-promisify-6.0.2" = { name = "es6-promisify"; packageName = "es6-promisify"; @@ -1093,24 +1139,6 @@ let sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg=="; }; }; - "es6-symbol-3.1.1" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; - }; - }; - "es6-weak-map-2.0.3" = { - name = "es6-weak-map"; - packageName = "es6-weak-map"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz"; - sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; - }; - }; "escape-html-1.0.3" = { name = "escape-html"; packageName = "escape-html"; @@ -1138,15 +1166,6 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "event-emitter-0.3.5" = { - name = "event-emitter"; - packageName = "event-emitter"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; - sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; - }; - }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -1165,22 +1184,22 @@ let sha512 = "9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="; }; }; - "execa-0.10.0" = { + "execa-1.0.0" = { name = "execa"; packageName = "execa"; - version = "0.10.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz"; - sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw=="; + url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-1.0.0" = { + "execa-2.0.4" = { name = "execa"; packageName = "execa"; - version = "1.0.0"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; - sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + url = "https://registry.npmjs.org/execa/-/execa-2.0.4.tgz"; + sha512 = "VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ=="; }; }; "expand-brackets-2.1.4" = { @@ -1282,6 +1301,24 @@ let sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; + "fast-diff-1.2.0" = { + name = "fast-diff"; + packageName = "fast-diff"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"; + sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; + }; + }; + "fast-glob-3.0.4" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.0.4.tgz"; + sha512 = "wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg=="; + }; + }; "fast-json-stable-stringify-2.0.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; @@ -1291,6 +1328,15 @@ let sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; }; + "fastq-1.6.0" = { + name = "fastq"; + packageName = "fastq"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz"; + sha512 = "jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA=="; + }; + }; "fb-watchman-2.0.0" = { name = "fb-watchman"; packageName = "fb-watchman"; @@ -1399,13 +1445,13 @@ let sha1 = "b88673c42009f8821fac2926e99720acee924fae"; }; }; - "follow-redirects-1.8.1" = { + "follow-redirects-1.9.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.8.1.tgz"; - sha512 = "micCIbldHioIegeKs41DoH0KS3AXfFzgS30qVkM6z/XOE/GJgvmsoc839NUqa1B9udYe9dQxgv7KFwng6+p/dw=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz"; + sha512 = "CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A=="; }; }; "for-in-1.0.2" = { @@ -1597,6 +1643,15 @@ let sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; + "get-stream-5.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; + sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; + }; + }; "get-value-2.0.6" = { name = "get-value"; packageName = "get-value"; @@ -1651,6 +1706,15 @@ let sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg=="; }; }; + "globby-10.0.1" = { + name = "globby"; + packageName = "globby"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz"; + sha512 = "sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A=="; + }; + }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -1678,15 +1742,6 @@ let sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="; }; }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; - }; - }; "har-schema-2.0.0" = { name = "har-schema"; packageName = "har-schema"; @@ -1840,6 +1895,15 @@ let sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; }; + "http-errors-1.7.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; + sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; + }; + }; "http-proxy-1.17.0" = { name = "http-proxy"; packageName = "http-proxy"; @@ -1876,6 +1940,15 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; + "ignore-5.1.4" = { + name = "ignore"; + packageName = "ignore"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz"; + sha512 = "MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A=="; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -1912,13 +1985,13 @@ let sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; }; }; - "internal-ip-3.0.1" = { + "internal-ip-4.3.0" = { name = "internal-ip"; packageName = "internal-ip"; - version = "3.0.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz"; - sha512 = "NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q=="; + url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz"; + sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; "into-stream-3.1.0" = { @@ -2155,15 +2228,6 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-promise-2.1.0" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - }; "is-redirect-1.0.0" = { name = "is-redirect"; packageName = "is-redirect"; @@ -2182,13 +2246,13 @@ let sha1 = "5517489b547091b0930e095654ced25ee97e9491"; }; }; - "is-retry-allowed-1.1.0" = { + "is-retry-allowed-1.2.0" = { name = "is-retry-allowed"; packageName = "is-retry-allowed"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; - sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; + sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="; }; }; "is-stream-1.1.0" = { @@ -2200,6 +2264,15 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; + "is-stream-2.0.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + }; + }; "is-symbol-1.0.2" = { name = "is-symbol"; packageName = "is-symbol"; @@ -2452,6 +2525,15 @@ let sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; + "lodash-4.17.15" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.15"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; + }; + }; "lowercase-keys-1.0.0" = { name = "lowercase-keys"; packageName = "lowercase-keys"; @@ -2479,15 +2561,6 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; - "lru-queue-0.1.0" = { - name = "lru-queue"; - packageName = "lru-queue"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz"; - sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; - }; - }; "makeerror-1.0.11" = { name = "makeerror"; packageName = "makeerror"; @@ -2533,15 +2606,6 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "memoizee-0.4.14" = { - name = "memoizee"; - packageName = "memoizee"; - version = "0.4.14"; - src = fetchurl { - url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz"; - sha512 = "/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg=="; - }; - }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -2551,6 +2615,24 @@ let sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; }; }; + "merge-stream-2.0.0" = { + name = "merge-stream"; + packageName = "merge-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; + }; + }; + "merge2-1.3.0" = { + name = "merge2"; + packageName = "merge2"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz"; + sha512 = "2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw=="; + }; + }; "methods-1.1.2" = { name = "methods"; packageName = "methods"; @@ -2569,6 +2651,15 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; + "micromatch-4.0.2" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; + sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; + }; + }; "mime-1.4.1" = { name = "mime"; packageName = "mime"; @@ -2587,6 +2678,15 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; + "mime-2.4.3" = { + name = "mime"; + packageName = "mime"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz"; + sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="; + }; + }; "mime-db-1.40.0" = { name = "mime-db"; packageName = "mime-db"; @@ -2605,6 +2705,15 @@ let sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; "mimic-response-1.0.1" = { name = "mimic-response"; packageName = "mimic-response"; @@ -2641,22 +2750,22 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "minipass-2.4.0" = { + "minipass-2.5.1" = { name = "minipass"; packageName = "minipass"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.4.0.tgz"; - sha512 = "6PmOuSP4NnZXzs2z6rbwzLJu/c5gdzYg1mRI/WIYdx45iiX7T+a4esOzavD6V/KmBzAaopFSTZPZcUx73bqKWA=="; + url = "https://registry.npmjs.org/minipass/-/minipass-2.5.1.tgz"; + sha512 = "dmpSnLJtNQioZFI5HfQ55Ad0DzzsMAb+HfokwRTNXwEQjepbTkl5mtIlSVxGIkOkxlpX7wIn5ET/oAd9fZ/Y/Q=="; }; }; - "minizlib-1.2.1" = { + "minizlib-1.2.2" = { name = "minizlib"; packageName = "minizlib"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz"; - sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA=="; + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz"; + sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ=="; }; }; "mixin-deep-1.3.2" = { @@ -2713,13 +2822,13 @@ let sha1 = "5041049269c96633c866386960b2f4289e75e5b0"; }; }; - "mustache-3.0.3" = { + "mustache-3.1.0" = { name = "mustache"; packageName = "mustache"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-3.0.3.tgz"; - sha512 = "vM5FkMHamTYmVYeAujypihuPrJQDtaUIlKeeVb1AMJ73OZLtWiF7GprqrjxD0gJWT53W9JfqXxf97nXQjMQkqA=="; + url = "https://registry.npmjs.org/mustache/-/mustache-3.1.0.tgz"; + sha512 = "3Bxq1R5LBZp7fbFPZzFe5WN4s0q3+gxZaZuZVY+QctYJiCiVgXHOTIC0/HgZuOPFt/6BQcx5u0H2CUOxT/RoGQ=="; }; }; "nan-2.14.0" = { @@ -2749,15 +2858,6 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; - "next-tick-1.0.0" = { - name = "next-tick"; - packageName = "next-tick"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; - sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; - }; - }; "nice-try-1.0.5" = { name = "nice-try"; packageName = "nice-try"; @@ -2839,6 +2939,15 @@ let sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; }; }; + "npm-run-path-3.1.0" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz"; + sha512 = "Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg=="; + }; + }; "npx-10.2.0" = { name = "npx"; packageName = "npx"; @@ -2875,6 +2984,15 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; + "object-inspect-1.6.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz"; + sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="; + }; + }; "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; @@ -2929,13 +3047,22 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "opn-5.3.0" = { - name = "opn"; - packageName = "opn"; - version = "5.3.0"; + "onetime-5.1.0" = { + name = "onetime"; + packageName = "onetime"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz"; - sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g=="; + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; + sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; + }; + }; + "open-6.4.0" = { + name = "open"; + packageName = "open"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-6.4.0.tgz"; + sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="; }; }; "opn-5.4.0" = { @@ -3001,6 +3128,15 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; + "p-finally-2.0.1" = { + name = "p-finally"; + packageName = "p-finally"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz"; + sha512 = "vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="; + }; + }; "p-is-promise-1.1.0" = { name = "p-is-promise"; packageName = "p-is-promise"; @@ -3109,6 +3245,15 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; + "path-key-3.1.0" = { + name = "path-key"; + packageName = "path-key"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz"; + sha512 = "8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg=="; + }; + }; "path-to-regexp-0.1.7" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -3118,13 +3263,22 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "pem-1.13.2" = { + "path-type-4.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + }; + }; + "pem-1.14.2" = { name = "pem"; packageName = "pem"; - version = "1.13.2"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/pem/-/pem-1.13.2.tgz"; - sha512 = "MPJWuEb/r6AG+GpZi2JnfNtGAZDeL/8+ERKwXEWRuST5i+4lq/Uy36B352OWIUSPQGH+HR1HEDcIDi+8cKxXNg=="; + url = "https://registry.npmjs.org/pem/-/pem-1.14.2.tgz"; + sha512 = "TOnPtq3ZFnCniOZ+rka4pk8UIze9xG1qI+wNE7EmkiR/cg+53uVvk5QbkWZ7M6RsuOxzz62FW1hlAobJr/lTOA=="; }; }; "performance-now-2.1.0" = { @@ -3226,13 +3380,13 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.3.0" = { + "psl-1.4.0" = { name = "psl"; packageName = "psl"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz"; - sha512 = "avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag=="; + url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; + sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; }; }; "pump-3.0.0" = { @@ -3298,15 +3452,6 @@ let sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; - "querystringify-2.1.1" = { - name = "querystringify"; - packageName = "querystringify"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; - sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; - }; - }; "range-parser-1.2.1" = { name = "range-parser"; packageName = "range-parser"; @@ -3523,6 +3668,15 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; + "reusify-1.0.4" = { + name = "reusify"; + packageName = "reusify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + }; "rimraf-2.2.8" = { name = "rimraf"; packageName = "rimraf"; @@ -3550,6 +3704,24 @@ let sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="; }; }; + "run-parallel-1.1.9" = { + name = "run-parallel"; + packageName = "run-parallel"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; + sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; + }; + }; + "rxjs-6.5.3" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz"; + sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA=="; + }; + }; "safe-buffer-5.1.1" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -3757,6 +3929,15 @@ let sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; + "slash-3.0.0" = { + name = "slash"; + packageName = "slash"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; + }; + }; "snapdragon-0.8.2" = { name = "snapdragon"; packageName = "snapdragon"; @@ -3901,6 +4082,24 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; + "string.prototype.trimleft-2.1.0" = { + name = "string.prototype.trimleft"; + packageName = "string.prototype.trimleft"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz"; + sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw=="; + }; + }; + "string.prototype.trimright-2.1.0" = { + name = "string.prototype.trimright"; + packageName = "string.prototype.trimright"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz"; + sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg=="; + }; + }; "string_decoder-0.10.31" = { name = "string_decoder"; packageName = "string_decoder"; @@ -3946,6 +4145,15 @@ let sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; }; }; + "strip-final-newline-2.0.0" = { + name = "strip-final-newline"; + packageName = "strip-final-newline"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; + }; + }; "strip-json-comments-2.0.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -3964,15 +4172,6 @@ let sha1 = "d78c14398297d604fe6588dc3b03deca7b91ba93"; }; }; - "supervisor-0.12.0" = { - name = "supervisor"; - packageName = "supervisor"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supervisor/-/supervisor-0.12.0.tgz"; - sha1 = "de7e6337015b291851c10f3538c4a7f04917ecc1"; - }; - }; "supports-color-2.0.0" = { name = "supports-color"; packageName = "supports-color"; @@ -4063,15 +4262,6 @@ let sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; }; }; - "timers-ext-0.1.7" = { - name = "timers-ext"; - packageName = "timers-ext"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz"; - sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ=="; - }; - }; "tmp-0.0.31" = { name = "tmp"; packageName = "tmp"; @@ -4171,6 +4361,15 @@ let sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1"; }; }; + "tslib-1.10.0" = { + name = "tslib"; + packageName = "tslib"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz"; + sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="; + }; + }; "tunnel-agent-0.6.0" = { name = "tunnel-agent"; packageName = "tunnel-agent"; @@ -4189,15 +4388,6 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "type-1.0.3" = { - name = "type"; - packageName = "type"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-1.0.3.tgz"; - sha512 = "51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg=="; - }; - }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -4288,13 +4478,13 @@ let sha512 = "NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A=="; }; }; - "upath-1.1.2" = { + "upath-1.2.0" = { name = "upath"; packageName = "upath"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz"; - sha512 = "kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q=="; + url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"; + sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; }; }; "uri-js-4.2.2" = { @@ -4315,15 +4505,6 @@ let sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; }; }; - "url-parse-1.4.3" = { - name = "url-parse"; - packageName = "url-parse"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz"; - sha512 = "rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw=="; - }; - }; "url-parse-lax-1.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -4414,6 +4595,60 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; + "vscode-jsonrpc-4.0.0" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz"; + sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="; + }; + }; + "vscode-languageserver-5.2.1" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz"; + sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A=="; + }; + }; + "vscode-languageserver-protocol-3.14.1" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz"; + sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g=="; + }; + }; + "vscode-languageserver-types-3.14.0" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz"; + sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="; + }; + }; + "vscode-uri-1.0.8" = { + name = "vscode-uri"; + packageName = "vscode-uri"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz"; + sha512 = "obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ=="; + }; + }; + "vscode-uri-2.0.3" = { + name = "vscode-uri"; + packageName = "vscode-uri"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.0.3.tgz"; + sha512 = "4D3DI3F4uRy09WNtDGD93H9q034OHImxiIcSq664Hq1Y1AScehlP3qqZyTkX/RWxeu0MRMHGkrxYqm2qlDF/aw=="; + }; + }; "walker-1.0.7" = { name = "walker"; packageName = "walker"; @@ -4423,6 +4658,15 @@ let sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; }; }; + "web-tree-sitter-0.15.9" = { + name = "web-tree-sitter"; + packageName = "web-tree-sitter"; + version = "0.15.9"; + src = fetchurl { + url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.15.9.tgz"; + sha512 = "1lf4lnmi8oxuEzI6gpUok2FQlHXOmV1iipltkQvmR785JWnUbjhw1sZnwSCkisQP+/g/aezpMGcW3mjz0uVhMw=="; + }; + }; "which-1.3.1" = { name = "which"; packageName = "which"; @@ -4477,15 +4721,6 @@ let sha512 = "8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A=="; }; }; - "ws-5.2.0" = { - name = "ws"; - packageName = "ws"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz"; - sha512 = "c18dMeW+PEQdDFzkhDsnBAlS4Z8KGStBQQUcQ5mf7Nf689jyGk0594L+i9RaQuf4gog6SvWLJorz2NfSaqxZ7w=="; - }; - }; "ws-5.2.2" = { name = "ws"; packageName = "ws"; @@ -4504,6 +4739,24 @@ let sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; + "ws-7.1.1" = { + name = "ws"; + packageName = "ws"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.1.1.tgz"; + sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; + }; + }; + "ws-7.1.2" = { + name = "ws"; + packageName = "ws"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.1.2.tgz"; + sha512 = "gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg=="; + }; + }; "xmlbuilder-8.2.2" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -4780,12 +5033,12 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.4.0" // { + (sources."minipass-2.5.1" // { dependencies = [ sources."yallist-3.0.3" ]; }) - sources."minizlib-1.2.1" + sources."minizlib-1.2.2" sources."mixin-deep-1.3.2" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -4794,7 +5047,7 @@ in }) sources."ms-2.0.0" sources."murmur-hash-js-1.0.0" - sources."mustache-3.0.3" + sources."mustache-3.1.0" sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."node-elm-compiler-5.0.3" @@ -4824,7 +5077,7 @@ in sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -4949,7 +5202,7 @@ in ]; }) sources."unzip-stream-0.3.0" - sources."upath-1.1.2" + sources."upath-1.2.0" sources."uri-js-4.2.2" sources."urix-0.1.0" sources."use-3.1.1" @@ -5193,12 +5446,12 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.4.0" // { + (sources."minipass-2.5.1" // { dependencies = [ sources."yallist-3.0.3" ]; }) - sources."minizlib-1.2.1" + sources."minizlib-1.2.2" sources."mixin-deep-1.3.2" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -5207,7 +5460,7 @@ in }) sources."ms-2.0.0" sources."murmur-hash-js-1.0.0" - sources."mustache-3.0.3" + sources."mustache-3.1.0" sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."node-elm-compiler-5.0.3" @@ -5241,7 +5494,7 @@ in sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -5372,7 +5625,7 @@ in ]; }) sources."unzip-stream-0.3.0" - sources."upath-1.1.2" + sources."upath-1.2.0" sources."uri-js-4.2.2" sources."urix-0.1.0" sources."use-3.1.1" @@ -5465,7 +5718,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-3.0.0" + sources."commander-3.0.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."content-disposition-0.5.3" @@ -5488,7 +5741,7 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -5587,7 +5840,7 @@ in sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-regex-1.0.4" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-symbol-1.0.2" sources."is-windows-1.0.2" @@ -5642,6 +5895,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.6.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.getownpropertydescriptors-2.0.3" @@ -5760,6 +6014,8 @@ in }) sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -5844,7 +6100,7 @@ in sources."ini-1.3.5" sources."is-object-1.0.1" sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."isexe-2.0.0" sources."isurl-1.0.0" @@ -5983,7 +6239,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.5" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.1" sources."range-parser-1.2.1" @@ -6050,57 +6306,46 @@ in elm-live = nodeEnv.buildNodePackage { name = "elm-live"; packageName = "elm-live"; - version = "3.4.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-live/-/elm-live-3.4.1.tgz"; - sha512 = "7J4MCV0uyzfnGznSdVzz9o2vgHQwHSVKgEW/NG7dG7nsDWWxqPudQ/FkHYJFWjkylnRtBZUAtB27ZwnLIsgRUw=="; + url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.0.tgz"; + sha512 = "Yf6afXvBnghRZkefxgXCf/KjCm3DlwT6lfTrjLSc5v0I0VXE2Rc5T9iqXihjg3alh9t8NwDVLL+/py8PkkdC9Q=="; }; dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."anymatch-3.0.3" - sources."async-each-1.0.3" + sources."anymatch-3.1.0" sources."async-limiter-1.0.1" sources."binary-extensions-2.0.0" sources."braces-3.0.2" sources."chalk-1.1.3" sources."charenc-0.0.2" - sources."chokidar-3.0.0" - sources."cli-color-1.2.0" + sources."chokidar-3.0.2" sources."commander-2.17.1" - sources."connect-pushstate-1.1.0" + sources."crocks-0.12.1" sources."cross-spawn-5.0.1" sources."crypt-0.0.2" - sources."d-1.0.1" sources."debug-2.6.9" - sources."default-gateway-2.7.2" + sources."default-gateway-4.2.0" sources."depd-1.1.2" sources."destroy-1.0.4" sources."ee-first-1.1.1" - (sources."elm-serve-0.4.0" // { - dependencies = [ - sources."commander-2.9.0" - ]; - }) + sources."elm-hot-1.1.1" sources."encodeurl-1.0.2" - sources."es5-ext-0.10.50" - sources."es6-iterator-2.0.3" + sources."end-of-stream-1.4.1" sources."es6-promisify-6.0.2" - sources."es6-symbol-3.1.1" - sources."es6-weak-map-2.0.3" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."event-emitter-0.3.5" sources."eventemitter3-3.1.2" - (sources."execa-0.10.0" // { + (sources."execa-1.0.0" // { dependencies = [ sources."cross-spawn-6.0.5" ]; }) sources."fill-range-7.0.1" - sources."finalhandler-1.1.1" - (sources."follow-redirects-1.8.1" // { + sources."finalhandler-1.1.2" + (sources."follow-redirects-1.9.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -6108,14 +6353,13 @@ in }) sources."fresh-0.5.2" sources."fsevents-2.0.7" - sources."get-stream-3.0.0" + sources."get-stream-4.1.0" sources."glob-parent-5.0.0" - sources."graceful-readlink-1.0.1" sources."has-ansi-2.0.0" - sources."http-errors-1.6.3" + sources."http-errors-1.7.3" sources."http-proxy-1.17.0" - sources."inherits-2.0.3" - sources."internal-ip-3.0.1" + sources."inherits-2.0.4" + sources."internal-ip-4.3.0" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" @@ -6123,53 +6367,52 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."is-promise-2.1.0" sources."is-stream-1.1.0" sources."is-wsl-1.1.0" sources."isexe-2.0.0" sources."lru-cache-4.1.5" - sources."lru-queue-0.1.0" sources."md5-2.2.1" - sources."memoizee-0.4.14" - sources."mime-1.4.1" - sources."minimist-1.2.0" + sources."mime-2.4.3" sources."ms-2.0.0" - sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" sources."on-finished-2.3.0" - sources."opn-5.3.0" + sources."once-1.4.0" + sources."open-6.4.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."parseurl-1.3.3" sources."path-key-2.0.1" - sources."pem-1.13.2" + sources."pem-1.14.2" sources."picomatch-2.0.7" sources."pseudomap-1.0.2" - sources."querystringify-2.1.1" + sources."pump-3.0.0" sources."range-parser-1.2.1" sources."readdirp-3.1.2" sources."requires-port-1.0.0" sources."semver-5.7.1" - sources."send-0.16.2" - sources."serve-static-1.13.2" - sources."setprototypeof-1.1.0" + (sources."send-0.17.1" // { + dependencies = [ + sources."mime-1.6.0" + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" - sources."supervisor-0.12.0" sources."supports-color-2.0.0" - sources."timers-ext-0.1.7" sources."to-regex-range-5.0.1" - sources."type-1.0.3" + sources."toidentifier-1.0.0" sources."unpipe-1.0.0" - sources."url-parse-1.4.3" sources."which-1.3.1" - sources."ws-5.2.0" + sources."wrappy-1.0.2" + sources."ws-7.1.1" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -6222,4 +6465,248 @@ in bypassCache = true; reconstructLock = true; }; + "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { + name = "_at_elm-tooling_slash_elm-language-server"; + packageName = "@elm-tooling/elm-language-server"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.4.1.tgz"; + sha512 = "gzN/ee5JfQmg/+2xFq49zRN62ZFeMTu5A0unwQpOf3qLZa8Rz7no6OIaCnl6nEkNsaoAjvZxv1aFJOd2TtNtFw=="; + }; + dependencies = [ + sources."@nodelib/fs.scandir-2.1.2" + sources."@nodelib/fs.stat-2.0.2" + sources."@nodelib/fs.walk-1.2.3" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-12.7.5" + sources."accepts-1.3.7" + sources."ajv-6.10.2" + sources."array-flatten-1.1.1" + sources."array-union-2.1.0" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-limiter-1.0.1" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."babel-runtime-6.18.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."body-parser-1.18.2" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."bytes-3.0.0" + sources."caseless-0.12.0" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."concat-stream-1.5.2" + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."core-js-2.6.9" + sources."core-util-is-1.0.2" + sources."cross-spawn-6.0.5" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dir-glob-3.0.1" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + (sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#f2a983fc7bab262a3e44b46732735d8510d18876" // { + dependencies = [ + sources."ultron-1.1.1" + sources."ws-3.3.1" + ]; + }) + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.1" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + (sources."execa-2.0.4" // { + dependencies = [ + sources."is-stream-2.0.0" + ]; + }) + sources."express-4.16.3" + (sources."express-ws-2.0.0" // { + dependencies = [ + sources."ws-1.1.5" + ]; + }) + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-diff-1.2.0" + sources."fast-glob-3.0.4" + sources."fast-json-stable-stringify-2.0.0" + sources."fastq-1.6.0" + sources."fill-range-7.0.1" + sources."finalhandler-1.1.1" + sources."find-0.2.7" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs-extra-2.0.0" + sources."fs.realpath-1.0.0" + sources."get-stream-5.1.0" + sources."getpass-0.1.7" + sources."glob-7.1.4" + sources."glob-parent-5.0.0" + sources."globby-10.0.1" + sources."graceful-fs-4.2.2" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."http-errors-1.6.3" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.19" + sources."ignore-5.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ipaddr.js-1.9.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsprim-1.4.1" + sources."lodash-4.17.15" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" + sources."merge2-1.3.0" + sources."methods-1.1.2" + sources."micromatch-4.0.2" + sources."mime-1.4.1" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."mimic-fn-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."ms-2.0.0" + sources."negotiator-0.6.2" + sources."nice-try-1.0.5" + sources."node-watch-0.5.5" + (sources."npm-run-path-3.1.0" // { + dependencies = [ + sources."path-key-3.1.0" + ]; + }) + sources."oauth-sign-0.9.0" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."onetime-5.1.0" + sources."opn-5.4.0" + sources."options-0.0.6" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."p-finally-2.0.1" + sources."parseurl-1.3.3" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" + sources."performance-now-2.1.0" + sources."picomatch-2.0.7" + sources."process-nextick-args-1.0.7" + sources."proxy-addr-2.0.5" + sources."psl-1.4.0" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."qs-6.5.1" + sources."range-parser-1.2.1" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + sources."setprototypeof-1.0.3" + ]; + }) + sources."readable-stream-2.0.6" + sources."regenerator-runtime-0.9.6" + (sources."request-2.88.0" // { + dependencies = [ + sources."qs-6.5.2" + sources."safe-buffer-5.2.0" + ]; + }) + sources."reusify-1.0.4" + sources."run-parallel-1.1.9" + sources."rxjs-6.5.3" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."semver-5.7.1" + sources."send-0.16.2" + sources."serve-static-1.13.2" + sources."setprototypeof-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."slash-3.0.0" + sources."sshpk-1.16.1" + sources."statuses-1.4.0" + sources."string_decoder-0.10.31" + sources."strip-final-newline-2.0.0" + sources."sums-0.2.4" + sources."through2-2.0.1" + sources."tmp-0.0.31" + sources."to-regex-range-5.0.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."traverse-chain-0.1.0" + sources."tslib-1.10.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."ultron-1.0.2" + sources."unpipe-1.0.0" + sources."uri-js-4.2.2" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.3.3" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."vscode-jsonrpc-4.0.0" + (sources."vscode-languageserver-5.2.1" // { + dependencies = [ + sources."vscode-uri-1.0.8" + ]; + }) + sources."vscode-languageserver-protocol-3.14.1" + sources."vscode-languageserver-types-3.14.0" + sources."vscode-uri-2.0.3" + sources."web-tree-sitter-0.15.9" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."ws-7.1.2" + sources."xtend-4.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Implementation of an elm language server in node."; + homepage = "https://github.com/elm-tooling/elm-language-server#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; }
\ No newline at end of file diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix deleted file mode 100644 index 7c13db74c4c..00000000000 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ /dev/null @@ -1,281 +0,0 @@ -{ stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx -, bash -, runCommand - -, libiconv ? null, ncurses - -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support - -, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) -, # 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 ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.useiOSPrebuilt - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" -, # Whether to backport https://phabricator.haskell.org/D4388 for - # deterministic profiling symbol names, at the cost of a slightly - # non-standard GHC API - deterministicProfiling ? false -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - 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"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - 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 - libDeps = platform: [ ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc") libiconv - ++ stdenv.lib.optional enableDwarf elfutils; - - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - -in -stdenv.mkDerivation (rec { - version = "8.2.2"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - (fetchpatch { # Fix STRIP to be substituted from configure - url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3"; - sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; - }) - (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) - ] ++ stdenv.lib.optionals (hostPlatform != targetPlatform) [ - # Cherry-pick a few commits from newer hsc2hs so that proper binary is - # installed -- stage 2 normally but stage 1 with cross. - # - # TODO make unconditional next mass rebuild. - (fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/ecdac062b5cf1d284906487849c56f4e149b3c8e"; - sha256 = "1gagswi26j50z44sdx0mk1sb3wr0nrqyaph9j724zp6iwqslxyzm"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/598303cbffcd230635fbce28ce4105d177fdf76a"; - sha256 = "0hqcg434qbh1bz1pk85cap2q4v9i8bs6x65yzq4spz6xk3zq6af7"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/9483ad10064fbbb97ab525280623826b1ef63959"; - sha256 = "1cpfdhfc0cz9xkjzkcgwx4fbyj96dkmd04wpwi1vji7fahw8kmf3"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf"; - sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - }) - ] ++ 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"; - sha256 = "1lyysz6hfd1njcigpm8xppbnkadqfs0kvrp7s8vqgb38pjswj5hg"; - }) - ++ 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.isLinux ".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" - ] ++ 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=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ - "--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" - ] ++ stdenv.lib.optional enableDwarf [ - "--enable-dwarf-unwind" - ]; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - # Make sure we never relax`$PATH` and hooks support for compatability. - strictDeps = true; - - nativeBuildInputs = [ - autoconf autoreconfHook automake perl python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (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"; - - # See #63511 - the only unstripped file is the debug rts which isn't meant to - # be stripped. - dontStrip = true; - - checkTarget = "test"; - doCheck = false; # fails with "testsuite/tests: No such file or directory. Stop." - - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # 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; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-8.2.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; - }; - -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 30353771ea6..52fb926cdc6 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -7,8 +7,6 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support - , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a @@ -73,8 +71,7 @@ let # 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 - ++ stdenv.lib.optional enableDwarf elfutils; + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -183,8 +180,6 @@ stdenv.mkDerivation (rec { ] ++ 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" - ] ++ stdenv.lib.optional enableDwarf [ - "--enable-dwarf-unwind" ]; # Make sure we never relax`$PATH` and hooks support for compatability. diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix deleted file mode 100644 index 7b6769df682..00000000000 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ /dev/null @@ -1,256 +0,0 @@ -{ stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx -, bash - -, libiconv ? null, ncurses - -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !stdenv.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 ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt - -, # Whetherto build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - 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"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - 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 - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] - ++ [libffi] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv - ++ stdenv.lib.optional enableDwarf elfutils; - - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - -in -stdenv.mkDerivation (rec { - version = "8.6.4"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "0fihs1sr0hpk67dn9cmrsav13kkcp9hz8ggdqcrs80rj8vj0fpav"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - (fetchpatch rec { # https://phabricator.haskell.org/D5123 - url = "http://tarballs.nixos.org/sha256/${sha256}"; - name = "D5123.diff"; - sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; - }) - (fetchpatch { # https://github.com/haskell/haddock/issues/900 - url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; - name = "loadpluginsinmodules.diff"; - sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; - extraPrefix = "utils/haddock/"; - stripLen = 1; - }) - ]; - - 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.isLinux ".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" - '' + 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 - '' + stdenv.lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # 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.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.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 (disableLargeAddressSpace) [ - "--disable-large-address-space" - ] ++ stdenv.lib.optional enableDwarf [ - "--enable-dwarf-unwind" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatability. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (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"; - - # See #63511 - the only unstripped file is the debug rts which isn't meant to - # be stripped. - dontStrip = true; - - checkTarget = "test"; - - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # 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; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-8.6.4"; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index acc97f93c63..cdbcb8e1aed 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -7,8 +7,6 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support - , # GHC can be built with system libffi or a bundled one. libffi ? null @@ -78,8 +76,7 @@ let libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv - ++ stdenv.lib.optional enableDwarf elfutils; + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -182,8 +179,6 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" - ] ++ stdenv.lib.optional enableDwarf [ - "--enable-dwarf-unwind" ]; # Make sure we never relax`$PATH` and hooks support for compatability. diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index c80ccf72817..95bbab3cb3e 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -7,8 +7,6 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support - , # GHC can be built with system libffi or a bundled one. libffi ? null @@ -78,8 +76,7 @@ let libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv - ++ stdenv.lib.optional enableDwarf elfutils; + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -167,8 +164,6 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" - ] ++ stdenv.lib.optional enableDwarf [ - "--enable-dwarf-unwind" ]; # Make sure we never relax`$PATH` and hooks support for compatability. diff --git a/pkgs/development/compilers/ghc/abi-depends-determinism.nix b/pkgs/development/compilers/ghc/abi-depends-determinism.nix deleted file mode 100644 index bc803b74617..00000000000 --- a/pkgs/development/compilers/ghc/abi-depends-determinism.nix +++ /dev/null @@ -1,12 +0,0 @@ -# https://phabricator.haskell.org/D4159 to fix non-determinism in -# cached abi-depends fields in package databases, modified to only -# contain hunks that exist in distribution tarballs. -{ fetchpatch, runCommand }: let - base = fetchpatch rec { # Non-determinism in cached abi-depends fields - # Originally https://phabricator-files.haskell.org/file/data/4pqrbo5b62sifktfbrls/PHID-FILE-4g4zjiqlfxmmlaos7lz7/D4159.diff - url = "http://tarballs.nixos.org/sha256/${sha256}"; - name = "D4159.diff"; - sha256 = "0b8a08sisf1swmarm6nh9rgw7cpzi2rwdzvrd6ny49c7wk0f7x4b"; - }; -in runCommand base.name {} - "sed -n '/utils\\/ghc-pkg/,$p' ${base} >$out" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 240b55deb68..b78f5bc2204 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,8 +7,6 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support - , useLLVM ? !stdenv.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 @@ -75,8 +73,7 @@ let # 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 - ++ stdenv.lib.optional enableDwarf elfutils; + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc @@ -179,8 +176,6 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" - ] ++ stdenv.lib.optional enableDwarf [ - "--enable-dwarf-unwind" ]; # Make sure we never relax`$PATH` and hooks support for compatability. diff --git a/pkgs/development/compilers/scala/2.12.nix b/pkgs/development/compilers/scala/2.12.nix index 0e4207dccac..9e11daced4a 100644 --- a/pkgs/development/compilers/scala/2.12.nix +++ b/pkgs/development/compilers/scala/2.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.9"; + name = "scala-2.12.10"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0wpnxrhnhhscfk0k8yxk86akpvxbr5w1i8jb2igj2q4vax7h97sy"; + sha256 = "0sk5n3ir5zkgr8jayq5pn4l87ia5zmjr2zzwchgxkv8g62ivs4iv"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/scala/2.13.nix b/pkgs/development/compilers/scala/2.13.nix index ab27d93a7cf..6bba11af9d4 100644 --- a/pkgs/development/compilers/scala/2.13.nix +++ b/pkgs/development/compilers/scala/2.13.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.13.0"; + name = "scala-2.13.1"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "12g0a9i0xxqxxcvmimm5w2wgmrdhq80p8bsp52d6yldz4lrnbm7p"; + sha256 = "1nq49acx3j6vnw0lhyrfqa23f671y3kc9lja4nki0j73jk2cq639"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 3bdf234f915..d4e536484c4 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1c"; + milestone_id = "M1d"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "03q02r7qc7ybqz16kmpk2d8l9vx28kaj9x59mlxzi8a4mr0j3vzb"; + sha256 = "0cgkqwniw2fclsxgx6b1kgjmylqnn67kjs61iygzbpip8nvcm7pv"; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "1iwynqnp1i39pyq9wc01x7y22y1qa0rrjlx40jjdgnj23y1r6jk4"; + sha256 = "0rpz40d23daad16r2s4appiay3brbk0awp38yamavlr6dh23c9ws"; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c4cca42309d..dde4092327b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -69,7 +69,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1795sad0jr2da2pn28nbqsvpld6zw8gf9yscywixkbabf7ls66fn"; + sha256 = "1ackqjkwkfm3kazlyy4nwdjf6wwjlajql1hrznaki5138nw4gxs4"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -1197,8 +1197,8 @@ self: super: { temporary-resourcet = doJailbreak super.temporary-resourcet; # Requires dhall >= 1.23.0 - ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_25_0; }; - dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_25_0; }; + ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_0; }; + dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_0; }; # Test suite doesn't work with current QuickCheck # https://github.com/pruvisto/heap/issues/11 @@ -1228,4 +1228,7 @@ self: super: { ''; }); + # The LTS-14.x version of optparse-applicative is too old. + cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 69bd3844c9c..41925d89550 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -70,11 +70,10 @@ self: super: { sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q"; }; }; - vector-th-unbox = appendPatch super.vector-th-unbox (pkgs.fetchpatch { + vector-th-unbox = appendPatch (doJailbreak super.vector-th-unbox) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch"; sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19"; }); - cabal-doctest = super.cabal-doctest_1_0_7; regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch"; sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1"; @@ -85,10 +84,6 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch"; sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2"; }); - haskell-src-exts = appendPatch super.haskell-src-exts (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/haskell-src-exts-1.21.0.patch"; - sha256 = "0alb28hcsp774c9s73dgrajcb44vgv1xqfg2n5a9y2bpyngqscs3"; - }); optparse-applicative = appendPatch (doJailbreak super.optparse-applicative) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch"; sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y"; @@ -97,23 +92,15 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch"; sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4"; }); - happy = appendPatch super.happy (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.11.patch"; - sha256 = "16m659kxbq0s87ak2y1pqggfy67yfvcwc0zi3hcphf3v8735xhkk"; - }); - hedgehog = appendPatch super.hedgehog (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hedgehog-0.6.1.patch"; - sha256 = "04xwznd3lfgracfz68ls6vfm19rhq8fb74r6ii0grpv6cx4rr21i"; + hedgehog = appendPatch (doJailbreak super.hedgehog) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch"; + sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw"; }); easytest = self.easytest_0_3; regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch"; sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7"; }); - attoparsec = appendPatch (doJailbreak super.attoparsec) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch"; - sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl"; - }); cassava = appendPatch super.cassava (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch"; sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g"; @@ -122,7 +109,7 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch"; sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y"; }); - socks = appendPatch super.socks (pkgs.fetchpatch { + socks = appendPatch (doJailbreak super.socks) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch"; sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp"; }); @@ -159,14 +146,21 @@ self: super: { ''; }); system-fileio = doJailbreak super.system-fileio; - yaml = self.yaml_0_11_1_2; + tasty-hedgehog = doJailbreak super.tasty-hedgehog; haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.2.patch"; - sha256 = "146im1amywyl29kcldvgrxpwj22lrpzxysl7vc8rmn3hrq130dyc"; + url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch"; + sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8"; }); asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch"; sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5"; }); tls = self.tls_1_5_1; + vault = dontHaddock super.vault; + + # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved + alex = appendPatch super.alex (pkgs.fetchpatch { + url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch"; + sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5"; + }); } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c0692d975df..dcfc40ef5ed 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 14.5 + # LTS Haskell 14.6 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -55,7 +55,7 @@ default-package-overrides: - adjunctions ==4.4 - adler32 ==0.1.2.0 - advent-of-code-api ==0.1.2.3 - - aeson ==1.4.4.0 + - aeson ==1.4.5.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 @@ -98,7 +98,7 @@ default-package-overrides: - appendmap ==0.1.5 - apply-refact ==0.6.0.0 - apportionment ==0.0.0.3 - - approximate ==0.3.1 + - approximate ==0.3.2 - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.0 - arithmoi ==0.9.0.0 @@ -356,7 +356,7 @@ default-package-overrides: - comonad ==5.0.5 - compact ==0.1.0.1 - compactmap ==0.1.4.2.1 - - compensated ==0.7.2 + - compensated ==0.7.3 - compiler-warnings ==0.1.0 - composable-associations ==0.1.0.0 - composable-associations-aeson ==0.1.0.0 @@ -509,7 +509,7 @@ default-package-overrides: - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - dependent-sum-template ==0.0.0.6 - - deque ==0.4.2.3 + - deque ==0.4.3 - deriveJsonNoPrefix ==0.1.0.1 - deriving-compat ==0.5.7 - derulo ==1.0.5 @@ -623,7 +623,7 @@ default-package-overrides: - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.3.0 + - eventstore ==1.3.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 @@ -775,7 +775,7 @@ default-package-overrides: - ghc-lib-parser ==8.8.0.20190424 - ghc-parser ==0.2.0.3 - ghc-paths ==0.1.0.12 - - ghc-prof ==1.4.1.5 + - ghc-prof ==1.4.1.6 - ghc-syntax-highlighter ==0.0.4.0 - ghc-tcplugins-extra ==0.3 - ghc-typelits-extra ==0.3.1 @@ -806,7 +806,7 @@ default-package-overrides: - glabrous ==2.0.0 - glaze ==0.3.0.1 - glazier ==1.0.0.0 - - GLFW-b ==3.2.1.0 + - GLFW-b ==3.2.1.1 - Glob ==0.10.0 - gloss ==1.13.0.1 - gloss-algorithms ==1.13.0.1 @@ -863,8 +863,8 @@ default-package-overrides: - haskell-gi-base ==0.23.0 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.2 - - haskell-lsp ==0.15.0.1 - - haskell-lsp-types ==0.15.0.1 + - haskell-lsp ==0.15.0.0 + - haskell-lsp-types ==0.15.0.0 - haskell-names ==0.9.6 - haskell-spacegoo ==0.2.0.1 - haskell-src ==1.0.3.0 @@ -967,7 +967,7 @@ default-package-overrides: - hslua-aeson ==1.0.0 - hslua-module-system ==0.2.1 - hslua-module-text ==0.2.1 - - HsOpenSSL ==0.11.4.16 + - HsOpenSSL ==0.11.4.17 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - hspec ==2.7.1 @@ -1063,7 +1063,7 @@ default-package-overrides: - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 - hyper ==0.1.0.3 - - hyperloglog ==0.4.2 + - hyperloglog ==0.4.3 - hyphenation ==0.8 - hyraxAbif ==0.2.3.15 - iconv ==0.4.1.3 @@ -1086,7 +1086,7 @@ default-package-overrides: - indexed-list-literals ==0.2.1.2 - infer-license ==0.2.0 - inflections ==0.4.0.4 - - influxdb ==1.7.1 + - influxdb ==1.7.1.1 - ini ==0.4.1 - inj ==1.0 - inline-c ==0.7.0.1 @@ -1201,7 +1201,7 @@ default-package-overrides: - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.4 - lens ==4.17.1 - - lens-action ==0.2.3 + - lens-action ==0.2.4 - lens-aeson ==1.0.2 - lens-datetime ==0.3 - lens-family ==1.2.3 @@ -1277,10 +1277,10 @@ default-package-overrides: - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - massiv ==0.4.1.0 - - massiv-io ==0.1.6.0 + - massiv-io ==0.1.7.0 - massiv-test ==0.1.0 - mathexpr ==0.3.0.0 - - math-functions ==0.3.2.0 + - math-functions ==0.3.2.1 - matplotlib ==0.7.4 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1329,7 +1329,6 @@ default-package-overrides: - missing-foreign ==0.1.1 - MissingH ==1.4.1.0 - mixed-types-num ==0.4.0.1 - - mixpanel-client ==0.2.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.1 @@ -1425,7 +1424,7 @@ default-package-overrides: - network-anonymous-i2p ==0.10.0 - network-attoparsec ==0.12.2 - network-bsd ==2.8.0.0 - - network-byte-order ==0.1.1.0 + - network-byte-order ==0.1.1.1 - network-conduit-tls ==1.3.2 - network-house ==0.1.0.2 - network-info ==0.2.0.10 @@ -1437,8 +1436,8 @@ default-package-overrides: - network-transport ==0.5.4 - network-transport-composed ==0.2.1 - network-uri ==2.6.1.0 - - newtype ==0.2.1.0 - - newtype-generics ==0.5.3 + - newtype ==0.2.2.0 + - newtype-generics ==0.5.4 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 @@ -1480,7 +1479,7 @@ default-package-overrides: - OneTuple ==0.2.2 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.6.7004.0 + - opaleye ==0.6.7004.1 - OpenAL ==1.7.0.5 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 @@ -1663,7 +1662,7 @@ default-package-overrides: - protocol-buffers ==2.4.12 - protocol-buffers-descriptor ==2.4.12 - protocol-radius ==0.0.1.1 - - protocol-radius-test ==0.1.0.0 + - protocol-radius-test ==0.1.0.1 - proto-lens ==0.5.1.0 - proto-lens-arbitrary ==0.1.2.7 - proto-lens-optparse ==0.1.1.5 @@ -1679,8 +1678,7 @@ default-package-overrides: - purescript-bridge ==0.13.0.0 - pure-zlib ==0.6.6 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==1.5.1.9 - - PyF ==0.8.1.0 + - pusher-http-haskell ==1.5.1.10 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qnap-decrypt ==0.3.5 @@ -1733,7 +1731,7 @@ default-package-overrides: - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - reanimate ==0.1.5.0 - - reanimate-svg ==0.9.1.0 + - reanimate-svg ==0.9.1.1 - rebase ==1.3.1.1 - record-dot-preprocessor ==0.2 - record-hasfield ==1.0 @@ -1769,6 +1767,8 @@ default-package-overrides: - repa ==3.4.1.4 - repa-algorithms ==3.4.1.3 - repa-io ==3.4.1.1 + - replace-attoparsec ==1.0.1.0 + - replace-megaparsec ==1.1.3.0 - repline ==0.2.1.0 - req ==2.1.0 - req-conduit ==1.0.0 @@ -1883,7 +1883,7 @@ default-package-overrides: - servant-pipes ==0.15 - servant-ruby ==0.9.0.0 - servant-server ==0.16.2 - - servant-static-th ==0.2.2.0 + - servant-static-th ==0.2.2.1 - servant-swagger ==1.1.7.1 - servant-swagger-ui ==0.3.4.3.22.2 - servant-swagger-ui-core ==0.3.3 @@ -1921,7 +1921,7 @@ default-package-overrides: - simple ==0.11.3 - simple-cabal ==0.0.0.1 - simple-cmd ==0.2.0.1 - - simple-cmd-args ==0.1.2 + - simple-cmd-args ==0.1.3 - simple-log ==0.9.12 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.28 @@ -2011,7 +2011,7 @@ default-package-overrides: - strict ==0.3.2 - strict-base-types ==0.6.1 - strict-concurrency ==0.2.4.3 - - strict-list ==0.1.4 + - strict-list ==0.1.5 - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 @@ -2180,7 +2180,7 @@ default-package-overrides: - tonatona-servant ==0.1.0.2 - torsor ==0.1 - tostring ==0.2.1.1 - - TotalMap ==0.1.0.0 + - TotalMap ==0.1.1.1 - tracing ==0.0.4.0 - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 @@ -2245,11 +2245,11 @@ default-package-overrides: - unique-logic ==0.4 - unique-logic-tf ==0.5.1 - unit-constraint ==0.0.0 - - universe ==1.1 + - universe ==1.1.1 - universe-base ==1.1.1 - universe-dependent-sum ==1.1.0.1 - universe-instances-base ==1.1 - - universe-instances-extended ==1.1 + - universe-instances-extended ==1.1.1 - universe-instances-trans ==1.1 - universe-reverse-instances ==1.1 - universum ==1.5.0 @@ -2309,7 +2309,7 @@ default-package-overrides: - verbosity ==0.3.0.0 - versions ==3.5.1.1 - ViennaRNAParser ==1.3.3 - - viewprof ==0.0.0.29 + - viewprof ==0.0.0.30 - vinyl ==0.11.0 - vivid ==0.4.2.3 - vivid-osc ==0.5.0.0 @@ -2339,7 +2339,7 @@ default-package-overrides: - wai-transformers ==0.1.0 - wai-websockets ==3.0.1.2 - warp ==3.2.28 - - warp-tls ==3.2.7 + - warp-tls ==3.2.8 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 - wcwidth ==0.0.2 @@ -2435,7 +2435,7 @@ default-package-overrides: - yesod-csp ==0.2.5.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - - yesod-form ==1.6.6 + - yesod-form ==1.6.7 - yesod-form-bootstrap4 ==2.1.2 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.1 @@ -3116,6 +3116,7 @@ broken-packages: - armor - arpa - arpack + - array-builder - array-chunks - array-forth - array-primops @@ -4741,6 +4742,11 @@ broken-packages: - feed-translator - feed2lj - feed2twitter + - fei-base + - fei-cocoapi + - fei-dataiter + - fei-examples + - fei-nn - feldspar-compiler - feldspar-language - fenfire @@ -4786,6 +4792,7 @@ broken-packages: - findhttp - fingertree-psqueue - fingertree-tf + - finitary-derive - FiniteMap - firefly-example - first-and-last @@ -5087,6 +5094,7 @@ broken-packages: - ghci-history-parser - ghci-lib - ghci-ng + - ghcide - ghcjs-base-stub - ghcjs-dom-jsffi - ghcjs-fetch @@ -5709,6 +5717,7 @@ broken-packages: - hdbi-tests - hdf - hDFA + - hdiff - hdigest - hdirect - hdis86 @@ -6376,6 +6385,7 @@ broken-packages: - ide-backend-server - ideas - ideas-math + - ideas-math-types - idempotent - identifiers - idiii @@ -7150,9 +7160,6 @@ broken-packages: - marxup - masakazu-bot - MASMGen - - massiv - - massiv-io - - massiv-test - master-plan - matchable-th - matchers @@ -8691,7 +8698,6 @@ broken-packages: - scenegraph - schedevr - schedule-planner - - scheduler - schedyield - schematic - scholdoc @@ -9565,6 +9571,7 @@ broken-packages: - through-text - throwable-exceptions - thumbnail-plus + - thumbnail-polish - tic-tac-toe - tickle - TicTacToe diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 88ec8ad85ff..5db25686fc6 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -589,7 +589,7 @@ self: super: builtins.intersectAttrs super { snap-server = dontCheck super.snap-server; # Tests require internet - dhall_1_25_0 = dontCheck super.dhall_1_25_0; + dhall_1_26_0 = dontCheck super.dhall_1_26_0; http-download = dontCheck super.http-download; pantry = dontCheck super.pantry; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3b91b02ffad..d71a1c65a24 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6440,10 +6440,8 @@ self: { }: mkDerivation { pname = "GLFW-b"; - version = "3.2.1.0"; - sha256 = "19mngkprzlm322pfyljvm4lyk1j7j8ss50m5kzzmkwk3mph25h1i"; - revision = "2"; - editedCabalFile = "0xlby7483dv33c13f44kkvmai186g72jhxmcq8749s1hyxi6fqnb"; + version = "3.2.1.1"; + sha256 = "1rjfdbx4pv7knlm4g8rh90jndc2a8zjmrdmfm2wvwna08h385g5g"; libraryHaskellDepends = [ base bindings-GLFW deepseq ]; testHaskellDepends = [ base bindings-GLFW deepseq HUnit test-framework @@ -10514,10 +10512,8 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.4.16"; - sha256 = "1jbbrhbvl3y1l0g1wv5h7l59bj7w8ajl8bfpxfwjypgmqlrlks19"; - revision = "2"; - editedCabalFile = "1cg28q793cg4w8c574yzzfxcn1r8595vs77mlrkw68j8hzgs6lj3"; + version = "0.11.4.17"; + sha256 = "0qivl9clmybfglwxqp2sq308rv4ia4rhwshcsc8b029bvpp0mpsi"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -10764,8 +10760,8 @@ self: { }: mkDerivation { pname = "I1M"; - version = "0.0.2"; - sha256 = "0f9pl46m05izxhychf7j8pd9rfx8bqw13735xvq602iyszng8pa4"; + version = "0.0.3"; + sha256 = "0lk34g47iid2cfcj9zfdwbkpvhfhanh83jzh64r9sdrqgw9p25w3"; libraryHaskellDepends = [ array base QuickCheck ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Code for the Haskell course taught at the University of Seville"; @@ -19159,8 +19155,8 @@ self: { }: mkDerivation { pname = "TotalMap"; - version = "0.1.0.0"; - sha256 = "0k495j5akabp93zq3jm6vi1y1pz1dmvysbxxp0x4fj28yj7svs3d"; + version = "0.1.1.1"; + sha256 = "1415xyh354i7d5y7c2g2k1gyd3knkdx97gxa1z8bjn9ah5qvd8mw"; libraryHaskellDepends = [ adjunctions base distributive generics-sop lens ]; @@ -20202,8 +20198,8 @@ self: { }: mkDerivation { pname = "Win32-errors"; - version = "0.2.2.4"; - sha256 = "1iziwz05s1rvq3xhidkciwyb39fbyn6bqqzn6g2m12pi0xjfzgc2"; + version = "0.2.2.5"; + sha256 = "08gbvlsf37nx982qs19pb9qc5sxi6493f02d3afjsyxqvalfbijy"; libraryHaskellDepends = [ base template-haskell text Win32 ]; testHaskellDepends = [ base hspec QuickCheck Win32 ]; description = "Alternative error handling for Win32 foreign calls"; @@ -21801,12 +21797,15 @@ self: { }: mkDerivation { pname = "acid-state"; - version = "0.15.0"; - sha256 = "0x1w7da9bcr23v97zri9bz5iw3hzy1x55b4i2di1cswnp50qxz60"; + version = "0.15.1"; + sha256 = "0dhzi1f951q2csi8rk393rg81jpd8w9vxwlmg638dknh4i35zg35"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base bytestring cereal containers directory filelock filepath mtl network safecopy stm template-haskell th-expand-syns unix ]; + executableHaskellDepends = [ base directory ]; testHaskellDepends = [ base cereal containers deepseq directory hedgehog hspec hspec-discover mtl network safecopy template-haskell text time @@ -22981,40 +22980,6 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.4.4.0"; - sha256 = "0bjdgr6wjq6cci5hxb63i18yrg66p892n6xj23rih7k5rbd7rihp"; - revision = "1"; - editedCabalFile = "1mn7ws8v5zsm9fy9ndvb0rygchjbwnnxyyxpl63cf9lmzzffvxd6"; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable primitive scientific tagged template-haskell text - th-abstraction time time-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers Diff directory dlist filepath - generic-deriving ghc-prim hashable hashable-time integer-logarithms - QuickCheck quickcheck-instances scientific tagged tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-compat unordered-containers uuid-types vector - ]; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_4_5_0" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, Diff - , directory, dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, integer-logarithms, primitive, QuickCheck - , quickcheck-instances, scientific, tagged, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, text - , th-abstraction, time, time-compat, unordered-containers - , uuid-types, vector - }: - mkDerivation { - pname = "aeson"; version = "1.4.5.0"; sha256 = "1jhabz1lbbv6yqxqiybifi86cb5xlsadrn368n5dd0wzzc7ja4iz"; libraryHaskellDepends = [ @@ -23033,7 +22998,6 @@ self: { ]; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -23439,6 +23403,25 @@ self: { broken = true; }) {}; + "aeson-optics" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , optics-core, optics-extra, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "aeson-optics"; + version = "1.1"; + sha256 = "0cyhlhks1zq1h7f49qi1xk094j7zhqfz8p0dpyg18qghppzhlyd8"; + revision = "1"; + editedCabalFile = "1ql2zqjcwy744qzydj3gk4qgnj4nzba6j2d5fvi31i5va7vqad2d"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bytestring optics-core + optics-extra scientific text unordered-containers vector + ]; + description = "Law-abiding optics for aeson"; + license = stdenv.lib.licenses.mit; + }) {}; + "aeson-options" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -28107,15 +28090,15 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.3.6.0"; - sha256 = "0jv89pnap0ja39cmc2hri3npyz3sihc5xzdwargvrkavf4x1ij80"; + version = "0.3.7.1"; + sha256 = "1z7jf7ai7r2rlnwylqs60pqcz0h4dxj4g372c919lcvinmql1yfx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ amqp base bytestring connection containers data-default-class hinotify magic process text time tls unix x509-system ]; - description = "Generic Haskell AMQP Consumer"; + description = "Generic Haskell AMQP tools"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -28867,12 +28850,12 @@ self: { "antiope-athena" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base - , lens, resourcet, text, unliftio-core + , hspec-discover, lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "7.3.0"; - sha256 = "1ixrpfc1yrvzigv5mid12s9yill5x0yvr5xfzwl9plm9jpzjjvv9"; + version = "7.3.4"; + sha256 = "1d4pm1fb8iwfhb2f57n6kkzm27nj9fqgn3m14zzdbxk2l63q41h3"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28881,6 +28864,7 @@ self: { amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -28891,8 +28875,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.3.0"; - sha256 = "0alg9nfwgyrvwxi8syrarqhf8din9dayvvll2078zl82r1x8hmgb"; + version = "7.3.4"; + sha256 = "0006g261khirldmsbnggnb9fmn9z6m9j7hi9cggpgmxc5ird16p6"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -28905,13 +28889,13 @@ self: { "antiope-core" = callPackage ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base , bytestring, exceptions, generic-lens, hedgehog, hspec - , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet - , scientific, text, transformers, unliftio-core + , hspec-discover, http-client, http-types, hw-hspec-hedgehog, lens + , mtl, resourcet, scientific, text, transformers, unliftio-core }: mkDerivation { pname = "antiope-core"; - version = "7.3.0"; - sha256 = "0x2lz5ljxdd2d0fv3srn6v6az1dacb83n16fshnm27z9vgnzvfjc"; + version = "7.3.4"; + sha256 = "07zf2a0vpzcn5f9rr0k13w2pljybb8glc149wymhkjjfhhgb2ylh"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28923,6 +28907,7 @@ self: { hw-hspec-hedgehog lens mtl resourcet scientific text transformers unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -28931,13 +28916,13 @@ self: { "antiope-dynamodb" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb - , antiope-core, base, generic-lens, lens, text, unliftio-core - , unordered-containers + , antiope-core, base, generic-lens, hspec-discover, lens, text + , unliftio-core, unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.3.0"; - sha256 = "04izlg44mz7xv529q2m6j47hcxfca1zrk1fl11rcixdfi3iwfmvf"; + version = "7.3.4"; + sha256 = "0smsb7s7ymsdhkvawlbv9j67i1vr9i58qad9m4d5ir43pxi1bmvh"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28946,6 +28931,7 @@ self: { amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -28954,14 +28940,14 @@ self: { "antiope-messages" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring - , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens - , lens-aeson, monad-loops, network-uri, scientific, text + , generic-lens, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog + , lens, lens-aeson, monad-loops, network-uri, scientific, text , unliftio-core }: mkDerivation { pname = "antiope-messages"; - version = "7.3.0"; - sha256 = "13mm39hbwmlhg1qv61nv0rs6kvw784k2ynrfd9yi1zlr5zycgwlm"; + version = "7.3.4"; + sha256 = "0n9s18fmqp22r857yybd3ddm5m6ijr0a1vydll9qqaia951s2a6a"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28971,6 +28957,7 @@ self: { hspec hw-hspec-hedgehog lens lens-aeson monad-loops network-uri scientific text unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -28979,12 +28966,13 @@ self: { "antiope-optparse-applicative" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, base - , hedgehog, hspec, hw-hspec-hedgehog, optparse-applicative, text + , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog + , optparse-applicative, text }: mkDerivation { pname = "antiope-optparse-applicative"; - version = "7.3.0"; - sha256 = "1qgd4mb99vpjswxca6l10ghg3d63vlqj3wc87afdcddfwa50f1zr"; + version = "7.3.4"; + sha256 = "1l21xgis1rzzbziz403wl4inilnn52ly4w1lp1cbcj7hnykaxa1i"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base optparse-applicative text ]; @@ -28992,6 +28980,7 @@ self: { aeson amazonka amazonka-core amazonka-s3 base hedgehog hspec hw-hspec-hedgehog ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -29002,13 +28991,13 @@ self: { ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, attoparsec, base, bytestring , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec - , http-types, hw-hspec-hedgehog, lens, mtl, network-uri, resourcet - , text, time, unliftio-core + , hspec-discover, http-types, hw-hspec-hedgehog, lens, mtl + , network-uri, resourcet, text, time, unliftio-core }: mkDerivation { pname = "antiope-s3"; - version = "7.3.0"; - sha256 = "03qkvaz95qfqrildz92qhrnrny4i00p2l89j5p7miwxbdfzy7ga9"; + version = "7.3.4"; + sha256 = "14k5w7s30rqygf6df309h90p9d5fgvw9wxwgz0sisi1mzvbb7wry"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -29021,6 +29010,7 @@ self: { hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri resourcet text time unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -29029,13 +29019,13 @@ self: { "antiope-sns" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base - , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog - , lens, text, time, unliftio-core + , bytestring, generic-lens, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog, lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "7.3.0"; - sha256 = "066ryids04k0sixn9yf0h70jfj55z2g2xkrpqhxnr54sk2jr4njy"; + version = "7.3.4"; + sha256 = "0vcns4p0agni4afdw4cr3hz2xq54d3wam6mkaggd5zyf974x7c7c"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -29045,6 +29035,7 @@ self: { generic-lens hedgehog hspec hw-hspec-hedgehog lens text time unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -29054,14 +29045,14 @@ self: { "antiope-sqs" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base , bytestring, conduit, generic-lens, hedgehog, hspec - , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl - , network-uri, split, text, time, unliftio-core + , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, monad-loops + , mtl, network-uri, split, text, time, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-sqs"; - version = "7.3.0"; - sha256 = "1nhs4v0h0hqjv6ncfy1wpsdsxkbbb0gz45rhf8swm8h2zfv9rqxl"; + version = "7.3.4"; + sha256 = "1y1kgppnc47wprd3sjw8qbjh5dvfr4i7mczi70s88i8apkqlxrbn"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit generic-lens lens lens-aeson monad-loops mtl network-uri split text @@ -29072,6 +29063,7 @@ self: { generic-lens hedgehog hspec hw-hspec-hedgehog lens lens-aeson monad-loops mtl network-uri text time unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -29080,14 +29072,15 @@ self: { "antiope-swf" = callPackage ({ mkDerivation, amazonka-swf, base, hedgehog, hspec - , hw-hspec-hedgehog, lens, text + , hspec-discover, hw-hspec-hedgehog, lens, text }: mkDerivation { pname = "antiope-swf"; - version = "7.3.0"; - sha256 = "1jqhq0ifdv8dqsnqsyb814nqq987fvng04gg8sbz5cjds7nm1c0m"; + version = "7.3.4"; + sha256 = "1rn31vdjfs7jrx87a44vg36kwkcxx7sp3mx54f494srwa3cv1di5"; libraryHaskellDepends = [ amazonka-swf base lens text ]; testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; + testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -30250,8 +30243,8 @@ self: { }: mkDerivation { pname = "approximate"; - version = "0.3.1"; - sha256 = "18ifmp1c2km3ssp51m94vxqzx7yx6c21ychp7ajnhgg7v4bgfdyq"; + version = "0.3.2"; + sha256 = "016i37c5imb0n8gsk7gzyiq8dhkjv0xnn5315kmn6lnrhpfm7yyk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq ghc-prim hashable lens @@ -31057,15 +31050,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "array-builder" = callPackage + ({ mkDerivation, array-chunks, base, primitive, run-st, tasty + , tasty-hunit + }: + mkDerivation { + pname = "array-builder"; + version = "0.1.0.0"; + sha256 = "0wh1x3hywb0jaqxa7kdh3x3w0mqa4dwq2wdc70fvgmlijm6pyqw9"; + libraryHaskellDepends = [ array-chunks base primitive run-st ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Builders for arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "array-chunks" = callPackage ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes - , tasty, tasty-hunit, tasty-quickcheck + , run-st, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "array-chunks"; - version = "0.1.0.0"; - sha256 = "15x8l8m953ws3253zvxg4q0q0qqcc34wawijnzmq87y39g9ghlag"; - libraryHaskellDepends = [ base primitive ]; + version = "0.1.1.0"; + sha256 = "0lx33cyqv5b5iyxy4v18dxs1zb0j72kxnlckhcckjvncg8lyf413"; + libraryHaskellDepends = [ base primitive run-st ]; testHaskellDepends = [ base primitive QuickCheck quickcheck-classes tasty tasty-hunit tasty-quickcheck @@ -31961,6 +31970,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "astar-monad" = callPackage + ({ mkDerivation, base, hspec, lens, logict, mtl }: + mkDerivation { + pname = "astar-monad"; + version = "0.3.0.0"; + sha256 = "1df99k3c299nzfxbqnzkqggagf7l8p2fwa9igxy9ydg8b0rqc6xf"; + libraryHaskellDepends = [ base logict mtl ]; + testHaskellDepends = [ base hspec lens logict mtl ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "astrds" = callPackage ({ mkDerivation, base, containers, directory, MonadRandom, mtl , OpenGL, random, SDL, SDL-image, SDL-mixer, SDL-ttf, unix @@ -34590,35 +34610,52 @@ self: { }) {}; "axel" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , freer-simple, ghcid, haskell-src-exts, hedgehog, lens, lens-aeson - , optparse-applicative, parsec, process, regex-pcre, singletons - , split, strict, tasty, tasty-discover, tasty-golden - , tasty-hedgehog, tasty-hspec, template-haskell, text, transformers - , typed-process, vector, yaml + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers + , directory, filepath, freer-simple, ghcid, hashable + , haskell-src-exts, hedgehog, hpack, lens, lens-aeson, megaparsec + , mono-traversable, optparse-applicative, polysemy, polysemy-plugin + , prettyprinter, process, profunctors, random, singletons, split + , tasty, tasty-discover, tasty-golden, tasty-hedgehog, tasty-hspec + , tasty-hunit, template-haskell, text, time, transformers + , typed-process, uniplate, vector, yaml }: mkDerivation { pname = "axel"; - version = "0.0.9"; - sha256 = "0kr7iblj23dlfjzym2ndrns2x7z65sdn2pz8dwxsqvn8jhh24p7f"; + version = "0.0.11"; + sha256 = "1qygq82v70lizbpxmvj1c81qhb9jrmzgi603g03wa41las0sfamy"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers directory filepath freer-simple ghcid - haskell-src-exts lens lens-aeson optparse-applicative parsec - process regex-pcre singletons strict template-haskell text - typed-process vector yaml + aeson ansi-terminal base bytestring containers directory filepath + freer-simple ghcid hashable haskell-src-exts hedgehog hpack lens + lens-aeson megaparsec mono-traversable optparse-applicative + polysemy polysemy-plugin prettyprinter process profunctors random + singletons split tasty tasty-discover tasty-golden tasty-hedgehog + tasty-hspec tasty-hunit template-haskell text time transformers + typed-process uniplate vector yaml ]; + libraryToolDepends = [ hpack tasty-discover ]; executableHaskellDepends = [ - base containers freer-simple optparse-applicative + aeson ansi-terminal base bytestring containers directory filepath + freer-simple ghcid hashable haskell-src-exts hedgehog hpack lens + lens-aeson megaparsec mono-traversable optparse-applicative + polysemy polysemy-plugin prettyprinter process profunctors random + singletons split tasty tasty-discover tasty-golden tasty-hedgehog + tasty-hspec tasty-hunit template-haskell text time transformers + typed-process uniplate vector yaml ]; + executableToolDepends = [ hpack tasty-discover ]; testHaskellDepends = [ - base bytestring containers filepath freer-simple hedgehog lens - split tasty tasty-discover tasty-golden tasty-hedgehog tasty-hspec - transformers + aeson ansi-terminal base bytestring containers directory filepath + freer-simple ghcid hashable haskell-src-exts hedgehog hpack lens + lens-aeson megaparsec mono-traversable optparse-applicative + polysemy polysemy-plugin prettyprinter process profunctors random + singletons split tasty tasty-discover tasty-golden tasty-hedgehog + tasty-hspec tasty-hunit template-haskell text time transformers + typed-process uniplate vector yaml ]; - testToolDepends = [ tasty-discover ]; + testToolDepends = [ hpack tasty-discover ]; description = "The Axel programming language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -38014,6 +38051,8 @@ self: { pname = "binary-tagged"; version = "0.2"; sha256 = "1pgb2p0kdh9vkmgn509c2v3h9dnhl9vyq2gyisfqvn27g2422c0j"; + revision = "1"; + editedCabalFile = "0chv885zl8m7c6281sz8kfr2p7hgcl7xj0yjajjyr9whwfnylfj0"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers cryptohash-sha1 generics-sop hashable scientific tagged text time @@ -38224,6 +38263,32 @@ self: { inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm;}; + "bindings-GLFW_3_3_0_0" = callPackage + ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11 + , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr + , libXxf86vm, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "bindings-GLFW"; + version = "3.3.0.0"; + sha256 = "0ns5dhww9s4sbss57jlys9wmjik2i0xa1b4g6i0k15r7mhrnanx7"; + libraryHaskellDepends = [ base bindings-DSL ]; + librarySystemDepends = [ + libGL libX11 libXcursor libXext libXfixes libXi libXinerama + libXrandr libXxf86vm + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + description = "Low-level bindings to GLFW OpenGL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + inherit (pkgs.xorg) libXxf86vm;}; + "bindings-K8055" = callPackage ({ mkDerivation, base, K8055D }: mkDerivation { @@ -39017,6 +39082,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binsm" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring + , optparse-applicative, parsec + }: + mkDerivation { + pname = "binsm"; + version = "0.1.1"; + sha256 = "1wiqslvf21xm15rf161lzffk5zzivbxs9sa9v7d257cx4d9qvy15"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base bytestring optparse-applicative parsec + ]; + description = "binary files splitter and merger"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bio" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, mtl, parallel, parsec, QuickCheck, random, tagsoup @@ -42334,7 +42417,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_49" = callPackage + "brick_0_50" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, filepath , microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -42343,8 +42426,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.49"; - sha256 = "1jlxzizxgmdsjd0x146kcmp92x7gjn0vkj0lc5dplbgshlg5hfhd"; + version = "0.50"; + sha256 = "0g2c420zpvjv8v3y5l4jhmml279d920k9d92yga8d86jymanbvy9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43209,8 +43292,8 @@ self: { ({ mkDerivation, base, mtl, multiset, random, template-haskell }: mkDerivation { pname = "buffon-machines"; - version = "1.1.1.0"; - sha256 = "0985xh66j3f8p352gsq9balndwrsnylqilnnbk2sfb535jyh84dh"; + version = "1.1.1.1"; + sha256 = "19qidzwg6mq8g2czzfqky7kh13jscsxc52ymfj8wlkngkciwvv5s"; libraryHaskellDepends = [ base mtl multiset random template-haskell ]; @@ -43339,6 +43422,20 @@ self: { broken = true; }) {}; + "builder" = callPackage + ({ mkDerivation, base, byte-order, primitive, primitive-unaligned + }: + mkDerivation { + pname = "builder"; + version = "0.2"; + sha256 = "04pcqxk9snlvm5kixqyz5aq0pxjlcvfxj403dxgyr3ch2zjx3n6l"; + libraryHaskellDepends = [ + base byte-order primitive primitive-unaligned + ]; + description = "bounded ByteArray builder type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "buildwrapper" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring, Cabal , cmdargs, conduit, conduit-extra, containers, cpphs, deepseq @@ -43935,12 +44032,17 @@ self: { }) {}; "byteslice" = callPackage - ({ mkDerivation, base, primitive, primitive-addr, run-st }: + ({ mkDerivation, base, primitive, primitive-addr, run-st, tasty + , tasty-hunit, tasty-quickcheck + }: mkDerivation { pname = "byteslice"; - version = "0.1.2.0"; - sha256 = "0bivb6gn3kfzi2rxvrf3klsgzj6p864vcxr2hnrdkr16qp1x8ysv"; + version = "0.1.3.0"; + sha256 = "0lx69pcac7p20zs790x6ygqlgc3vljn4wjjp1jlcnp1jv6nhfwgf"; libraryHaskellDepends = [ base primitive primitive-addr run-st ]; + testHaskellDepends = [ + base primitive tasty tasty-hunit tasty-quickcheck + ]; description = "Slicing managed and unmanaged memory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -44842,6 +44944,8 @@ self: { pname = "cabal-cache"; version = "1.0.1.1"; sha256 = "1yb3wvjqqmkm4aysfyx4zf1z88453ywfc4czb4zvghfdgd95d0rx"; + revision = "1"; + editedCabalFile = "054xaxj0cf8cdd2l5jp3p4s3ar8ncq92cw3s0912vd85kw2bw3rl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45367,30 +45471,28 @@ self: { "cabal-plan" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base-compat - , base-orphans, base16-bytestring, bytestring, containers - , directory, filepath, mtl, optparse-applicative, parsec, text - , vector + , base16-bytestring, bytestring, containers, directory, filepath + , lens, mtl, optparse-applicative, parsec, semialign + , singleton-bool, text, these, topograph, transformers, vector }: mkDerivation { pname = "cabal-plan"; - version = "0.5.0.0"; - sha256 = "1vfa4lwfjhv4nyl1rwm7i99zdkwriighlhfcz0rgjwzgg56wrihq"; - revision = "1"; - editedCabalFile = "0nnh6qq36cpfwzqrv1i1cn93n6n32nbl6ddp0y22jmmxnx9xsrvp"; + version = "0.6.0.0"; + sha256 = "0yhczs9qc6vy1g0jgj6hb23g4f92qnwq325zxlazsghcvxjrxhx2"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base-compat base-orphans base16-bytestring bytestring - containers directory filepath text vector + aeson base base16-bytestring bytestring containers directory + filepath text ]; executableHaskellDepends = [ - ansi-terminal base base-compat bytestring containers directory mtl - optparse-applicative parsec text vector + ansi-terminal base base-compat bytestring containers directory lens + mtl optparse-applicative parsec semialign singleton-bool text these + topograph transformers vector ]; - doHaddock = false; description = "Library and utility for processing cabal's plan.json file"; - license = "GPL-2.0-or-later AND BSD-3-Clause"; + license = stdenv.lib.licenses.gpl2Plus; }) {}; "cabal-progdeps" = callPackage @@ -46017,10 +46119,10 @@ self: { }) {}; "cachix" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring - , cachix-api, conduit, conduit-extra, containers, cookie - , cryptonite, dhall, directory, ed25519, filepath, fsnotify, here - , hnix-store-core, hspec, hspec-discover, http-client + ({ mkDerivation, async, base, base64-bytestring, boost_context + , bytestring, cachix-api, conduit, conduit-extra, containers + , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify + , here, hnix-store-core, hspec, hspec-discover, http-client , http-client-tls, http-conduit, http-types, inline-c, inline-c-cpp , lzma-conduit, megaparsec, memory, mmorph, netrc, nix , optparse-applicative, process, protolude, resourcet, retry @@ -46030,8 +46132,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "0.3.0"; - sha256 = "0s22p9dwqw4pqlrqfqspdsiiw2k5zwzzdxc6ha6f4fxa4wa2w5dm"; + version = "0.3.2"; + sha256 = "0i0p5cp6g5ai2xxdkr0bbdlf469b52lp3fh37rq075zaw94f6qr8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46044,6 +46146,7 @@ self: { servant-auth-client servant-client servant-client-core servant-conduit text unix uri-bytestring versions ]; + librarySystemDepends = [ boost_context ]; libraryPkgconfigDepends = [ nix ]; executableHaskellDepends = [ base cachix-api ]; executableToolDepends = [ hspec-discover ]; @@ -46052,7 +46155,7 @@ self: { ]; description = "Command line client for Nix binary cache hosting https://cachix.org"; license = stdenv.lib.licenses.asl20; - }) {inherit (pkgs) nix;}; + }) {boost_context = null; inherit (pkgs) nix;}; "cachix-api" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring @@ -46791,6 +46894,8 @@ self: { pname = "cantor-pairing"; version = "0.1.1.0"; sha256 = "03vl7qd5962kr0mi4ymgmh667948rzqiq9f1ixcvycyjz8hz0yqw"; + revision = "1"; + editedCabalFile = "1rl4zjxwiys9mf75bvw363ydpr3nwvi6d77p19rwnmxc9k5spap6"; libraryHaskellDepends = [ arithmoi base containers integer-gmp integer-logarithms ]; @@ -48255,8 +48360,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.2.3"; - sha256 = "16w16sysk0g9capl45v8pzyfg38mw2xnkj8dh5fghlc9vzfdgc53"; + version = "0.1.2.4"; + sha256 = "1ijfgs03zs6cj87s7sck4md1qmfavcmgnfz8asw8yf6bf0rk6qfl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50004,6 +50109,8 @@ self: { pname = "chronos"; version = "1.0.7"; sha256 = "0yqk43ax20sk3rpxd5s857ivbgigvd5qdq4axawzmqr2na6jlikx"; + revision = "1"; + editedCabalFile = "0rf2rcdx7cvx1aa6yb9khbgkrh08v4l52sg1w89qz0245dalw14r"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock hashable primitive semigroups text torsor vector @@ -54581,8 +54688,8 @@ self: { }: mkDerivation { pname = "compensated"; - version = "0.7.2"; - sha256 = "1qna4g1zcc89r1ambswrq65pql6k6g3dv0ivlgnhswl6lm3vzyf7"; + version = "0.7.3"; + sha256 = "089xj9j3gznxz66ywapjd9kasjcnv197ipj4azgjfbpl2y11l8dg"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive @@ -56469,10 +56576,8 @@ self: { }: mkDerivation { pname = "config-schema"; - version = "1.1.0.0"; - sha256 = "1nr1jyrgvvm1zlzvlfpz35zb5iydn1mpk89kljp0h1cvkl35mjkl"; - revision = "1"; - editedCabalFile = "0h828xld2dfjj43jwq1f98wd21nzvhn74wsx586a0kcd6q41pcs5"; + version = "1.2.0.0"; + sha256 = "0lz9y2qnjc576mbl3qnhyf4c1y5f71q7f5jgv8rj7vsg855q99hm"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -56503,12 +56608,11 @@ self: { ({ mkDerivation, alex, array, base, happy, pretty, text }: mkDerivation { pname = "config-value"; - version = "0.6.3.1"; - sha256 = "0gfr9qcw8a7y1y9cn6635y8fgvrpkmcqx31bn2a070rbrmk3757z"; - revision = "2"; - editedCabalFile = "037hi6hrd3kk2zjsi8ly9jj4gc8xq5vnn8p09dm0hshd31fyhl52"; + version = "0.7.0.1"; + sha256 = "0r7qylqmdvif75ylb0d0zryl2ghxl3ip9a2jhyq70aqxwdjh18g4"; libraryHaskellDepends = [ array base pretty text ]; libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base text ]; description = "Simple, layout-based value language similar to YAML or JSON"; license = stdenv.lib.licenses.mit; }) {}; @@ -57831,6 +57935,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "control-monad-omega_0_3_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "control-monad-omega"; + version = "0.3.2"; + sha256 = "1zx92zyvv10w61rzwhn1d4kggzmi9hggsyjcdav424280x31wb7n"; + libraryHaskellDepends = [ base ]; + description = "A breadth-first list monad"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "control-monad-queue" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -58814,22 +58930,20 @@ self: { ({ mkDerivation, base, binary, bytestring, bzlib , composition-prelude, containers, cpphs, dhall, dir-traverse , directory, filemanip, filepath, hashable, hspec, hspec-megaparsec - , http-client, http-client-tls, libarchive, lzma, megaparsec + , http-client, http-client-tls, libarchive, lzlib, lzma, megaparsec , microlens, mtl, network-uri, optparse-applicative, prettyprinter , process, recursion, tar, temporary, text, zip-archive, zlib }: mkDerivation { pname = "cpkg"; - version = "0.2.3.1"; - sha256 = "0nw1h6zgx3dizx92nwzdf9ny8bzyfa2n28lpv34xvw38fz9yq16w"; - revision = "2"; - editedCabalFile = "15bn9c0zvr8xdhq4hgnq3hhqwvv8pc5a7bdvw58psn7dwhcac6nh"; + version = "0.2.3.2"; + sha256 = "0dwcahc8m2mj3jm0hwx13wzhlnyiby4sds8pc70fv54zp0ccbq6r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring bzlib composition-prelude containers dhall dir-traverse directory filemanip filepath hashable http-client - http-client-tls libarchive lzma megaparsec microlens mtl + http-client-tls libarchive lzlib lzma megaparsec microlens mtl network-uri prettyprinter process recursion tar temporary text zip-archive zlib ]; @@ -66029,8 +66143,8 @@ self: { pname = "deepseq-generics"; version = "0.2.0.0"; sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh"; - revision = "3"; - editedCabalFile = "0734x6dm7ny1422n5ik4agzmjybvd3yybj1mnrc8z0kb89xdprcs"; + revision = "4"; + editedCabalFile = "0928s2qnbqsjzrm94x88rvmvbigfmhcyp4m73gw6asinp2qg1kii"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -66776,23 +66890,6 @@ self: { }) {}; "deque" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances - , rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "deque"; - version = "0.4.2.3"; - sha256 = "18j4pqqn65nh4wp3fkw4bd10x1gxnv5zfkzan02fqvdg1ljk9sq0"; - libraryHaskellDepends = [ base mtl strict-list ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Double-ended queues"; - license = stdenv.lib.licenses.mit; - }) {}; - - "deque_0_4_3" = callPackage ({ mkDerivation, base, hashable, mtl, QuickCheck , quickcheck-instances, rerebase, strict-list, tasty, tasty-hunit , tasty-quickcheck @@ -66808,7 +66905,6 @@ self: { ]; description = "Double-ended queues"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dequeue" = callPackage @@ -67487,43 +67583,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_25_0" = callPackage + "dhall_1_26_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , bytestring, case-insensitive, cborg, cborg-json, containers - , contravariant, cryptonite, deepseq, Diff, directory, doctest - , dotgen, either, exceptions, filepath, foldl, gauge, haskeline - , http-client, http-client-tls, http-types, lens-family-core - , megaparsec, memory, mockery, mtl, optparse-applicative, parsers - , prettyprinter, prettyprinter-ansi-terminal, profunctors - , QuickCheck, quickcheck-instances, repline, scientific, semigroups - , serialise, spoon, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, th-lift-instances, transformers - , transformers-compat, turtle, unordered-containers, uri-encode - , vector + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, haskeline, http-client, http-client-tls + , http-types, lens-family-core, megaparsec, memory, mockery, mtl + , network-uri, optparse-applicative, parsers, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, semigroups, serialise + , spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-lift-instances + , transformers, transformers-compat, turtle, unordered-containers + , uri-encode, vector }: mkDerivation { pname = "dhall"; - version = "1.25.0"; - sha256 = "0d8qx4fawvxykig628jfgqpa660mzzicysa7g3mda6zni9j4yq0h"; - revision = "2"; - editedCabalFile = "00jb0n07sa6v5ynzlyz39gc6zc0s0jlfck5w64pya1nmdbiijizz"; + version = "1.26.0"; + sha256 = "1jk8zfdbvgp2ipkmhx5m1n467c1k6g24kgi295lcbyvlwahv9l7j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring case-insensitive - cborg cborg-json containers contravariant cryptonite deepseq Diff - directory dotgen either exceptions filepath haskeline http-client - http-client-tls http-types lens-family-core megaparsec memory mtl - optparse-applicative parsers prettyprinter + cborg cborg-json containers contravariant cryptonite data-fix + deepseq Diff directory dotgen either exceptions filepath haskeline + http-client http-client-tls http-types lens-family-core megaparsec + memory mtl network-uri optparse-applicative parsers prettyprinter prettyprinter-ansi-terminal profunctors repline scientific serialise template-haskell text th-lift-instances transformers transformers-compat unordered-containers uri-encode vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring cborg containers deepseq directory doctest filepath - foldl lens-family-core megaparsec mockery prettyprinter QuickCheck - quickcheck-instances semigroups serialise spoon tasty tasty-hunit + base bytestring cborg containers data-fix deepseq directory doctest + filepath foldl generic-random lens-family-core megaparsec mockery + prettyprinter QuickCheck quickcheck-instances scientific semigroups + serialise spoon tasty tasty-expected-failure tasty-hunit tasty-quickcheck text transformers turtle vector ]; benchmarkHaskellDepends = [ @@ -67555,14 +67651,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_22" = callPackage + "dhall-bash_1_0_23" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.22"; - sha256 = "1qxcf3f8a390znwkbhcirlgqpgg0ssc3bnwdml7wkv8k0qwqq57j"; + version = "1.0.23"; + sha256 = "0nd8bziymkv2wdham8jg2wcsksnnby0pkvak7aknzf8z9s4mb74x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67626,23 +67722,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_4_0" = callPackage + "dhall-json_1_4_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base - , bytestring, containers, dhall, exceptions, libyaml + , bytestring, containers, dhall, exceptions, filepath, libyaml , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal , scientific, tasty, tasty-hunit, text, unordered-containers , vector, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.4.0"; - sha256 = "0kxb71m1rf6y7z3wx4yx5ks0p5vhnlpgchsih3mfn9ygppc2z0ri"; + version = "1.4.1"; + sha256 = "1widvpgrswj6bz9330i2xyxv1h6asw0pm5rrwdhyf926qgag83pp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring containers dhall exceptions - libyaml optparse-applicative scientific text unordered-containers - vector yaml + filepath libyaml optparse-applicative prettyprinter scientific text + unordered-containers vector yaml ]; executableHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring dhall exceptions @@ -67677,32 +67773,27 @@ self: { "dhall-lsp-server" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , cryptonite, data-default, dhall, dhall-json, directory, doctest - , dotgen, filepath, haskell-lsp, hslogger, lens, lens-family-core - , megaparsec, mtl, network-uri, optparse-applicative, prettyprinter - , sorted-list, stm, text, transformers, unordered-containers - , uri-encode, yi-rope + , data-default, dhall, dhall-json, directory, doctest, filepath + , haskell-lsp, hslogger, lens, lens-family-core, megaparsec, mtl + , network-uri, optparse-applicative, prettyprinter + , rope-utf16-splay, text, transformers, unordered-containers + , uri-encode }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.0"; - sha256 = "1i4bx8qiy1hbs6bm50fixj1ipkd9rm6y6z3bci8ngh1rhy5v51x1"; + version = "1.0.1"; + sha256 = "04x56r7wlnnks31mjis1f2688c7azimkww04qkvm7l1s0qprn1lz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring containers cryptonite - data-default dhall dhall-json dotgen filepath haskell-lsp hslogger - lens lens-family-core megaparsec mtl network-uri - optparse-applicative prettyprinter sorted-list stm text - transformers unordered-containers uri-encode yi-rope - ]; - executableHaskellDepends = [ - aeson base containers data-default dhall filepath haskell-lsp - hslogger lens lens-family-core megaparsec mtl optparse-applicative - prettyprinter sorted-list stm text transformers - unordered-containers yi-rope + aeson aeson-pretty base bytestring containers data-default dhall + dhall-json directory filepath haskell-lsp hslogger lens + lens-family-core megaparsec mtl network-uri prettyprinter + rope-utf16-splay text transformers unordered-containers uri-encode ]; + executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ base directory doctest filepath ]; + description = "Language Server Protocol (LSP) server for Dhall"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -67714,8 +67805,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.7"; - sha256 = "0axg7qq8rfy5qsffiw57lll40mw7bxgk67g7lgdb5vbri69xj3is"; + version = "1.1.8"; + sha256 = "0ky10j2718hva1xz4snwbnm0adpp1l7spxpzg7x3a7x67gnaanyh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69648,19 +69739,21 @@ self: { }) {}; "dirtree" = callPackage - ({ mkDerivation, base, containers, deepseq, directory, filepath - , hspec, hspec-discover, hspec-expectations-pretty-diff, lens + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , filepath, hspec, hspec-discover, hspec-expectations-pretty-diff + , lens, unix, zip-archive }: mkDerivation { pname = "dirtree"; - version = "0.0.1"; - sha256 = "0i7prw2bzf5yjk42y1zvpjph8s5a73x1rj3dgba4mzdx3qpcs1gj"; + version = "0.1.0"; + sha256 = "0hyvaf17rfaqjag6qg3pfhbhjnhrd4xdknvn0k494vi3wd1ddzap"; libraryHaskellDepends = [ - base containers deepseq directory filepath lens + base bytestring containers deepseq directory filepath lens unix + zip-archive ]; testHaskellDepends = [ - base containers deepseq directory filepath hspec hspec-discover - hspec-expectations-pretty-diff lens + base bytestring containers deepseq directory filepath hspec + hspec-discover hspec-expectations-pretty-diff lens unix zip-archive ]; testToolDepends = [ hspec-discover ]; description = "A small library for working with directories"; @@ -69743,8 +69836,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.1.0"; - sha256 = "16n78p6g0rh670zy2pbk59c8nkg5srkhlbya0aknpz2s4smpn891"; + version = "1.1.2"; + sha256 = "1dwsg3q9jdq58pchc0aylg8acshfjmdidpr09818jr4aawvdn3xr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70969,15 +71062,15 @@ self: { broken = true; }) {}; - "dl-fedora_0_6" = callPackage + "dl-fedora_0_7" = callPackage ({ mkDerivation, base, bytestring, directory, filepath , http-directory, http-types, optparse-applicative, regex-posix , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs }: mkDerivation { pname = "dl-fedora"; - version = "0.6"; - sha256 = "1kq9hhpgh24kfgf9b25zppmfbylcqx0scs96dp0nbyj3rp6yl8rh"; + version = "0.7"; + sha256 = "00fkjlggax5l9qk2dlgh3plkqrvxrwfipdcfpq8d5kfw7l5wdxsv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -75710,15 +75803,15 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; - "elm-street_0_1_0_1" = callPackage + "elm-street_0_1_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , hspec, prettyprinter, servant, servant-server, text, time, wai , warp }: mkDerivation { pname = "elm-street"; - version = "0.1.0.1"; - sha256 = "1n02bxyva732dbnrzc6n6v8rsgpbjb6ndh4szwqj8zckj694mc77"; + version = "0.1.0.2"; + sha256 = "1ccrlcy8k2ppy20jns0rfms11ha7mpqgh6hwcpjkycmninhdb2gp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75879,6 +75972,80 @@ self: { broken = true; }) {}; + "elynx-seq" = callPackage + ({ mkDerivation, async, base, bytestring, containers + , data-memocombinators, elynx-tools, elynx-tree, hmatrix, hspec + , hspec-megaparsec, integration, lens, math-functions, matrices + , megaparsec, mwc-random, optparse-applicative, parallel, primitive + , statistics, transformers, vector, vector-th-unbox, word8 + }: + mkDerivation { + pname = "elynx-seq"; + version = "0.0.1"; + sha256 = "0v43nqpx17zbqv0537jrikkfnvadcmfc5byxh8lk369ma76029y7"; + libraryHaskellDepends = [ + async base bytestring containers data-memocombinators elynx-tools + elynx-tree hmatrix integration lens math-functions matrices + megaparsec mwc-random optparse-applicative parallel primitive + statistics transformers vector vector-th-unbox word8 + ]; + testHaskellDepends = [ + async base bytestring containers data-memocombinators elynx-tools + elynx-tree hmatrix hspec hspec-megaparsec integration lens + math-functions matrices megaparsec mwc-random optparse-applicative + parallel primitive statistics transformers vector vector-th-unbox + word8 + ]; + description = "Handle molecular sequences"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "elynx-tools" = callPackage + ({ mkDerivation, base, bytestring, containers, fast-logger, hmatrix + , lifted-base, matrices, megaparsec, monad-control, monad-logger + , mwc-random, optparse-applicative, parallel, primitive + , template-haskell, text, time, transformers, transformers-base + , vector, zlib + }: + mkDerivation { + pname = "elynx-tools"; + version = "0.0.1"; + sha256 = "17h6rncyb4insjarss4a8467d4mybmwa9dwgjrw7sb66y301xy8w"; + libraryHaskellDepends = [ + base bytestring containers fast-logger hmatrix lifted-base matrices + megaparsec monad-control monad-logger mwc-random + optparse-applicative parallel primitive template-haskell text time + transformers transformers-base vector zlib + ]; + description = "Tools for ELynx"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "elynx-tree" = callPackage + ({ mkDerivation, base, bytestring, containers, elynx-tools, hspec + , hspec-megaparsec, lifted-async, math-functions, megaparsec + , mwc-random, optparse-applicative, parallel, primitive, QuickCheck + , quickcheck-instances, statistics, transformers, vector + }: + mkDerivation { + pname = "elynx-tree"; + version = "0.0.1"; + sha256 = "0gd14cshy143q7gdxfkb0laxbramkxlqnr2s15z89rbs75hfgqa9"; + libraryHaskellDepends = [ + base bytestring containers elynx-tools lifted-async math-functions + megaparsec mwc-random optparse-applicative parallel primitive + QuickCheck quickcheck-instances statistics transformers vector + ]; + testHaskellDepends = [ + base bytestring containers elynx-tools hspec hspec-megaparsec + lifted-async math-functions megaparsec mwc-random + optparse-applicative parallel primitive QuickCheck + quickcheck-instances statistics transformers vector + ]; + description = "Handle phylogenetic trees"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "emacs-keys" = callPackage ({ mkDerivation, base, doctest, split, tasty, tasty-hspec , tasty-quickcheck, template-haskell, th-lift, xkbcommon @@ -77775,8 +77942,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding"; - version = "0.1.0.1"; - sha256 = "0804zqbl2w8cvj4n9y2qx9wdmigmw56fxdzkqrw6x2szl2qvsfjz"; + version = "0.1.0.2"; + sha256 = "1z65vm457af7ffiih8yzgds059kamaiskvjfl72qqb24fmgj9jxm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78594,8 +78761,8 @@ self: { }: mkDerivation { pname = "eventlog2html"; - version = "0.3.0"; - sha256 = "1vg94x1f5wh20dvnqil3b3ipd8kajyplv7sv9f7zmrl73m5cgg9s"; + version = "0.4.0"; + sha256 = "09gsxzqrbjksi5gnwf7b4d2ry0cj4gqzzbpbrb404lkd5v0z1sh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78745,8 +78912,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.3.0"; - sha256 = "0smn5ygshmxcd8zz7zg81y4dcqysawznv3222kbj5c1gwx80lm7c"; + version = "1.3.1"; + sha256 = "1mpwd6bwyzzmg2mzbkllf2f05dsi17da5i3clvakjj9yv8dpxj3q"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection containers dns dotnet-timespan ekg-core exceptions fast-logger @@ -80503,6 +80670,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fakedata_0_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, gauge, hashable, hspec, hspec-discover + , random, template-haskell, text, time, unordered-containers + , vector, yaml + }: + mkDerivation { + pname = "fakedata"; + version = "0.3.0"; + sha256 = "11g3vja4kw7ms5bvccl4hpzvd59v2m60sk6ycx9calw13b65ix4p"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers directory exceptions filepath hashable + random template-haskell text time unordered-containers vector yaml + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath hashable + hspec hspec-discover random template-haskell text time + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + gauge hashable random template-haskell text time + unordered-containers vector yaml + ]; + description = "Library for producing fake data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fakefs" = callPackage ({ mkDerivation, base, containers, hspec, mtl, QuickCheck }: mkDerivation { @@ -80671,6 +80869,27 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "fast-builder_0_1_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, process, QuickCheck, scientific, stm + , template-haskell, text, true-name, unordered-containers, vector + }: + mkDerivation { + pname = "fast-builder"; + version = "0.1.2.0"; + sha256 = "1aa3v14nlcq4ql3f07lan9kg21dqp009yzgb96bxznyigxwf67rp"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring process QuickCheck stm ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers criterion deepseq ghc-prim + scientific template-haskell text true-name unordered-containers + vector + ]; + description = "Fast ByteString Builder"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-combinatorics" = callPackage ({ mkDerivation, base, Cabal, composition-prelude, criterion , directory, hspec, http-client, http-client-tls, tar, zlib @@ -81824,6 +82043,141 @@ self: { broken = true; }) {}; + "fei-base" = callPackage + ({ mkDerivation, base, c2hs, c2hs-extra, constraints, directory + , filepath, haskell-src-exts, hslogger, mtl, mxnet + , optparse-applicative, repa, text, tuple-ops, vector + }: + mkDerivation { + pname = "fei-base"; + version = "0.2.0.0"; + sha256 = "0blgzr1iy7d2cp370rankkldakkryysikh1rd039s7anq5l21rsg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base c2hs-extra constraints repa tuple-ops vector + ]; + librarySystemDepends = [ mxnet ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + base directory filepath haskell-src-exts hslogger mtl + optparse-applicative text + ]; + executableSystemDepends = [ mxnet ]; + description = "FFI to MXNet"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) mxnet;}; + + "fei-cocoapi" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, c2hs, conduit + , containers, criterion, directory, exceptions, fei-base + , fei-dataiter, filepath, JuicyPixels, JuicyPixels-extra + , JuicyPixels-repa, lens, mtl, random-fu, repa, storable-tuple + , store, time, transformers-base, vector + }: + mkDerivation { + pname = "fei-cocoapi"; + version = "0.2.0"; + sha256 = "0sk3h94vlykq6x4nk25scb7jwhgi9rlk66xhy09wbz1a1n398j5z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + exceptions fei-base fei-dataiter filepath JuicyPixels + JuicyPixels-extra JuicyPixels-repa lens mtl random-fu repa + storable-tuple store time transformers-base vector + ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + aeson base bytestring containers criterion JuicyPixels + JuicyPixels-repa lens repa store vector + ]; + description = "Cocodataset with cocoapi"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "fei-dataiter" = callPackage + ({ mkDerivation, base, conduit, conduit-combinators, directory + , fei-base, fei-nn, filepath, haskell-src-exts, hslogger, hspec + , mtl, mxnet, optparse-applicative, streaming, template-haskell + , text + }: + mkDerivation { + pname = "fei-dataiter"; + version = "0.2.0.0"; + sha256 = "01iia8m5wq8yzmzl3dmsd5v01yq07ig6bg93h00mxyjpf1ai9kvk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base conduit conduit-combinators fei-base fei-nn streaming + template-haskell + ]; + executableHaskellDepends = [ + base directory fei-base filepath haskell-src-exts hslogger mtl + optparse-applicative text + ]; + executableSystemDepends = [ mxnet ]; + testHaskellDepends = [ base fei-base hspec streaming ]; + description = "mxnet dataiters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) mxnet;}; + + "fei-examples" = callPackage + ({ mkDerivation, attoparsec, base, conduit, directory, fei-base + , fei-cocoapi, fei-dataiter, fei-nn, lens, mtl + , optparse-applicative, random-fu, repa, text, unordered-containers + , vector + }: + mkDerivation { + pname = "fei-examples"; + version = "0.3.0"; + sha256 = "1yplcfls0c22h1808ky64ifdxswq60dq5l0qw0kmg452517xb2yx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base conduit directory fei-base fei-cocoapi fei-dataiter + fei-nn lens mtl optparse-applicative random-fu repa text + unordered-containers vector + ]; + description = "fei examples"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "fei-nn" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-binary, base + , bytestring, containers, exceptions, fei-base, ghc-prim, graphviz + , lens, mmorph, mtl, resourcet, template-haskell, text, time + , transformers-base, unordered-containers, vector + }: + mkDerivation { + pname = "fei-nn"; + version = "0.2.0"; + sha256 = "08zdp0h87cddrwb7wrbk341k7v8hhriqp1jhgf6nmkjgqlwspk0m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions fei-base graphviz lens + mtl resourcet template-haskell text time transformers-base + unordered-containers vector + ]; + executableHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions fei-base + ghc-prim mmorph mtl resourcet unordered-containers vector + ]; + description = "Train a neural network with MXNet in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "feldspar-compiler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, criterion , data-default, deepseq, directory, feldspar-language, filepath @@ -82994,15 +83348,17 @@ self: { "finitary" = callPackage ({ mkDerivation, base, bitvec, coercible-utils, finite-typelits , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog - , monad-loops, mtl, template-haskell, vector-sized + , monad-loops, mtl, primitive, template-haskell, typelits-witnesses + , vector, vector-sized }: mkDerivation { pname = "finitary"; - version = "0.1.0.0"; - sha256 = "0s42ja10hnv1czy75wh8bkz3mj9qwy0bsa90bnwnazf9q6xn9lyv"; + version = "1.0.0.1"; + sha256 = "1va895ijk7sb5zn6zf1bfi8w0bqxjx4631iwnijh9f4d3dsnpqcv"; libraryHaskellDepends = [ base bitvec coercible-utils finite-typelits ghc-typelits-knownnat - ghc-typelits-natnormalise mtl template-haskell vector-sized + ghc-typelits-natnormalise mtl primitive template-haskell + typelits-witnesses vector vector-sized ]; testHaskellDepends = [ base bitvec finite-typelits hedgehog monad-loops vector-sized @@ -83011,6 +83367,30 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "finitary-derive" = callPackage + ({ mkDerivation, base, binary, coercible-utils, deepseq, finitary + , finite-typelits, ghc-typelits-extra, ghc-typelits-knownnat + , hashable, hedgehog, hedgehog-classes, monad-loops, mtl, vector + , vector-sized + }: + mkDerivation { + pname = "finitary-derive"; + version = "1.0.0.0"; + sha256 = "0ns61aylidrkdf4qkfz1r1vjfzlmgbqar1dq068xg1pvnkpsrvlc"; + libraryHaskellDepends = [ + base binary coercible-utils deepseq finitary finite-typelits + ghc-typelits-extra ghc-typelits-knownnat hashable mtl vector + vector-sized + ]; + testHaskellDepends = [ + base finitary finite-typelits hedgehog hedgehog-classes monad-loops + ]; + description = "Easy and efficient Unbox, Storable, Binary and Hashable instances for Finitary types"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "finite-field" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, primes , QuickCheck, singletons, tasty, tasty-hunit, tasty-quickcheck @@ -83133,6 +83513,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "first-class-families_0_6_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "first-class-families"; + version = "0.6.0.0"; + sha256 = "0a1f789d3lv8hvd3nidwglx11yvwiakvmabpz1hzgdjyfnrpg98n"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "First class type families"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "first-class-patterns" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -88643,10 +89036,8 @@ self: { }: mkDerivation { pname = "gamgee"; - version = "1.1.0"; - sha256 = "0ip6y8l2dmw15494d77s771aqmn7awrqnlmbcc7dd2lqwq5s5wgr"; - revision = "1"; - editedCabalFile = "1lg04ps7m85x4py844vcc53a3r6ijaqzjrggrwp53iv2ga1m88sr"; + version = "1.2.0"; + sha256 = "0q7r4bspxsqaswcy9c90wl7bh19y0k1lds0rx1m0cla7rg5ixra4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89931,6 +90322,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generics-mrsop-gdiff" = callPackage + ({ mkDerivation, base, generics-mrsop }: + mkDerivation { + pname = "generics-mrsop-gdiff"; + version = "0.0.0"; + sha256 = "0a60q7g5x7kwd864dc7yz83kz83fxf4gpj7q5lj4f2fg69ih0ybm"; + libraryHaskellDepends = [ base generics-mrsop ]; + description = "Reimplementation of the `gdiff` algorithm for `generics-mrsop`"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "generics-sop" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core , template-haskell @@ -90419,6 +90821,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-mergeful" = callPackage + ({ mkDerivation, base, containers, genvalidity + , genvalidity-containers, genvalidity-hspec + , genvalidity-hspec-aeson, genvalidity-time, genvalidity-uuid + , hspec, mergeful, mtl, pretty-show, QuickCheck, random, time, uuid + }: + mkDerivation { + pname = "genvalidity-mergeful"; + version = "0.0.0.0"; + sha256 = "07j3dczqxmwri458r8nml3rn31ii14fdz3b2sc8g41f2czr6fa75"; + libraryHaskellDepends = [ + base containers genvalidity genvalidity-containers genvalidity-time + mergeful QuickCheck + ]; + testHaskellDepends = [ + base containers genvalidity-hspec genvalidity-hspec-aeson + genvalidity-uuid hspec mergeful mtl pretty-show QuickCheck random + time uuid + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-mergeless" = callPackage ({ mkDerivation, base, containers, genvalidity , genvalidity-containers, genvalidity-hspec @@ -91778,27 +92202,6 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.1.5"; - sha256 = "0cpyzfyfkq6c17xpccgibjpq8j0l4w33mbpivim3kha7k76ilbg4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers scientific text time - ]; - testHaskellDepends = [ - attoparsec base containers directory filepath process tasty - tasty-hunit temporary text - ]; - description = "Library for parsing GHC time and allocation profiling reports"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-prof_1_4_1_6" = callPackage - ({ mkDerivation, attoparsec, base, containers, directory, filepath - , process, scientific, tasty, tasty-hunit, temporary, text, time - }: - mkDerivation { - pname = "ghc-prof"; version = "1.4.1.6"; sha256 = "1rypk644xpgvawymn8ib992n4qkc2fc796arf574hhikdffr5a14"; isLibrary = true; @@ -91812,7 +92215,6 @@ self: { ]; description = "Library for parsing GHC time and allocation profiling reports"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-prof-aeson" = callPackage @@ -92392,6 +92794,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcide" = callPackage + ({ mkDerivation, aeson, async, base, binary, bytestring, containers + , data-default, deepseq, directory, extra, filepath, ghc, ghc-boot + , ghc-boot-th, ghc-paths, hashable, haskell-lsp, haskell-lsp-types + , hie-bios, lens, lsp-test, mtl, network-uri, optparse-applicative + , parser-combinators, prettyprinter, prettyprinter-ansi-terminal + , rope-utf16-splay, safe-exceptions, shake, sorted-list, stm, syb + , tasty, tasty-hunit, text, time, transformers, unix + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "ghcide"; + version = "0.0.2"; + sha256 = "0ivq4j4i7cb8k7h2rkc9kpki39zl1nc63ba6hpfdlyl5vg5x3qy7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base binary bytestring containers data-default deepseq + directory extra filepath ghc ghc-boot ghc-boot-th hashable + haskell-lsp haskell-lsp-types mtl network-uri prettyprinter + prettyprinter-ansi-terminal rope-utf16-splay safe-exceptions shake + sorted-list stm syb text time transformers unix + unordered-containers utf8-string + ]; + executableHaskellDepends = [ + base containers data-default directory extra filepath ghc ghc-paths + haskell-lsp hie-bios optparse-applicative shake text + ]; + testHaskellDepends = [ + base containers extra filepath haskell-lsp-types lens lsp-test + parser-combinators tasty tasty-hunit text + ]; + description = "The core of an IDE"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -93309,8 +93749,8 @@ self: { }: mkDerivation { pname = "gi-gtk-declarative"; - version = "0.5.0"; - sha256 = "0nhacfja1wrz0sa5pbz069sbpyzp8jnlrp078gg9gydwhlmh2k2h"; + version = "0.6.0"; + sha256 = "1637w7vfzjxwqgwfan793j03h7g39xci4v1vg54y9ar05pp0ggv8"; libraryHaskellDepends = [ base data-default-class gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading mtl text @@ -93333,8 +93773,8 @@ self: { }: mkDerivation { pname = "gi-gtk-declarative-app-simple"; - version = "0.5.0"; - sha256 = "0vl9gqgdbqr4hipr7ka01hyvyz9n8by0ry890w4n2c5w9rghgvva"; + version = "0.6.0"; + sha256 = "0szfmpgsslq5cs5q8574gpmm897vvs51g4wvdinnkglbf70254kf"; libraryHaskellDepends = [ async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative haskell-gi haskell-gi-base haskell-gi-overloading pipes @@ -94018,8 +94458,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190819"; - sha256 = "1fvyxx47qx7yr8xfan398jlixbawblpz5h69kqsw1z7kh6plnycy"; + version = "7.20190912"; + sha256 = "1a3jvl5cx32v78s3015i10cx00jprm1391rpww4mzkk1vskzn9cv"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -94517,6 +94957,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "githash_0_1_3_3" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , process, template-haskell, temporary, unliftio + }: + mkDerivation { + pname = "githash"; + version = "0.1.3.3"; + sha256 = "19xhs2nzm1myyjx3nkc3invy15c19cfx790vbcrl050n9sb330jr"; + libraryHaskellDepends = [ + base bytestring directory filepath process template-haskell + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec process template-haskell + temporary unliftio + ]; + description = "Compile git revision info into Haskell projects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , binary, binary-instances, bytestring, containers, cryptohash-sha1 @@ -95502,8 +95962,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.32"; - sha256 = "0rlqmmjxvynd4a2kxjyw7dm5i2rd27jgj7sm57pbh2nig2rbbbyj"; + version = "2.33"; + sha256 = "14znjbgy67mh68hpbr2xxl1aff1b0bzmrwkknp402zq0y9p81iwy"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -95680,6 +96140,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss_1_13_1_1" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim + , gloss-rendering, GLUT, OpenGL + }: + mkDerivation { + pname = "gloss"; + version = "1.13.1.1"; + sha256 = "1bmjwd2vfbxfypr2g23810yyp921m30wxbb6f3m0wkk65iypjnls"; + libraryHaskellDepends = [ + base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL + ]; + description = "Painless 2D vector graphics, animations and simulations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-accelerate" = callPackage ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: mkDerivation { @@ -95823,6 +96299,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-raster_1_13_1_1" = callPackage + ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering + , repa + }: + mkDerivation { + pname = "gloss-raster"; + version = "1.13.1.1"; + sha256 = "199b1avi4mils3x9xpk66992id40hdyk0lpjnyyxy8c22s0adgb9"; + libraryHaskellDepends = [ + base containers ghc-prim gloss gloss-rendering repa + ]; + description = "Parallel rendering of raster images"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-raster-accelerate" = callPackage ({ mkDerivation, accelerate, base, colour-accelerate, gloss , gloss-accelerate @@ -99472,15 +99964,20 @@ self: { }) {}; "grafana" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, text }: + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , Diff, tasty, tasty-hunit, text + }: mkDerivation { pname = "grafana"; - version = "0.1"; - sha256 = "0k8a8bwyn9hvn4j3wn4crqdjg2xh36zxlka0ddx3qj6fmbfl1lps"; + version = "0.2"; + sha256 = "0aqg2ivbdm3459pa4077bhs6y3q9z3nwsajgp4b5ah3wnav1rn45"; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring text + aeson aeson-pretty base bytestring containers text ]; - description = "grafana datatypes for dashboards"; + testHaskellDepends = [ + aeson aeson-pretty base bytestring Diff tasty tasty-hunit + ]; + description = "API for creating grafana dashboards represented as json"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -104284,8 +104781,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.13.0.0"; - sha256 = "1a7g79j7ai5l46nz205rl6zr3f57m5ngd46v60wll3dj6wkiaw6b"; + version = "4.13.0.1"; + sha256 = "0728947np74z8dn1p55bqsv1bgx0ipaiajankwnnmp5mk0lkixd6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -105970,8 +106467,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.5.2"; - sha256 = "1w5g5vf6jxb7fi3qg96x17y2i95mv5sbbzmjzy1m55qjqif568v1"; + version = "7.5.3"; + sha256 = "05ki6j3cc9pfqaf7qbr2g4z4kdn4zjrqd3n0n02n9297bcvcschp"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -106354,8 +106851,8 @@ self: { }: mkDerivation { pname = "harg"; - version = "0.2.0.0"; - sha256 = "0zdngzz1p73dpfx4klxf59yhk4qf0r4ming2nw4yqfsyxqfwgw1i"; + version = "0.4.0.0"; + sha256 = "0il36pwzmkc1dj39kybyp6hv4s7d60dl5rx1fkfm23dcg6a9r0dc"; libraryHaskellDepends = [ aeson barbies base bytestring directory higgledy optparse-applicative split text yaml @@ -106560,8 +107057,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.20"; - sha256 = "0xqi3hb1xgbkkj8wmrvp39sh7zcj75v55xbha87nmkl2g56kaxw2"; + version = "0.0.0.21"; + sha256 = "1fq96j9hrfvjffjqz938fql40h15mb7dhfzjfbryd5qip4k45435"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108081,10 +108578,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.15.0.1"; - sha256 = "0l11psgknqppisn102h2392y5jiyz026rv8v2dpq4bk50zibb7qb"; - revision = "1"; - editedCabalFile = "0rk44rxal0sm1ci7c0phwl7fpcby1vys3n3vpp4bgla2hrc6pwba"; + version = "0.15.0.0"; + sha256 = "111c0hdlpnj979p3avlhswziyc6vh6apij5b2nhhi8wlfhqwrpcg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108162,10 +108657,8 @@ self: { }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.15.0.1"; - sha256 = "07195h5qdmnkrr7v1yx8l398vi4zbcawbh7k6slyj3xs3zq9s6kx"; - revision = "1"; - editedCabalFile = "06naxwj75jxy9xvvlc229m1jn9bandqsxaavzm7zj9vw8sxygr0h"; + version = "0.15.0.0"; + sha256 = "1ky20lpgbdiijh3z6ilf7jn7cyxl2kshqnm2p4dgabfh97gbf8bb"; libraryHaskellDepends = [ aeson base bytestring data-default deepseq filepath hashable lens network-uri scientific text unordered-containers @@ -108750,8 +109243,10 @@ self: { ({ mkDerivation, base, haskell-src-exts }: mkDerivation { pname = "haskell-src-exts-simple"; - version = "1.21.0.0"; - sha256 = "0h8m1w995mpdca9is7lwv9n1w7khr5cnxzam21x7w47i546wm9rm"; + version = "1.21.1.0"; + sha256 = "1zw95fdbqgn9653fgbcpdc364ps07v0zgvwxng8yi2dhdnlhjqra"; + revision = "1"; + editedCabalFile = "0mc1n7bkwbykrw1wivj1mvm69a0j1089vbrg8vc1cfkmcdib3xdj"; libraryHaskellDepends = [ base haskell-src-exts ]; description = "A simplified view on the haskell-src-exts AST"; license = stdenv.lib.licenses.mit; @@ -111644,6 +112139,8 @@ self: { pname = "hasty-hamiltonian"; version = "1.3.2"; sha256 = "17nc33q9vkq13wp5dqrq2vq6bz408ll8h84fg7mapks5w5r9sag6"; + revision = "1"; + editedCabalFile = "1k883ziy63p3zmpyfzck5jw2143b6ijcsvwi704rp94pvh0vk02z"; libraryHaskellDepends = [ base kan-extensions lens mcmc-types mwc-probability pipes primitive transformers @@ -112857,6 +113354,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) hdf5;}; + "hdiff" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite + , generics-mrsop, generics-mrsop-gdiff, gitrev, hspec, language-lua + , memory, mtl, optparse-applicative, parsec, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, text + }: + mkDerivation { + pname = "hdiff"; + version = "0.0.0"; + sha256 = "0vs55wrcip9djhdwd5wz44d8w5hfafdck4abhc488b23chdxxxi9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers cryptonite generics-mrsop + generics-mrsop-gdiff hspec memory mtl prettyprinter + prettyprinter-ansi-terminal QuickCheck text + ]; + executableHaskellDepends = [ + base bytestring containers cryptonite generics-mrsop + generics-mrsop-gdiff gitrev hspec language-lua memory mtl + optparse-applicative parsec prettyprinter + prettyprinter-ansi-terminal QuickCheck text + ]; + testHaskellDepends = [ + base bytestring containers cryptonite generics-mrsop + generics-mrsop-gdiff hspec memory mtl prettyprinter + prettyprinter-ansi-terminal QuickCheck text + ]; + description = "Pattern-Expression-based differencing of arbitrary types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hdigest" = callPackage ({ mkDerivation, base, cgi, Crypto, network, parsec, random, time }: @@ -113345,6 +113876,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedgehog_1_0_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring + , concurrent-output, containers, directory, exceptions, fail + , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive + , random, resourcet, semigroups, stm, template-haskell, text, time + , transformers, transformers-base, wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "1.0.1"; + sha256 = "1qc7hkqbnsk3f5r26wc35r3qiy941nmcxhfqgcq9027kw4gs0bi0"; + revision = "1"; + editedCabalFile = "0dq3ry7py2wsiwxar11zbvm3xmifm92nx4bh61lqxzmpwyyiwnxn"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring concurrent-output containers + directory exceptions fail lifted-async mmorph monad-control mtl + pretty-show primitive random resourcet semigroups stm + template-haskell text time transformers transformers-base + wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers mmorph mtl pretty-show semigroups text transformers + ]; + description = "Release with confidence"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedgehog-checkers" = callPackage ({ mkDerivation, base, containers, either, hedgehog, semigroupoids , semigroups @@ -114818,6 +115377,8 @@ self: { pname = "hexpat-lens"; version = "0.1.8"; sha256 = "05c5pjxxsivcbppbl2n8dwyv6zh7azc3l998s2rhgjja55cpfmg0"; + revision = "1"; + editedCabalFile = "0z7cqm5alscaspaiz5pgwlcn6njhggyizqb1v5ay4sbac7v8nqlx"; libraryHaskellDepends = [ base bytestring deepseq hexpat hexpat-tagsoup lens ]; @@ -115809,8 +116370,8 @@ self: { }: mkDerivation { pname = "hie-bios"; - version = "0.1.1"; - sha256 = "119rqh12bq5gq5y708hxr0zci1dq8wf44xzxgxhhx4sb5zgj1l2p"; + version = "0.2.0"; + sha256 = "0sr0drw0kyf4f77cg25x4scjzqg597yr5xl4dzqdnjz5vv0p1znm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117515,8 +118076,8 @@ self: { pname = "hledger-api"; version = "1.14"; sha256 = "18zpclm3nh2zq6cqa10vm232ndg22r8s4h3ffmn2m4fg05172ymd"; - revision = "1"; - editedCabalFile = "05jlbpp4p45q8bd3152l0fm4xz9yvz07ip2cd0kplzvwnmy8sfrg"; + revision = "4"; + editedCabalFile = "126l1d6dirg0kn5p5wdrjnkckn6jsycrvqsh63ysiwswn096gf4c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119875,10 +120436,8 @@ self: { }: mkDerivation { pname = "hookup"; - version = "0.2.3"; - sha256 = "03svzlzkykz4yqwq4vfgwdq6jdz8zzqhy1ggz3wps9cbx6yrl4cj"; - revision = "1"; - editedCabalFile = "1pc0ijak6psp5db1q29nzhp8pw0h15y2g8ssa1xxmlfjdl1c509d"; + version = "0.3"; + sha256 = "08a10bmnr15bb6pdcq4hq3z4595spsq3g8879apcqb6qgbs6dlxb"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -121884,6 +122443,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hs-ix" = callPackage + ({ mkDerivation, base, base-unicode-symbols, criterion, hs-functors + , smallcheck, tasty, tasty-smallcheck, util + }: + mkDerivation { + pname = "hs-ix"; + version = "0.1.0.0"; + sha256 = "1hn4i5j4wyi4n1cb7w9165k0dwkvzy4n9vi2j12p65m9bai8p4zm"; + libraryHaskellDepends = [ + base base-unicode-symbols hs-functors util + ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Indexed monads"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs-java" = callPackage ({ mkDerivation, array, base, binary, binary-state, bytestring , containers, control-monad-exception, data-binary-ieee754 @@ -123794,14 +124370,14 @@ self: { }) {}; "hsimport" = callPackage - ({ mkDerivation, attoparsec, base, cmdargs, directory, dyre - , filepath, haskell-src-exts, ilist, microlens, mtl, split, tasty - , tasty-golden, text + ({ mkDerivation, attoparsec, base, bytestring, cmdargs, directory + , dyre, filepath, haskell-src-exts, ilist, microlens, mtl, split + , tasty, tasty-golden, text, utf8-string }: mkDerivation { pname = "hsimport"; - version = "0.10.0"; - sha256 = "0l98yylpmpnlq6ahicpz86p4khg02yjjcg19nyf9rgml3qdw6829"; + version = "0.11.0"; + sha256 = "1z55gpwyb2gwjlll2c32g9r4aqpdybjpnjy785z60wpjdl48qwaa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123810,7 +124386,8 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base filepath haskell-src-exts tasty tasty-golden + base bytestring filepath haskell-src-exts tasty tasty-golden + utf8-string ]; doHaddock = false; description = "Extend the import list of a Haskell source file"; @@ -124699,17 +125276,17 @@ self: { }) {}; "hspec-golden" = callPackage - ({ mkDerivation, base, directory, hspec, hspec-core, silently - , simple-get-opt + ({ mkDerivation, base, directory, hspec, hspec-core + , optparse-applicative, silently }: mkDerivation { pname = "hspec-golden"; - version = "0.1.0.0"; - sha256 = "191z6pxks4ic1b8lzyfd8f3kw3zwmywvj8psd17lb65z121grj46"; + version = "0.1.0.1"; + sha256 = "1h29jffq33r5ffcni50ypa03x7qvx8yymdrp5nck9q8ykiivry22"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory hspec-core ]; - executableHaskellDepends = [ base directory simple-get-opt ]; + executableHaskellDepends = [ base directory optparse-applicative ]; testHaskellDepends = [ base directory hspec hspec-core silently ]; description = "Golden tests for hspec"; license = stdenv.lib.licenses.mit; @@ -126646,6 +127223,8 @@ self: { pname = "htoml-megaparsec"; version = "2.1.0.3"; sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x"; + revision = "1"; + editedCabalFile = "07zw749vwqdr2lznxivfa22smq7k3h0innanl5wwyf29dq4gk464"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -128683,14 +129262,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hvega_0_4_0_0" = callPackage + "hvega_0_4_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , filepath, tasty, tasty-golden, text, unordered-containers, vector }: mkDerivation { pname = "hvega"; - version = "0.4.0.0"; - sha256 = "1clq31aq8vgvvc1mcrz4al3f7kfb6crs2nkc07n87xykmrcjkdyq"; + version = "0.4.1.0"; + sha256 = "1qjswpgn1ass1x4bk5zjv6vvw7vvsbzh00qc6jjfq3bnljrl4i75"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128793,8 +129372,8 @@ self: { pname = "hw-bits"; version = "0.7.0.6"; sha256 = "0c3bfr4x52fvvp3yin54xbfxz7nq936v2ac89vcim1gscyw51hvm"; - revision = "1"; - editedCabalFile = "0yl5b2qcrb2bjncwv2k9j006582cwxmpfgsggcyk5vw7i6iwhmhb"; + revision = "2"; + editedCabalFile = "1lp2kbmdc5lq7xqi2ix7jccw1gmjxl1q01bflj8fzr2f713m9yrr"; libraryHaskellDepends = [ base bytestring hw-int hw-prim hw-string-parse safe vector ]; @@ -128966,6 +129545,8 @@ self: { pname = "hw-eliasfano"; version = "0.1.1.0"; sha256 = "0q3lrpw72krsbfbykjkkm55aca43ravyl4b1d3k0wgh5wv340a3v"; + revision = "1"; + editedCabalFile = "100fwgcby3nfmx2ailf8zggq0sbh5fm65x4dxyaayfzs8ngfi5is"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129103,6 +129684,8 @@ self: { pname = "hw-ip"; version = "2.3.4.1"; sha256 = "023wv7dvpyw2nnlrdqhp3nqrbbh9af074fz12y8510br2gfdyamd"; + revision = "1"; + editedCabalFile = "0djvl3qvy4km5qxg5pakgck8vr5hh0md8h9h4sgsvjafcqjrza3x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129164,7 +129747,7 @@ self: { broken = true; }) {}; - "hw-json_1_3_0_1" = callPackage + "hw-json_1_3_1_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , bits-extra, bytestring, criterion, directory, dlist, generic-lens , hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits @@ -129176,8 +129759,10 @@ self: { }: mkDerivation { pname = "hw-json"; - version = "1.3.0.1"; - sha256 = "10m4f4jv3wb4n4na1d1a26s81n7clxgmj2745xs9yrax1wvqnjg0"; + version = "1.3.1.0"; + sha256 = "0y5gxr4db381lndjr666l6vl022z9pnp5ypsmrwxcx53hv7glzwn"; + revision = "1"; + editedCabalFile = "1aw2sg7vchf9jd01dkvcbw33n6l5hgi4kyhjk4syr6cnyxysf187"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129236,6 +129821,8 @@ self: { pname = "hw-json-simd"; version = "0.1.0.2"; sha256 = "13i41ppi3ncisfyl3jvpgf4cbx86gyy0maq1xm0jipplkr78844w"; + revision = "1"; + editedCabalFile = "1vbq16ik20yvipvlpf9jrdsv33ynm152rr7c67lcdv8nf4gg4mhq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -129259,6 +129846,8 @@ self: { pname = "hw-json-simple-cursor"; version = "0.1.0.1"; sha256 = "0asvkzz0dgcc5cjrn3wqhn3svxi13wfzxi0ggc8mzzmfci07jigy"; + revision = "1"; + editedCabalFile = "1cpmvmncn3w60lacx21yg9snrmaghn9icgb67g2lfviya6a5qgs8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129455,6 +130044,8 @@ self: { pname = "hw-packed-vector"; version = "0.2.0.0"; sha256 = "1nspd5hwn32fjgxmg08bq8hmyxzh61gc72zgd24mcpy94kzq58xd"; + revision = "1"; + editedCabalFile = "0ilqka4s82kwqrp876gfv6wp7gvlxkfzgxdz23l937vwx988cf1z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129522,6 +130113,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-prim_0_6_2_32" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog + , mmap, QuickCheck, semigroups, transformers, unliftio-core, vector + }: + mkDerivation { + pname = "hw-prim"; + version = "0.6.2.32"; + sha256 = "0q65kivpxciqvknnradmpkaplrkfbckqv3xajk8h2dgas8r1m40l"; + libraryHaskellDepends = [ + base bytestring ghc-prim mmap semigroups transformers unliftio-core + vector + ]; + testHaskellDepends = [ + base bytestring directory exceptions hedgehog hspec + hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion mmap semigroups transformers vector + ]; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-prim-bits" = callPackage ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog , hw-hspec-hedgehog, QuickCheck, vector @@ -129749,17 +130366,18 @@ self: { "hw-uri" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-s3, base, bytestring, directory, exceptions - , filepath, hedgehog, hspec, hspec-discover, http-client - , http-types, hw-hspec-hedgehog, lens, mtl, resourcet, text + , filepath, generic-lens, hedgehog, hspec, hspec-discover + , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet + , text }: mkDerivation { pname = "hw-uri"; - version = "0.1.1.0"; - sha256 = "1f96632k6pcaxhy2nrm13s9kdb0dz3vsav6hzf94wlv7zdlncn8x"; + version = "0.1.1.4"; + sha256 = "1y3rf1npqx3y3pkaipbwhabszvp0427h3sa9f6a5dfy14c6vm88b"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-s3 - base bytestring directory exceptions filepath http-client - http-types lens mtl resourcet text + base bytestring directory exceptions filepath generic-lens + http-client http-types lens mtl resourcet text ]; testHaskellDepends = [ aeson antiope-core antiope-s3 base bytestring filepath hedgehog @@ -130889,20 +131507,18 @@ self: { ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory , distributive, doctest, filepath, generic-deriving, hashable, lens - , reflection, safecopy, semigroupoids, semigroups, simple-reflect - , siphash, tagged, vector + , reflection, semigroupoids, semigroups, simple-reflect, siphash + , tagged, vector }: mkDerivation { pname = "hyperloglog"; - version = "0.4.2"; - sha256 = "0j0hbzpap3f92kvywsxjahxmqrdj51275jdv0h7f9lf9qby3rf7m"; - revision = "1"; - editedCabalFile = "1zh47rrwih6933hhq9vd0ly5s42w0bn196znkg9l8q6r6drl7xsf"; + version = "0.4.3"; + sha256 = "0r1zrhl81hm0sb9my32xyng0xdl2yzh1pdw2bqabzccrhyjk1fwd"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ approximate base binary bits bytes cereal cereal-vector comonad - deepseq distributive hashable lens reflection safecopy - semigroupoids semigroups siphash tagged vector + deepseq distributive hashable lens reflection semigroupoids + semigroups siphash tagged vector ]; testHaskellDepends = [ base directory doctest filepath generic-deriving semigroups @@ -131459,16 +132075,16 @@ self: { "ideas" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , containers, Diff, directory, filepath, HDBC, HDBC-sqlite3 - , http-types, network, parsec, QuickCheck, random + , http-types, mtl, network, parsec, QuickCheck, random , streaming-commons, time, uniplate, wai, wl-pprint }: mkDerivation { pname = "ideas"; - version = "1.7"; - sha256 = "0blazd950wpxjg0mfcx64m32wgcgia34gki987xgqmgkqyc5y2hm"; + version = "1.8"; + sha256 = "0bkcn9rc2bwnfy7n7yja9dlzpjfyvbjj3i10h7clhz59k9x5d8km"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive containers Diff - directory filepath HDBC HDBC-sqlite3 http-types network parsec + directory filepath HDBC HDBC-sqlite3 http-types mtl network parsec QuickCheck random streaming-commons time uniplate wai wl-pprint ]; description = "Feedback services for intelligent tutoring systems"; @@ -131496,6 +132112,21 @@ self: { broken = true; }) {}; + "ideas-math-types" = callPackage + ({ mkDerivation, base, containers, ideas, parsec, QuickCheck }: + mkDerivation { + pname = "ideas-math-types"; + version = "1.0"; + sha256 = "0r72ld0kvyqn21mndhv7gvaa43ydpyv5n6b4lhn9k0wzz2s5q8md"; + libraryHaskellDepends = [ + base containers ideas parsec QuickCheck + ]; + description = "Common types for mathematical domain reasoners"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "idempotent" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { @@ -133331,6 +133962,8 @@ self: { pname = "indexed-list-literals"; version = "0.2.1.2"; sha256 = "043xl356q9n1nw2bw8a8msymy18d6f7nwcyrrpzak9qr75dsx5nq"; + revision = "1"; + editedCabalFile = "198hmw2m3539vmh3s58d33h6vl5d0fqpdms8rp8cwj196diipjlc"; libraryHaskellDepends = [ base Only ]; testHaskellDepends = [ base hspec ]; description = "Type safe indexed list literals"; @@ -133562,33 +134195,6 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.7.1"; - sha256 = "1nny63rd9bw7ijg9l09cd467whfaa1n3ph8dqdy7bp6kcbvdwnzn"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ - base containers doctest raw-strings-qq tasty tasty-hunit - template-haskell time - ]; - description = "Haskell client library for InfluxDB"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "influxdb_1_7_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , cabal-doctest, clock, containers, doctest, foldl, http-client - , http-types, lens, network, optional-args, raw-strings-qq - , scientific, tagged, tasty, tasty-hunit, template-haskell, text - , time, unordered-containers, vector - }: - mkDerivation { - pname = "influxdb"; version = "1.7.1.1"; sha256 = "15qzlbgnplxc53l5134igf6yplxg4fgblx0s8bl8hfjh0gbnn8x8"; isLibrary = true; @@ -133605,7 +134211,6 @@ self: { ]; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -136906,6 +137511,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) wirelesstools;}; + "ix" = callPackage + ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck + , tasty, tasty-smallcheck, util + }: + mkDerivation { + pname = "ix"; + version = "0.1.0.0"; + sha256 = "135ksmyzk6d4sgw7na08cav56667hvlnpcvx14a5mf0ap89s63mg"; + libraryHaskellDepends = [ base base-unicode-symbols util ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + benchmarkHaskellDepends = [ base criterion ]; + doHaddock = false; + description = "Indexed monads"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ix-shapable" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -136974,6 +137595,8 @@ self: { pname = "ixset-typed"; version = "0.4.0.1"; sha256 = "135cfc8d39qv02sga03gsym1yfajf0l5ci1s6q9n1xpb9ignblx8"; + revision = "1"; + editedCabalFile = "0kfklsbjn4gmx76vl7vm1s149f13h2p537930yaq8s2671lzc79p"; libraryHaskellDepends = [ base containers deepseq safecopy syb template-haskell ]; @@ -137441,6 +138064,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "javascript-bridge" = callPackage + ({ mkDerivation, aeson, base, binary, containers, scotty, stm, text + , time, transformers, wai, wai-extra, wai-websockets, websockets + }: + mkDerivation { + pname = "javascript-bridge"; + version = "0.2.0"; + sha256 = "13k7rkvmgm3ajhjvxlkkbipsbkx01lbjwq2xgfyygbcb0lccjrd9"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary containers stm text time transformers wai + wai-websockets websockets + ]; + executableHaskellDepends = [ base scotty text ]; + testHaskellDepends = [ aeson base scotty stm text time wai-extra ]; + description = "Remote Monad for JavaScript on the browser"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "javascript-extras" = callPackage ({ mkDerivation, base, deepseq, ghcjs-base-stub, newtype-generics , parallel, text @@ -137880,8 +138524,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "joint"; - version = "0.1.1"; - sha256 = "1iq29qyi4ij7ffshvz1x9rpbrbpd4088nccdpjzpzgza73w4bqmp"; + version = "0.1.2"; + sha256 = "0v646rwk7anvfxdj7bz9wann1gahcpfsmvsrkk5zbkjx0bw6pibv"; libraryHaskellDepends = [ base ]; description = "Trying to compose non-composable"; license = stdenv.lib.licenses.bsd3; @@ -139523,8 +140167,8 @@ self: { }: mkDerivation { pname = "jvm-binary"; - version = "0.6.0"; - sha256 = "1ipy0vy0pr9pbxjin0d86dwvdy70wxb1cmg1bqcdjdgrg2xbqxf8"; + version = "0.6.1"; + sha256 = "0pz7md5y422mh7lcsshllqwhk6zsxl2szqw44css4m40gr196wnx"; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 deepseq deriving-compat mtl template-haskell text vector @@ -140956,8 +141600,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "key"; - version = "0.1.1.0"; - sha256 = "15n53kq13hhc659s1hq9wdr530da3h2mg5psncq1d2snkkdswqxf"; + version = "0.1.2.0"; + sha256 = "18wgalv0hr5ndr7mbywr7ilyc504kzf28xyymmkj1fm66wb93n4k"; libraryHaskellDepends = [ base transformers ]; description = "Type-safe unconstrained dynamic typing"; license = stdenv.lib.licenses.bsd3; @@ -141327,18 +141971,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "kind-generics-th_0_2_0_0" = callPackage - ({ mkDerivation, base, kind-generics, template-haskell + "kind-generics-th_0_2_1_0" = callPackage + ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell , th-abstraction }: mkDerivation { pname = "kind-generics-th"; - version = "0.2.0.0"; - sha256 = "1vj2zbkv51fvcpjrkqqlsd685drnh2yalsplcb6sgrgq9dfdlw2h"; + version = "0.2.1.0"; + sha256 = "08mswzwm1byxx2hfc8h2b90pnn2p4y83kdrvl4mlcn6v488k2lkb"; libraryHaskellDepends = [ - base kind-generics template-haskell th-abstraction + base ghc-prim kind-generics template-haskell th-abstraction ]; - testHaskellDepends = [ base kind-generics ]; + testHaskellDepends = [ base kind-generics template-haskell ]; description = "Template Haskell support for generating `GenericK` instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -141509,8 +142153,8 @@ self: { }: mkDerivation { pname = "knit-haskell"; - version = "0.6.0.1"; - sha256 = "0wsbi614sjn62ri4msdmav7kx9k11h35dkjpxsd2ndvky2njzi33"; + version = "0.7.0.0"; + sha256 = "06p802fx328hkl3d9rnbdvlmhh9fyx2l293hg65z5ad96c9xzwas"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson-pretty base base64-bytestring blaze-colonnade blaze-html @@ -144788,8 +145432,8 @@ self: { pname = "lazy-hash"; version = "0.1.0.0"; sha256 = "1xa2c8gxk5l4njbs58zpq2ybdvjd4y214p71nfmfrzw0arwz49pa"; - revision = "2"; - editedCabalFile = "0j46blbddl9y4chccyns7cixbxb0a4pkmdkbd5z09510ddz3jqm3"; + revision = "3"; + editedCabalFile = "0l348ahsic2cd27haqgsbh35w1f1y92bf2jnb8hkvbwf04b7r4qw"; libraryHaskellDepends = [ base constrained-categories hashable haskell-src-meta tagged template-haskell vector-space @@ -144809,8 +145453,8 @@ self: { pname = "lazy-hash-cache"; version = "0.1.0.0"; sha256 = "1bdq2fbxpmlva1qbxbiznnjmz7yv7qzcr8wdgds0rdzwhjn97mp4"; - revision = "1"; - editedCabalFile = "1m42wsj93vpb6v1dcj2lc5z04qc2np8i7n3w82jwwk4wbgl5q35j"; + revision = "2"; + editedCabalFile = "1w1g6h01pjvrqk3r0qknn0v0xidfdnbwm6kqvxax89r83i29pkv5"; libraryHaskellDepends = [ base base16-bytestring binary bytestring data-default-class directory filepath hashable lazy-hash microlens microlens-th @@ -144846,6 +145490,22 @@ self: { broken = true; }) {}; + "lazy-priority-queue" = callPackage + ({ mkDerivation, base, containers, doctest, lens, markdown-unlit }: + mkDerivation { + pname = "lazy-priority-queue"; + version = "0.1"; + sha256 = "0cjp9pvwrgldkrkg72xyq2mrr4yqzzsb4ng5as0b56zq4dgzvlib"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base containers ]; + testHaskellDepends = [ base doctest lens ]; + testToolDepends = [ markdown-unlit ]; + description = "Lazy-Spined Monadic Priority Queues"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "lazy-search" = callPackage ({ mkDerivation, base, size-based }: mkDerivation { @@ -145569,7 +146229,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "lens_4_18" = callPackage + "lens_4_18_1" = callPackage ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring , Cabal, cabal-doctest, call-stack, comonad, containers , contravariant, criterion, deepseq, directory, distributive @@ -145583,8 +146243,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.18"; - sha256 = "0wldr36bmlxddc6d874lfl4hwnh5bq5k89v437d7xw5ldj0fgws6"; + version = "4.18.1"; + sha256 = "1lmxjaj32v06l12gy00rpjp2lk1cblh3k7kwklk655ss2vas61ri"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -145630,8 +146290,8 @@ self: { }: mkDerivation { pname = "lens-action"; - version = "0.2.3"; - sha256 = "1q4q190lv6gh3bvdz9n177hwrckkkbfbwcw64b9ksz11gxn8m106"; + version = "0.2.4"; + sha256 = "06yg4ds0d4cfs3zl1fhc8865i5w6pwqhx9bxngfa8f9974mdiid3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base comonad contravariant lens mtl profunctors semigroupoids @@ -148225,8 +148885,8 @@ self: { }: mkDerivation { pname = "lingo"; - version = "0.1.0.1"; - sha256 = "1yany2pi06yvkmgz808gji6yk9v0wbl5vnaijhb8vqd152zmmzb4"; + version = "0.2.0.0"; + sha256 = "0wgrliwxgwsylga3hkikpjyf7a835n7y62kihj6glymim2xv1vdw"; setupHaskellDepends = [ base bytestring Cabal containers directory filepath text yaml ]; @@ -148370,8 +149030,8 @@ self: { }: mkDerivation { pname = "linnet"; - version = "0.4.0.0"; - sha256 = "0k64pnzs13rc68h4qpn0kd3qm3hsyzgd8d8r96vak8a0pbjkzgrq"; + version = "0.4.0.1"; + sha256 = "0bzss6a8fx8zw5q27m50nhqp8rb23v1cdxlck0hjr17h0fmxvwsm"; libraryHaskellDepends = [ base bytestring bytestring-conversion case-insensitive either exceptions http-media http-types mtl text time transformers @@ -148393,8 +149053,8 @@ self: { }: mkDerivation { pname = "linnet-aeson"; - version = "0.4.0.0"; - sha256 = "1rpc3i32vywvhfndg9p3rd5qy1m1fv0zqxbhdyp36c8awm1q5086"; + version = "0.4.0.1"; + sha256 = "0lsrn9sxcr038vz7j112hmf5mc2027x808ndqxm4dx4m6ncji0a4"; libraryHaskellDepends = [ aeson base bytestring linnet ]; testHaskellDepends = [ aeson base bytestring hspec linnet QuickCheck quickcheck-classes @@ -148411,8 +149071,8 @@ self: { }: mkDerivation { pname = "linnet-conduit"; - version = "0.4.0.0"; - sha256 = "1a29sahlmhl8k6xqyfm9ixf64k2x0k631z5jixvg1x1s6xpq3hyi"; + version = "0.4.0.1"; + sha256 = "02ixcf0b1p2c7cyiaghx564lkyy2m48m8p1y6dxim9ygjgamhhl9"; libraryHaskellDepends = [ base bytestring conduit http-types linnet wai warp ]; @@ -148651,11 +149311,11 @@ self: { ({ mkDerivation, base, bytestring, containers, hashable }: mkDerivation { pname = "lio"; - version = "0.11.6.0"; - sha256 = "1lylxwcm0j9iyivi11h6wsq6xb4fn8k5bpbjj3694kcdby9b8hr6"; + version = "0.11.7.0"; + sha256 = "17ckrv1ksm2ab91x63h5ia65hckw0zcxfr2mdl6aa2xxscnm4k8h"; libraryHaskellDepends = [ base bytestring containers hashable ]; description = "Labeled IO Information Flow Control Library"; - license = "GPL"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -149571,8 +150231,8 @@ self: { ({ mkDerivation, base, enumset, LLVM }: mkDerivation { pname = "llvm-ffi"; - version = "3.8.1.1"; - sha256 = "1l74yyxgi3ndj9ffjk46wnzifgcn39gj19h9rcsbb8zvbcxw0lw6"; + version = "3.8.1.2"; + sha256 = "04k2ag8nh54f9hh3blgyn1xa88hfv6c6ps51i5b84g4jdvja7f5v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; @@ -150670,6 +151330,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_3_5" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , prettyprinter, semigroups, stm, stm-delay, text, time + , transformers, transformers-base, unliftio-core + }: + mkDerivation { + pname = "logging-effect"; + version = "1.3.5"; + sha256 = "1ydkgjq3xpl7bqyax8ff6kvd9hjbyddgayrw43afdzbky1d0qawq"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl prettyprinter + semigroups stm stm-delay text time transformers transformers-base + unliftio-core + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + prettyprinter text time + ]; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, prettyprinter @@ -152270,6 +152954,37 @@ self: { broken = true; }) {}; + "lzip" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "lzip"; + version = "0.0.0.0"; + sha256 = "0ccwckq0gkrnahf224s59gsdd9baay1dfc8fh1kz2r87rbygzsk7"; + libraryHaskellDepends = [ base bytestring ]; + description = "Lzip compression / Lzlib bindings"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "lzlib" = callPackage + ({ mkDerivation, base, bytestring, c2hs, criterion, directory + , filepath, hspec, temporary + }: + mkDerivation { + pname = "lzlib"; + version = "0.2.0.0"; + sha256 = "0m0kx2drrxy01rf7a231pjqk783gcqqkjn831bcx0dbqksaz6fvm"; + revision = "1"; + editedCabalFile = "0jjl1rdlh8cms7pbd9y258s817l77nql4ayq12qy8c9vvxdyamh8"; + libraryHaskellDepends = [ base bytestring ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base bytestring directory hspec ]; + benchmarkHaskellDepends = [ + base bytestring criterion filepath temporary + ]; + description = "lzlib bindings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lzma" = callPackage ({ mkDerivation, base, bytestring, HUnit, lzma, QuickCheck, tasty , tasty-hunit, tasty-quickcheck @@ -152353,8 +153068,8 @@ self: { pname = "lzma-streams"; version = "0.1.0.0"; sha256 = "1w8s0xvcz8c3s171gizjkc9iadccjznw7rnfq5wpydkc7x4hxjdn"; - revision = "3"; - editedCabalFile = "1zx9y1pls8mnad78ancf52kffyw6ixp9x9bbvp7qfmmi8dc8s90r"; + revision = "4"; + editedCabalFile = "02ipx7mf8mfc937wkdid6qkxxkb2qp7sx9g8bkk8wbvma77kkysg"; libraryHaskellDepends = [ base bytestring io-streams lzma ]; testHaskellDepends = [ base bytestring HUnit io-streams QuickCheck test-framework @@ -154341,6 +155056,19 @@ self: { broken = true; }) {}; + "marshal-contt" = callPackage + ({ mkDerivation, base, bytestring, kan-extensions, lens, mtl }: + mkDerivation { + pname = "marshal-contt"; + version = "0.2.0.0"; + sha256 = "1dv2jl7gm3b3kcchgwz4v6rch5w50ak43gc6fjvpms81xkdjfzmb"; + libraryHaskellDepends = [ + base bytestring kan-extensions lens mtl + ]; + description = "A ContT-based wrapper for Haskell-to-C marshalling functions"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "marvin" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, configurator , deepseq, directory, filepath, hashable, haskeline, hspec @@ -154465,29 +155193,9 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "massiv-io" = callPackage - ({ mkDerivation, base, bytestring, data-default, deepseq, directory - , filepath, JuicyPixels, massiv, netpbm, process, vector - }: - mkDerivation { - pname = "massiv-io"; - version = "0.1.6.0"; - sha256 = "0ggl24w7y9bhlf0dh379raiq8fi2gb29whypp3jy37h8m6ldsngn"; - libraryHaskellDepends = [ - base bytestring data-default deepseq directory filepath JuicyPixels - massiv netpbm process vector - ]; - description = "Import/export of Image files into massiv Arrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "massiv-io_0_1_7_0" = callPackage ({ mkDerivation, base, bytestring, data-default-class, deepseq , directory, filepath, JuicyPixels, massiv, netpbm, process, vector }: @@ -154501,8 +155209,6 @@ self: { ]; description = "Import/export of Image files into massiv Arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "massiv-scheduler" = callPackage @@ -154544,8 +155250,6 @@ self: { ]; description = "Library that contains generators, properties and tests for Massiv Array Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "master-plan" = callPackage @@ -154659,27 +155363,6 @@ self: { }: mkDerivation { pname = "math-functions"; - version = "0.3.2.0"; - sha256 = "1798n8x3w3x4s058dph18g11k2hm7vcxkbr2rb2snlksjr59c2wa"; - libraryHaskellDepends = [ - base data-default-class deepseq primitive vector vector-th-unbox - ]; - testHaskellDepends = [ - base data-default-class deepseq erf HUnit primitive QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - vector vector-th-unbox - ]; - description = "Collection of tools for numeric computations"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "math-functions_0_3_2_1" = callPackage - ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit - , primitive, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, vector, vector-th-unbox - }: - mkDerivation { - pname = "math-functions"; version = "0.3.2.1"; sha256 = "1d1zgc9y3pgahpkn2vgzc2vh412z54i03gw98s95jpqclvl7fyck"; libraryHaskellDepends = [ @@ -154692,7 +155375,6 @@ self: { ]; description = "Collection of tools for numeric computations"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "math-grads" = callPackage @@ -155042,8 +155724,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.4.0"; - sha256 = "0b4y48z3hn55y8q61l8zp7x8pf0fyps4inv1s52y1yg7b2rpyfzb"; + version = "50200.5.0"; + sha256 = "0ahlsyk21zm0h1ri0jwlhmqv90myn8x5xhjhpqxafsyjj8vhanpw"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -156064,6 +156746,8 @@ self: { pname = "membrain"; version = "0.0.0.0"; sha256 = "01wv5i3kgbpmwjnjk5xgkpm3j5wazlz1f05kmm523wf34xivp498"; + revision = "1"; + editedCabalFile = "1nkphzar8f1wyif3haz6i55jaapysz1xvf2w3ynmm49ibhsczvg3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob hedgehog hspec type-spec @@ -156446,8 +157130,8 @@ self: { pname = "mercury-api"; version = "0.1.0.2"; sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg"; - revision = "3"; - editedCabalFile = "0v0fag8y821nr825cn9bqpmrr55zr6dqiqg5q1rfvifflmq73d37"; + revision = "4"; + editedCabalFile = "1bx3xrafmf82b9wlvhggv87fwqgpgqxjdgkk9r5b323m9ci2gign"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156483,6 +157167,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mergeful" = callPackage + ({ mkDerivation, aeson, base, containers, mtl, text, time, validity + , validity-containers, validity-time + }: + mkDerivation { + pname = "mergeful"; + version = "0.0.0.0"; + sha256 = "1zvli3gqw5svr5k36yl420ih2x8drl1522khn8jmjp9n26hc080w"; + libraryHaskellDepends = [ + aeson base containers mtl text time validity validity-containers + validity-time + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "mergeless" = callPackage ({ mkDerivation, aeson, base, containers, mtl, time, validity , validity-containers, validity-time @@ -160518,10 +161217,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "monadLib"; - version = "3.9"; - sha256 = "1vibzls4ld4v7rib14nb9blni1c42csv4b1igaplks85xyr5grrm"; - revision = "1"; - editedCabalFile = "1vxd4ncwbg77vvny77b771lbh0xjdwim3lmpd14zcfqqpy0gn9bj"; + version = "3.10"; + sha256 = "18vvcq6s9aci314daqkniq9aj1wdqa7rd3v06vd506a98c7lwp31"; libraryHaskellDepends = [ base ]; description = "A collection of monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -162356,8 +163053,8 @@ self: { }: mkDerivation { pname = "mssql-simple"; - version = "0.5.0.1"; - sha256 = "174qqm4y38b4x0nc4kfrafr0cqcqshdxgxj2amn58m5zvclhn3fs"; + version = "0.6.0.0"; + sha256 = "1ijaxamabxwabyvh30blscxxgpbmr55far373nhn98w224b1jddy"; libraryHaskellDepends = [ base binary bytestring hostname ms-tds mtl network template-haskell text time tls uuid-types @@ -165343,6 +166040,8 @@ self: { pname = "natural"; version = "0.3.0.4"; sha256 = "0c5z5msb2nx648m07cjv9hwaycdhcwis9ac6n7qbyvhxsis84jlg"; + revision = "1"; + editedCabalFile = "1jn15nmrnkdwi1k76n5ghlazx3lqhacy5cxpkbqa8ypmwpx3i7jn"; libraryHaskellDepends = [ base lens semigroupoids ]; testHaskellDepends = [ base checkers hedgehog lens QuickCheck tasty tasty-hedgehog @@ -165927,29 +166626,29 @@ self: { }) {ghc-binary = null;}; "net-mqtt" = callPackage - ({ mkDerivation, async, attoparsec, base, binary, bytestring - , conduit, conduit-extra, containers, HUnit, network-conduit-tls - , network-uri, QuickCheck, stm, tasty, tasty-hunit - , tasty-quickcheck, text + ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary + , bytestring, conduit, conduit-extra, containers, HUnit + , network-conduit-tls, network-uri, QuickCheck, stm, tasty + , tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "net-mqtt"; - version = "0.2.4.2"; - sha256 = "1ygd0ncwzzy4i2m4n0ax02csyjdsn2y66amr9yilxn6x0yhbq9rj"; + version = "0.5.0.2"; + sha256 = "1dq1f9kkdrz8yf6yj9xzfyna6rnkzv0vmsrzg92vbkyqfhkw6fga"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async attoparsec base binary bytestring conduit conduit-extra - containers network-conduit-tls network-uri stm text + async attoparsec attoparsec-binary base binary bytestring conduit + conduit-extra containers network-conduit-tls network-uri stm text ]; executableHaskellDepends = [ - async attoparsec base binary bytestring conduit conduit-extra - containers network-conduit-tls network-uri stm text + async attoparsec attoparsec-binary base binary bytestring conduit + conduit-extra containers network-conduit-tls network-uri stm text ]; testHaskellDepends = [ - async attoparsec base binary bytestring conduit conduit-extra - containers HUnit network-conduit-tls network-uri QuickCheck stm - tasty tasty-hunit tasty-quickcheck text + async attoparsec attoparsec-binary base binary bytestring conduit + conduit-extra containers HUnit network-conduit-tls network-uri + QuickCheck stm tasty tasty-hunit tasty-quickcheck text ]; description = "An MQTT Protocol Implementation"; license = stdenv.lib.licenses.bsd3; @@ -166754,8 +167453,8 @@ self: { ({ mkDerivation, base, bytestring, doctest }: mkDerivation { pname = "network-byte-order"; - version = "0.1.1.0"; - sha256 = "16prqgaqxn1h56gw9r446cq5a4jyaiplg50pjy1ji4k7cvcpx5vk"; + version = "0.1.1.1"; + sha256 = "19cs6157amcc925vwr92q1azwwzkbam5g0k70i6qi80fhpikh37c"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; @@ -166988,6 +167687,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-manager-tui" = callPackage + ({ mkDerivation, base, brick, hspec, microlens, process, split + , vector, vty + }: + mkDerivation { + pname = "network-manager-tui"; + version = "1.0.0.0"; + sha256 = "15xm6nsinf1a33h9wd06s7z8fvydn0jck6rzc5v69g51fdy8mjbg"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base brick microlens process split vector vty + ]; + executableHaskellDepends = [ + base brick microlens process split vector vty + ]; + testHaskellDepends = [ + base brick hspec microlens process split vector vty + ]; + doHaddock = false; + description = "network-manager tui"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "network-messagepack-rpc" = callPackage ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions , text, unordered-containers @@ -167865,8 +168588,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "newtype"; - version = "0.2.1.0"; - sha256 = "03fr1yfip09dvwff87dssy7r0vrv4rv184flxnp9gjzbg6h9byvb"; + version = "0.2.2.0"; + sha256 = "1b7bamnd0p8vmxvlg39g5d4a2av49kx10rdyz04ixa28pg8zy01s"; libraryHaskellDepends = [ base ]; description = "A typeclass and set of functions for working with newtypes"; license = stdenv.lib.licenses.bsd3; @@ -167891,24 +168614,6 @@ self: { }) {}; "newtype-generics" = callPackage - ({ mkDerivation, base, criterion, hspec, hspec-discover, semigroups - , transformers - }: - mkDerivation { - pname = "newtype-generics"; - version = "0.5.3"; - sha256 = "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj"; - revision = "1"; - editedCabalFile = "1glnwq1lw7780qgahqvh1qfx6k2ciwmbhc2wcc78v3aa3s954c8v"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ base hspec ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion semigroups ]; - description = "A typeclass and set of functions for working with newtypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "newtype-generics_0_5_4" = callPackage ({ mkDerivation, base, gauge, hspec, hspec-discover, semigroups , transformers }: @@ -167922,7 +168627,6 @@ self: { benchmarkHaskellDepends = [ base gauge semigroups ]; description = "A typeclass and set of functions for working with newtypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "newtype-th" = callPackage @@ -171527,36 +172231,6 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.6.7004.0"; - sha256 = "1p897zswmxil3yrxgdnjszbafi01gib8rl0y9lay4vqj1mrwa14m"; - revision = "1"; - editedCabalFile = "0wxcygykflm06v7m0p3pi7i490c1mjbid8whc9dsc181hfzhr6wl"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors scientific semigroups text time time-locale-compat - transformers uuid void - ]; - testHaskellDepends = [ - aeson base containers contravariant dotenv hspec hspec-discover - multiset postgresql-simple product-profunctors profunctors - QuickCheck semigroups text time transformers uuid - ]; - testToolDepends = [ hspec-discover ]; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye_0_6_7004_1" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-locale-compat, transformers, uuid - , void - }: - mkDerivation { - pname = "opaleye"; version = "0.6.7004.1"; sha256 = "09jgdqkw8hp82b3x0fg9906gyxwl9gz3hifv2dvrj915fvgiybg1"; libraryHaskellDepends = [ @@ -171573,7 +172247,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -172935,14 +173608,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-applicative_0_15_0_0" = callPackage + "optparse-applicative_0_15_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, process , QuickCheck, transformers, transformers-compat }: mkDerivation { pname = "optparse-applicative"; - version = "0.15.0.0"; - sha256 = "0210rv7scp2063n8pr39bzy7dbl2777zwdnnx6kp3c34jilssjxg"; + version = "0.15.1.0"; + sha256 = "1ws6y3b3f6hsgv0ff0yp6lw4hba1rps4dnvry3yllng0s5gngcsd"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -173726,20 +174399,20 @@ self: { "overloaded" = callPackage ({ mkDerivation, base, bytestring, containers, fin, generic-lens - , ghc, HUnit, lens, sop-core, split, syb, symbols, tasty - , tasty-hunit, text, vec + , ghc, HUnit, lens, singleton-bool, sop-core, split, syb, symbols + , tasty, tasty-hunit, text, time, vec }: mkDerivation { pname = "overloaded"; - version = "0.1"; - sha256 = "0sb910gk8z3a97vqk9naa079sm84p24jh2jgm39lxagwhmz72w6a"; + version = "0.1.1"; + sha256 = "0palmwxknrc5pqwhlij3rfbzfz9csi5h41iild89bxkb3qj0x2z4"; libraryHaskellDepends = [ base bytestring containers fin ghc sop-core split syb symbols text - vec + time vec ]; testHaskellDepends = [ - base bytestring containers fin generic-lens HUnit lens sop-core - symbols tasty tasty-hunit text vec + base bytestring containers fin generic-lens HUnit lens + singleton-bool sop-core symbols tasty tasty-hunit text time vec ]; description = "Overloaded pragmas as a plugin"; license = stdenv.lib.licenses.bsd3; @@ -176876,6 +177549,8 @@ self: { pname = "path-io"; version = "1.4.2"; sha256 = "0jqx3mi4an4kb3kg78n1p3xrz832yrfrnvj795b0xhkv6h1z5ir3"; + revision = "1"; + editedCabalFile = "02irjcw5rdcx9wvsb7mcanylp2bwaiacpfjjbcvqq1lhvqcyw73i"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -176887,6 +177562,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "path-io_1_5_0" = callPackage + ({ mkDerivation, base, containers, directory, dlist, exceptions + , filepath, hspec, path, temporary, time, transformers, unix-compat + }: + mkDerivation { + pname = "path-io"; + version = "1.5.0"; + sha256 = "16zgi2a7g3mc9rslshjm86q4c3rr9vrd8qcjw753ndpar05j41bf"; + revision = "1"; + editedCabalFile = "127x8jhx2illj2r5x8f2g4yfl1idfngxmzphfr45abdf024n3pm8"; + libraryHaskellDepends = [ + base containers directory dlist exceptions filepath path temporary + time transformers unix-compat + ]; + testHaskellDepends = [ + base directory exceptions hspec path transformers unix-compat + ]; + description = "Interface to ‘directory’ package for users of ‘path’"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "path-pieces" = callPackage ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }: mkDerivation { @@ -180445,8 +181142,8 @@ self: { }: mkDerivation { pname = "pinboard-notes-backup"; - version = "1.0.4.1"; - sha256 = "1a0lw43pjfz18aplm2frljwaww37pm2ashxi59j6l5n32lg5573j"; + version = "1.0.5"; + sha256 = "042zph3nisrmhkfk2h3fwh91dz1fp0wgff0hlnpd962i67fgpixx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -182912,8 +183609,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.5"; - sha256 = "1h5igixmn36k9b4mnc7lgalc4i88yg71h396wzqnh041jz28y6wc"; + version = "1.1.1.6"; + sha256 = "1rsr9vgqq10ydwan2qvghgfvff5m75ivl8md8r8yxffbw0spiwsv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182959,10 +183656,8 @@ self: { }: mkDerivation { pname = "pointful"; - version = "1.0.11.0"; - sha256 = "0kz786xp2sjl6ldbbfg3ln8l6nib6i8lw0d15hqr6yawrnf32qr2"; - revision = "2"; - editedCabalFile = "0zdhhflhz853iwlcjfxh57bx1wf8capij4b0ysjgmp7bi8hw5ww0"; + version = "1.1.0.0"; + sha256 = "1a6fy2m3cv1jn399vgl467nhc8vwlfcqly1mbzh5rjlsy7drjj3s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183386,7 +184081,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "polysemy_1_2_0_0" = callPackage + "polysemy_1_2_1_0" = callPackage ({ mkDerivation, async, base, containers, criterion, doctest , first-class-families, free, freer-simple, hspec, hspec-discover , inspection-testing, mtl, stm, syb, template-haskell @@ -183395,8 +184090,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.2.0.0"; - sha256 = "14cl4h78vhi83c3ccz3hy1cbh21a7ry7n5z2i7m3zm2cyj4sbw4q"; + version = "1.2.1.0"; + sha256 = "0apwnscl6falazh8w8vv7zm2rv60ls8syk06swjicm4vwxj7zdl4"; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb template-haskell th-abstraction transformers type-errors @@ -183425,8 +184120,8 @@ self: { }: mkDerivation { pname = "polysemy-RandomFu"; - version = "0.3.0.0"; - sha256 = "17qh2p7nh091kgywdzfd8ckzk6vczm9zxyp9vs94c1ld9qxrhkv8"; + version = "0.4.0.0"; + sha256 = "0l4jimvd3shvxwl0zrfxqp3hlkiqwzihljd07jdppchc41xq3aiz"; libraryHaskellDepends = [ base polysemy polysemy-plugin polysemy-zoo random-fu random-source ]; @@ -183488,15 +184183,15 @@ self: { broken = true; }) {}; - "polysemy-zoo_0_6_0_0" = callPackage + "polysemy-zoo_0_6_0_1" = callPackage ({ mkDerivation, async, base, binary, bytestring, constraints , containers, contravariant, ghc-prim, hedis, hspec, hspec-discover , mtl, polysemy, polysemy-plugin, random, reflection, transformers }: mkDerivation { pname = "polysemy-zoo"; - version = "0.6.0.0"; - sha256 = "1d8h1hmq59b4igxdym83rd4ggcq45jb5zb0sdyvacqiicy5rnzhz"; + version = "0.6.0.1"; + sha256 = "1va72282ng2h15fpzi3az1cdl1717hyfsa1qfz9xl4lnaa4x8nwa"; libraryHaskellDepends = [ async base binary bytestring constraints containers contravariant ghc-prim hedis mtl polysemy polysemy-plugin random reflection @@ -184208,6 +184903,23 @@ self: { broken = true; }) {}; + "posplyu" = callPackage + ({ mkDerivation, base, directory, process, split, time, timerep + , transformers, unix, X11 + }: + mkDerivation { + pname = "posplyu"; + version = "0.1.0"; + sha256 = "1whdihlfcgjy4na86qhhhixa0l494005shfxs5ns61qsdw7mwflk"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory process split time timerep transformers unix X11 + ]; + description = "Sleep tracker for X11, using XScreenSaver extension and manual input"; + license = stdenv.lib.licenses.mit; + }) {}; + "possible" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -184471,6 +185183,8 @@ self: { pname = "postgresql-libpq"; version = "0.9.4.2"; sha256 = "1y86kysakfcf3zq252yl2llrx3765vxvkdwda4q5ql7ikv3m786f"; + revision = "1"; + editedCabalFile = "0hilyfb2gjh471ia2g8mwjs56ykrgl0qd06vpigwhc493ia7a9mv"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ postgresql ]; @@ -184605,8 +185319,8 @@ self: { pname = "postgresql-simple"; version = "0.6.2"; sha256 = "15pkflx48mgv4fjmnagyfh06q065k8m8c98bysc3gm6m4srz5ypv"; - revision = "1"; - editedCabalFile = "0v8a7ylnbl8iv6v3blahrsnggk3kldvrq2gpq1fxni8y2jmc96d6"; + revision = "2"; + editedCabalFile = "1rlawj79mfff915bz5fr62g5ig4pfh77m30xrq8q71s6ql0ly4bj"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -184794,8 +185508,8 @@ self: { pname = "postgresql-simple-url"; version = "0.2.1.0"; sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; - revision = "1"; - editedCabalFile = "0ck0vrlsyj3vm8sk59jnyyqpvnv1l9mciifdnrzwr981pha147qp"; + revision = "2"; + editedCabalFile = "1nb1ks6hdfn16389f2yhf37qhjqd2y5wjc1dcp9bjhzd787z7ypr"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -186318,8 +187032,8 @@ self: { pname = "prettyprinter"; version = "1.3.0"; sha256 = "1dc43z53s8pbrv6wf2mq6zvggd67lk415zqg8q9bcd1ld5m9h2x4"; - revision = "1"; - editedCabalFile = "0i5m6x3xsph343w2902xvv91l1raak4nz4q1py7vf95p0hbb72qq"; + revision = "2"; + editedCabalFile = "044zsw0fykrf657s60wrn2798g6b3phis1d32f92zrrq7y2nscw3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; @@ -186899,6 +187613,20 @@ self: { broken = true; }) {}; + "print-console-colors" = callPackage + ({ mkDerivation, ansi-terminal, base }: + mkDerivation { + pname = "print-console-colors"; + version = "0.1.0.0"; + sha256 = "12x1lbn8daq996pipnqd8g6mjpg85zj85zygbs547m9r27gf6j88"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base ]; + executableHaskellDepends = [ base ]; + description = "Print all ANSI console colors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "print-debugger" = callPackage ({ mkDerivation, base, split }: mkDerivation { @@ -187747,16 +188475,17 @@ self: { , hashable, hashable-time, haskeline, http-api-data, http-types , HUnit, list-t, megaparsec, monad-parallel, MonadRandom, mtl , network, network-transport, network-transport-tcp, old-locale - , optparse-applicative, parallel, path-pieces, QuickCheck - , quickcheck-instances, random, random-shuffle, resourcet, rset - , scotty, semigroups, stm, stm-containers, template-haskell - , temporary, text, time, transformers, unix, unordered-containers - , uuid, vector, vector-binary-instances, websockets, zlib + , optparse-applicative, parallel, parser-combinators, path-pieces + , QuickCheck, quickcheck-instances, random, random-shuffle + , resourcet, rset, scotty, semigroups, stm, stm-containers + , template-haskell, temporary, text, time, transformers, unix + , unordered-containers, uuid, vector, vector-binary-instances + , websockets, zlib }: mkDerivation { pname = "project-m36"; - version = "0.6"; - sha256 = "0ajxsgzbscg45c1dzhqassnga9k3i22f2l2w5kciina5q43ihla4"; + version = "0.7"; + sha256 = "1ahvnyrg28r16rw982bpawrmiikc121z7358y3gxzqxnv2cc9y65"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187779,9 +188508,9 @@ self: { deepseq-generics directory either filepath ghc ghc-paths gnuplot hashable hashable-time haskeline http-api-data http-types HUnit list-t megaparsec MonadRandom mtl network-transport-tcp - optparse-applicative parallel path-pieces random scotty semigroups - stm stm-containers template-haskell temporary text time - transformers unordered-containers uuid vector + optparse-applicative parallel parser-combinators path-pieces random + scotty semigroups stm stm-containers template-haskell temporary + text time transformers unordered-containers uuid vector vector-binary-instances websockets ]; testHaskellDepends = [ @@ -187790,8 +188519,8 @@ self: { directory either filepath gnuplot hashable hashable-time haskeline http-api-data HUnit list-t megaparsec MonadRandom mtl network network-transport network-transport-tcp optparse-applicative - parallel path-pieces random semigroups stm stm-containers - template-haskell temporary text time transformers + parallel parser-combinators path-pieces random semigroups stm + stm-containers template-haskell temporary text time transformers unordered-containers uuid vector vector-binary-instances websockets ]; benchmarkHaskellDepends = [ @@ -188046,8 +188775,8 @@ self: { }: mkDerivation { pname = "prometheus-proc"; - version = "0.1.1.0"; - sha256 = "1mygx1kjjgrlqbi43g6867ylcynhqki52d9kjl4fi83smrjkhxa9"; + version = "0.1.2.0"; + sha256 = "0lia1r6bjh0m55s7nrfhn76v58yai8brlpi0q193wh0ypsg71j9l"; libraryHaskellDepends = [ base directory filepath prometheus-client regex-applicative text unix unix-memory @@ -188766,8 +189495,8 @@ self: { }: mkDerivation { pname = "protocol-radius-test"; - version = "0.1.0.0"; - sha256 = "1zgfq76k86jf1jpm14mpb8iaiya0d6vz0lrmbwc0fn34hqhkcd88"; + version = "0.1.0.1"; + sha256 = "14npn49vj7a66pzvrdw0gj88h97vz11axq5i4k4nq0r156yb07pm"; libraryHaskellDepends = [ base bytestring cereal containers protocol-radius QuickCheck quickcheck-simple transformers @@ -189969,8 +190698,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.9"; - sha256 = "020f7dxlamc02r312z3nkr9r4q69z5dw5ly3ilfy0mrzngi8dvg3"; + version = "1.5.1.10"; + sha256 = "0nif5b7slyr7ppm1igm06k1zjf0sninyrf0n8qkaw2kwhxgdsam2"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-types memory text time transformers @@ -191174,7 +191903,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-classes_0_6_3_0" = callPackage + "quickcheck-classes_0_6_4_0" = callPackage ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers , contravariant, fail, primitive, primitive-addr, QuickCheck , quickcheck-classes-base, semigroupoids, semigroups, semirings @@ -191182,10 +191911,8 @@ self: { }: mkDerivation { pname = "quickcheck-classes"; - version = "0.6.3.0"; - sha256 = "0rbrxs79naffzp809523452xprh7z33j6p256qs0cnni9v9zfgjf"; - revision = "1"; - editedCabalFile = "1qm6zfmhil1wn1972hfdsvxlgzgps0ip8vdlgz3fz5a048l29ahq"; + version = "0.6.4.0"; + sha256 = "0qcxmkf9ig6jnfpd5slx2imzwmvvyqgvlif2940yzwam63m6anwg"; libraryHaskellDepends = [ aeson base base-orphans bifunctors containers contravariant fail primitive primitive-addr QuickCheck quickcheck-classes-base @@ -194467,27 +195194,39 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "reanimate-svg" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, hspec - , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text - , transformers, vector, xml + "reanimate_0_1_6_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, attoparsec, base + , base64-bytestring, bytestring, cassava, colour, containers + , cubicbezier, diagrams, diagrams-contrib, diagrams-core + , diagrams-lib, diagrams-svg, directory, filepath, fsnotify + , hashable, here, JuicyPixels, lens, linear, matrices, matrix, mtl + , open-browser, palette, parallel, process, QuickCheck + , random-shuffle, reanimate-svg, svg-builder, tasty, tasty-golden + , tasty-hunit, temporary, text, time, vector, websockets, xml }: mkDerivation { - pname = "reanimate-svg"; - version = "0.9.1.0"; - sha256 = "1hiinaz8swlg1lzm5narlwmkzqjxym4k3qn5izyhjjhx4ch0avr4"; + pname = "reanimate"; + version = "0.1.6.0"; + sha256 = "10nivxmj8lkvr7g8fjnq7m7kxy3jmy9vka0lva6ahr91c9qk1fcz"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - attoparsec base bytestring containers JuicyPixels lens linear mtl - scientific text transformers vector xml + ansi-wl-pprint attoparsec base base64-bytestring bytestring cassava + colour containers cubicbezier diagrams diagrams-contrib + diagrams-core diagrams-lib diagrams-svg directory filepath fsnotify + hashable here JuicyPixels lens linear matrices matrix mtl + open-browser palette parallel process random-shuffle reanimate-svg + svg-builder temporary text time vector websockets xml ]; testHaskellDepends = [ - attoparsec base hspec linear scientific svg-tree + ansi-wl-pprint base bytestring directory filepath process + QuickCheck tasty tasty-golden tasty-hunit ]; - description = "SVG file loader and serializer"; - license = stdenv.lib.licenses.bsd3; + description = "Animation library based on SVGs"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "reanimate-svg_0_9_1_1" = callPackage + "reanimate-svg" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, hspec , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text , transformers, vector, xml @@ -194505,7 +195244,6 @@ self: { ]; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reason-export" = callPackage @@ -195338,13 +196076,13 @@ self: { }: mkDerivation { pname = "refined"; - version = "0.4.2.2"; - sha256 = "1gdfhmj8f1abxflxmqyfibz0hdaayr932f04vchygdvdb812av60"; + version = "0.4.3"; + sha256 = "1x6rz5hy6rnn46fjh20ppbkdaj3cn5bnlapbnvsw5h6s3bdic7p5"; libraryHaskellDepends = [ aeson base deepseq exceptions mtl prettyprinter QuickCheck template-haskell transformers ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ base doctest QuickCheck ]; description = "Refinement types with static and runtime checking"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -197063,16 +197801,17 @@ self: { }) {}; "releaser" = callPackage - ({ mkDerivation, base, Cabal, pretty-terminal, process, regex-pcre + ({ mkDerivation, base, Cabal, pretty-terminal, process, regex-tdfa + , regex-tdfa-text, text }: mkDerivation { pname = "releaser"; - version = "0.1.0.0"; - sha256 = "04icyx42ya7l4h5923yji0170c3xl0gg9lvcmswh7lmrg8x9gvip"; + version = "0.2.0.0"; + sha256 = "1hh4z87rc11pgapbrz0sjcy21pvgnm201b85prn09kiwcqrawz8r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal pretty-terminal process regex-pcre + base Cabal pretty-terminal process regex-tdfa regex-tdfa-text text ]; executableHaskellDepends = [ base ]; description = "Automation of Haskell package release process"; @@ -197775,8 +198514,8 @@ self: { }: mkDerivation { pname = "replace-attoparsec"; - version = "1.0.0.0"; - sha256 = "0cyaqdlhjmpmw51h8k93gi21d1wkyajd2zyzfk787kg8hby0hkzi"; + version = "1.0.1.0"; + sha256 = "12xwdaqi81ssc5536icl49bqdnc6hiss9xm4gx3m1m4nz70ivk6z"; libraryHaskellDepends = [ attoparsec base bytestring text ]; testHaskellDepends = [ attoparsec base bytestring Cabal parsers text @@ -197784,25 +198523,63 @@ self: { benchmarkHaskellDepends = [ attoparsec base bytestring criterion text ]; - description = "Stream editing with Attoparsec"; + description = "Stream edit, find-and-replace with Attoparsec parsers"; license = stdenv.lib.licenses.bsd2; }) {}; + "replace-attoparsec_1_0_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, criterion + , parsers, text + }: + mkDerivation { + pname = "replace-attoparsec"; + version = "1.0.2.0"; + sha256 = "13fri1sqvr9ldzbr7wif4fn5phjmca3pql10qzx049gyip1vfy8a"; + libraryHaskellDepends = [ attoparsec base bytestring text ]; + testHaskellDepends = [ + attoparsec base bytestring Cabal parsers text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + description = "Stream edit, find-and-replace with Attoparsec parsers"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "replace-megaparsec" = callPackage ({ mkDerivation, base, bytestring, Cabal, criterion, megaparsec , text }: mkDerivation { pname = "replace-megaparsec"; - version = "1.1.2.0"; - sha256 = "154abc29xhc8qz3ilzrpnjn3a43rbiq7b60k4agv7zmsllihb0kk"; + version = "1.1.3.0"; + sha256 = "0nh14fk3wwwli9hh2wfj02zrgcsf0hia14cx22g9qvlym53ljg50"; + libraryHaskellDepends = [ base megaparsec ]; + testHaskellDepends = [ base bytestring Cabal megaparsec text ]; + benchmarkHaskellDepends = [ + base bytestring criterion megaparsec text + ]; + description = "Stream edit, find-and-replace with Megaparsec parsers"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "replace-megaparsec_1_1_4_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, criterion, megaparsec + , text + }: + mkDerivation { + pname = "replace-megaparsec"; + version = "1.1.4.0"; + sha256 = "0mfxk03p6wwikyrra2r5zs06axl7v0da9ggv5ycd6mi4bc5hpj8r"; libraryHaskellDepends = [ base megaparsec ]; testHaskellDepends = [ base bytestring Cabal megaparsec text ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec text ]; - description = "Stream editing with parsers"; + description = "Stream edit, find-and-replace with Megaparsec parsers"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "replica" = callPackage @@ -198168,6 +198945,38 @@ self: { broken = true; }) {}; + "require_0_4_3" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, inliterate + , megaparsec, optparse-generic, tasty, tasty-hspec, text, universum + }: + mkDerivation { + pname = "require"; + version = "0.4.3"; + sha256 = "0j6dsyqx637b5p8jmk5h4b0qham0m8m74c8b8y1dywm0c5daayca"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory inliterate megaparsec optparse-generic + text universum + ]; + executableHaskellDepends = [ + base bytestring directory inliterate megaparsec optparse-generic + text universum + ]; + testHaskellDepends = [ + base bytestring directory inliterate megaparsec optparse-generic + tasty tasty-hspec text universum + ]; + benchmarkHaskellDepends = [ + base bytestring criterion directory inliterate megaparsec + optparse-generic text universum + ]; + description = "Scrap your qualified import clutter"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "rerebase" = callPackage ({ mkDerivation, rebase }: mkDerivation { @@ -199374,6 +200183,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rhine_0_5_1_1" = callPackage + ({ mkDerivation, base, containers, deepseq, dunai, free + , MonadRandom, random, time, transformers, vector-sized + }: + mkDerivation { + pname = "rhine"; + version = "0.5.1.1"; + sha256 = "1f7sgdlnjf25znhnjdcq7yibxcfnjq7cldl6z9ydmg62az839ms2"; + libraryHaskellDepends = [ + base containers deepseq dunai free MonadRandom random time + transformers vector-sized + ]; + description = "Functional Reactive Programming with type-level clocks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rhine-gloss" = callPackage ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { @@ -202295,6 +203121,30 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "safecopy_0_10_0" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, containers + , generic-data, HUnit, lens, lens-action, old-time, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, template-haskell + , text, time, transformers, vector + }: + mkDerivation { + pname = "safecopy"; + version = "0.10.0"; + sha256 = "0j5fa68symjqwphvin0nj524wnh3vmq34mlj6mfvl78by4pki0nv"; + libraryHaskellDepends = [ + array base bytestring cereal containers generic-data old-time + template-haskell text time transformers vector + ]; + testHaskellDepends = [ + array base bytestring cereal containers HUnit lens lens-action + QuickCheck quickcheck-instances tasty tasty-quickcheck + template-haskell time vector + ]; + description = "Binary serialization with version control"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safecopy-migrate" = callPackage ({ mkDerivation, base, base-prelude, cereal, containers, extra , haskell-src-meta, microlens, safecopy, template-haskell @@ -203594,6 +204444,8 @@ self: { pname = "scanner"; version = "0.3"; sha256 = "0yshznbp784d4gk2qz5jlw5ikc1s1h58h7vck2yksi4ynm3m3y57"; + revision = "1"; + editedCabalFile = "1v64k5jn70ipv2yi81b0s8lkpdd8hx08gdix0ixnpfqdpkj7pzx2"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring hspec ]; benchmarkHaskellDepends = [ @@ -203603,6 +204455,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scanner_0_3_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion + , fail, hspec, text + }: + mkDerivation { + pname = "scanner"; + version = "0.3.1"; + sha256 = "1mhqh94qra08zidqfsq0gxi83cgflqldnk9rr53haynbgmd5y82k"; + libraryHaskellDepends = [ base bytestring fail ]; + testHaskellDepends = [ base bytestring hspec ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring cereal criterion text + ]; + description = "Fast non-backtracking incremental combinator parsing for bytestrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scanner-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec, scanner }: mkDerivation { @@ -203769,8 +204639,6 @@ self: { ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "schedyield" = callPackage @@ -205283,8 +206151,8 @@ self: { }: mkDerivation { pname = "secp256k1-legacy"; - version = "0.5.4"; - sha256 = "1sm0w29iwlhd1596h4x8dcqv5jz0jk6vfc41iqikdhgbn89xv6sd"; + version = "0.5.5"; + sha256 = "1wqzv26zcbd9lxl8ifwwwnp7ikfd7rs8w784gdap963yk0k3692d"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base base16-bytestring bytestring cereal entropy mtl QuickCheck @@ -205906,14 +206774,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "semirings_0_5" = callPackage + "semirings_0_5_1" = callPackage ({ mkDerivation, base, containers, hashable, integer-gmp , unordered-containers }: mkDerivation { pname = "semirings"; - version = "0.5"; - sha256 = "1xfmb017jjlas0lq4969d1dw7wifsym8m2qnadz7bywhjl96kzxh"; + version = "0.5.1"; + sha256 = "1nrz80hsc3sx7nhd1hd17pdhdxhlvc2ngkg8jy14r2y2fblxczgd"; libraryHaskellDepends = [ base containers hashable integer-gmp unordered-containers ]; @@ -206323,8 +207191,8 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.4.0.1"; - sha256 = "1inw4agbm722zjbxi1ys73pssx76k8pg1s3cyxl5v1czqlyjxppy"; + version = "1.4.1"; + sha256 = "1162qvpaj8zs1510pkq9v6pdny51r0r5bhwnpmrv1a6c8vm723n3"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe @@ -206348,8 +207216,8 @@ self: { }: mkDerivation { pname = "sequenceTools"; - version = "1.4.0.2"; - sha256 = "1s6g5n9rb9yk2rzjc2dvmw14ncjfrf66lkla8bcacdvqwa8hl7kr"; + version = "1.4.0.4"; + sha256 = "13q9ypr4zxbxj0allkahcc4syvvmmplv2d3qj3mcz1p7704klga0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206636,6 +207504,8 @@ self: { pname = "servant"; version = "0.16.2"; sha256 = "0yzl1yklbbymlh8jdc4ncrdxkalx2z349v4msbd6wxxrxfkxbz6n"; + revision = "1"; + editedCabalFile = "0v913vjklgwyfbn7k2v70943gy4i8ja3y6crpyrg5llxkb81jpbc"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring @@ -207072,8 +207942,8 @@ self: { pname = "servant-cassava"; version = "0.10"; sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v"; - revision = "5"; - editedCabalFile = "1hidradrcdcchbr0hn9y7y1bc0i0gxzfbganyy7p2z8ip2czddvj"; + revision = "6"; + editedCabalFile = "17d6phknxh5cqslwcj3a4gfhsgm8bw4bf7mlpmfrrc6izwnm1q8v"; libraryHaskellDepends = [ base base-compat bytestring cassava http-media servant vector ]; @@ -207172,8 +208042,38 @@ self: { pname = "servant-client"; version = "0.16"; sha256 = "0641fqlvqkm5075pcgcg5q81j7jil79sjpifg1snagfisrsxifxj"; - revision = "2"; - editedCabalFile = "0xdrs79farfhw12azl9jmkwvqslassnrjqvbgz0xjnnqnb0b9l86"; + revision = "4"; + editedCabalFile = "0fa37fdas1dsgd6qkc5wzi9683l5xzzq1i705l3adiwkdfkcbjjf"; + libraryHaskellDepends = [ + base base-compat bytestring containers deepseq exceptions + http-client http-media http-types kan-extensions monad-control mtl + semigroupoids servant servant-client-core stm text time + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring entropy hspec http-api-data + http-client http-types HUnit kan-extensions markdown-unlit mtl + network QuickCheck servant servant-client-core servant-server stm + tdigest text transformers transformers-compat wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-client_0_16_0_1" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , deepseq, entropy, exceptions, hspec, hspec-discover + , http-api-data, http-client, http-media, http-types, HUnit + , kan-extensions, markdown-unlit, monad-control, mtl, network + , QuickCheck, semigroupoids, servant, servant-client-core + , servant-server, stm, tdigest, text, time, transformers + , transformers-base, transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.16.0.1"; + sha256 = "1w6rw1bdm5x8swi9dy70n86gq9v85wlgmm6pglfxqbv7bgzpql8c"; libraryHaskellDepends = [ base base-compat bytestring containers deepseq exceptions http-client http-media http-types kan-extensions monad-control mtl @@ -207189,6 +208089,7 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-client-core" = callPackage @@ -207201,8 +208102,8 @@ self: { pname = "servant-client-core"; version = "0.16"; sha256 = "0cvv9a7z6ahwjp433c4sxa9i1ifabbih63bx71r9gvqzl85pb3dz"; - revision = "1"; - editedCabalFile = "1hanl8sz14z11441ng8vkzpxrl6igk3xzp6fcm6wg59fsb30fh29"; + revision = "2"; + editedCabalFile = "172diqnz0ddvlfznfjk0k1l02f1mb11i1dkzr6rizdmhb66qpqil"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring containers deepseq exceptions free http-media http-types network-uri safe @@ -207246,8 +208147,8 @@ self: { pname = "servant-conduit"; version = "0.15"; sha256 = "0mpnkqcls4mrxfd3ksy53k7vvm0hildj21b8mdy53z993wq1blfz"; - revision = "1"; - editedCabalFile = "0l6pv8bqca88k8wjx7qczagka6l99zd7xyz1ma95004665gc56x6"; + revision = "2"; + editedCabalFile = "1m5h5kwc9bjpc7ppdsxx8rr4906bl08np1kawzfvpr7qqy4s8j4q"; libraryHaskellDepends = [ base bytestring conduit mtl resourcet servant unliftio-core ]; @@ -207376,6 +208277,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-docs_0_11_4" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , case-insensitive, hashable, http-media, http-types, lens, servant + , string-conversions, tasty, tasty-golden, tasty-hunit, text + , transformers, universe-base, unordered-containers + }: + mkDerivation { + pname = "servant-docs"; + version = "0.11.4"; + sha256 = "1z35rr55mxwi761pmqy176liglms443ynk0sjh8v8hcyfciymq0d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring case-insensitive + hashable http-media http-types lens servant string-conversions text + universe-base unordered-containers + ]; + executableHaskellDepends = [ + aeson base lens servant string-conversions text + ]; + testHaskellDepends = [ + aeson base base-compat lens servant string-conversions tasty + tasty-golden tasty-hunit transformers + ]; + description = "generate API docs for your servant webservice"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-ede" = callPackage ({ mkDerivation, aeson, base, bytestring, ede, either, filepath , http-media, http-types, semigroups, servant, servant-server, text @@ -207447,6 +208377,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-elm_0_7_0" = callPackage + ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec + , HUnit, lens, servant, servant-client, servant-foreign, text + , wl-pprint-text + }: + mkDerivation { + pname = "servant-elm"; + version = "0.7.0"; + sha256 = "1nnxz61hvrhjkkljpv445ib17ncpb0sp4hdaf7mqjrffr2yb155l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base directory elm-bridge lens servant servant-foreign text + wl-pprint-text + ]; + testHaskellDepends = [ + aeson base Diff elm-bridge hspec HUnit servant servant-client text + ]; + description = "Automatically derive Elm functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-examples" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, either , http-types, js-jquery, lucid, random, servant, servant-client @@ -207525,8 +208478,8 @@ self: { pname = "servant-foreign"; version = "0.15"; sha256 = "0wxx9drycam46vcmf3kxp2lq1drlpxb1b6fxbxyb6dd7349py6gi"; - revision = "1"; - editedCabalFile = "1amvhixa0zwjipmv6iv97pfzlr83p0b0kvxif2d2l7akcdgd2ddz"; + revision = "2"; + editedCabalFile = "0axz78g0vhasq5cvqg1lq0b2qanmb768f1bvzbfx58rn6arwflnj"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -207710,6 +208663,41 @@ self: { broken = true; }) {}; + "servant-http-streams_0_16_0_1" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring + , case-insensitive, containers, deepseq, entropy, exceptions, hspec + , hspec-discover, http-api-data, http-common, http-media + , http-streams, http-types, HUnit, io-streams, kan-extensions + , markdown-unlit, monad-control, mtl, network, QuickCheck + , semigroupoids, servant, servant-client-core, servant-server, stm + , tdigest, text, time, transformers, transformers-base + , transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-http-streams"; + version = "0.16.0.1"; + sha256 = "0nfwi8bnafv78lzxxi56i9pyk2rj0vkl5x193fixirw4fjvia3zg"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive containers deepseq + exceptions http-common http-media http-streams http-types + io-streams kan-extensions monad-control mtl semigroupoids servant + servant-client-core text time transformers transformers-base + transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring deepseq entropy hspec + http-api-data http-streams http-types HUnit kan-extensions + markdown-unlit mtl network QuickCheck servant servant-client-core + servant-server stm tdigest text transformers transformers-compat + wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "servant-http2-client" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring , case-insensitive, containers, data-default-class, exceptions @@ -207783,8 +208771,8 @@ self: { pname = "servant-js"; version = "0.9.4"; sha256 = "041wigqgn5ygcs49ndc39rk66j5bcvgpihshxk678jk470ysfszq"; - revision = "1"; - editedCabalFile = "09nd1wlpaj20pyp6jzp2hsnyl02lvbi5vvvymhfhqf3rjxxpnyyr"; + revision = "2"; + editedCabalFile = "1x7f0dbqgzlwzmr20l6hln4s86kblak4j9h0p9igcqibmplc70zn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207832,8 +208820,8 @@ self: { pname = "servant-lucid"; version = "0.9"; sha256 = "1xamwcijd03cynml5c2hr577qairybyrqd90ixyb1a94lql6agbf"; - revision = "2"; - editedCabalFile = "17p1xxzmr3ya0k4cy9n5mqf356gm35jdcm8mw1cxg2v80sd6nr4j"; + revision = "3"; + editedCabalFile = "10j29y9zjflh88csvn7zi4pm8jr9dxsglin94wypjrhcwy7yj1ic"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -207849,8 +208837,8 @@ self: { pname = "servant-machines"; version = "0.15"; sha256 = "137c0svvwvkh3ad8cc5q5vygci3c5951hbwlhk09znqaqycck35i"; - revision = "2"; - editedCabalFile = "0x7dw8mcvgaag53ai5c9nagc5dik4r06wxdhvp72q8f09pvabxxf"; + revision = "3"; + editedCabalFile = "10ifc1r10lmzvrxa79389bz5ydcmacyz8ga4x63fw7r1rbfml0jz"; libraryHaskellDepends = [ base bytestring machines mtl servant ]; testHaskellDepends = [ base base-compat bytestring http-client http-media machines servant @@ -207908,8 +208896,8 @@ self: { pname = "servant-mock"; version = "0.8.5"; sha256 = "10bvqwyp5ca53k47a1xfbihdv22gjlj97spr1bn5plf5vlk70m5f"; - revision = "2"; - editedCabalFile = "0269d0yr8sa043wc2ymg3fv60c9pr4jxfy9sar2qqccvngpa1vf5"; + revision = "3"; + editedCabalFile = "1137vz9xm8iwj6x8h1q1yify6c1lahy0dxj6hpbhgi4s3mqkhm2g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207938,8 +208926,8 @@ self: { pname = "servant-multipart"; version = "0.11.4"; sha256 = "0vcwrdzj1xyjg11yvfcds9rql3gcwgdcdq4z085g44fpabjxj50s"; - revision = "1"; - editedCabalFile = "0sf5vmzdcfzy01d65dd2f5l4k67znmjvp86d4xgkrmqsqmgxcgpg"; + revision = "2"; + editedCabalFile = "0pr0crsxc9m6p06m5qk39gzvqnj3hcxql0almpjfag0ifpviwkgk"; libraryHaskellDepends = [ base bytestring directory http-media lens resourcet servant servant-docs servant-foreign servant-server text transformers wai @@ -208069,8 +209057,8 @@ self: { pname = "servant-pipes"; version = "0.15"; sha256 = "04ypy9vjrfggrk7dg3sxwj9nav50v85vpr5mnp5r2c9ka6xn4v90"; - revision = "1"; - editedCabalFile = "1q4w4fnvpi4m62yhv37pcg5sj21m4s02glsa5q56vc51bjbx8xi4"; + revision = "2"; + editedCabalFile = "0c3nyj2iwmhd3kmyv4q0ilzcwxr2dsg5lxvysbhh8048q90bm1nw"; libraryHaskellDepends = [ base bytestring monad-control mtl pipes pipes-safe servant ]; @@ -208083,6 +209071,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-pipes_0_15_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, http-client + , http-media, monad-control, mtl, pipes, pipes-bytestring + , pipes-safe, servant, servant-client, servant-server, wai, warp + }: + mkDerivation { + pname = "servant-pipes"; + version = "0.15.1"; + sha256 = "1r2n7f8x7adl117zlswf4ji5yxib2v80wh7wbhwklvd86dbzyrby"; + libraryHaskellDepends = [ + base bytestring monad-control mtl pipes pipes-safe servant + ]; + testHaskellDepends = [ + base base-compat bytestring http-client http-media pipes + pipes-bytestring pipes-safe servant servant-client servant-server + wai warp + ]; + description = "Servant Stream support for pipes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-pool" = callPackage ({ mkDerivation, base, resource-pool, servant, time }: mkDerivation { @@ -208221,6 +209231,8 @@ self: { pname = "servant-quickcheck"; version = "0.0.7.4"; sha256 = "1z47fgzdwfqb0byr8wa0s9n3g8hcbf112nbgaifm0zmxx6w4jlcf"; + revision = "1"; + editedCabalFile = "1k2qcfg8vh8nj3j621hsi09q3lj6p9ahz7rgz89psm79j9ks10d9"; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -208395,6 +209407,8 @@ self: { pname = "servant-server"; version = "0.16.2"; sha256 = "1l4kgjg5z775bi76hy7cb70qwvmkai4rxqkgp0ildsjgsvf8qb80"; + revision = "1"; + editedCabalFile = "017aw6wyhi5g7zkk59yj44r1n02zzin2w9wdskwqys7iqkvnvczn"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -208530,8 +209544,8 @@ self: { }: mkDerivation { pname = "servant-static-th"; - version = "0.2.2.0"; - sha256 = "06vl8a9h5gzmfazj390fmxp6p4bwfdszqjdwnpivv03m80lh3v2v"; + version = "0.2.2.1"; + sha256 = "15i5sgi30m5y8capc10k4hsaldzglvmknfq6sr1mrrzc9z9c3lrm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208680,6 +209694,8 @@ self: { pname = "servant-swagger"; version = "1.1.7.1"; sha256 = "0vdjvn5bsd26q8wx1qdwn7vdfnd9jk8m9jzzm251gyn1ijxv8ild"; + revision = "1"; + editedCabalFile = "1wymxb7vi55rhk4kfbrxxv9dsxlxlam70mi9ldwnxp4xdf91ja2p"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -208722,6 +209738,8 @@ self: { pname = "servant-swagger-ui"; version = "0.3.4.3.22.2"; sha256 = "0ig05xzh4iybnwzh7bx8i7a337j0xfmsxbmfi9iaiz4g6f9s5clm"; + revision = "1"; + editedCabalFile = "084cqli1d30vz6mrj6l9cxlwmigqqiydkxdq90xvz3ffhs5cyq8p"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -208739,6 +209757,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.3"; sha256 = "0gpdjnclbjjr6gwc0gyx1d4w06cjf6z5b2ngjfcgbn885wqllwh3"; + revision = "1"; + editedCabalFile = "07i6bcy0z1xa2m7cdaq37wi20plghrppbd1v58a1g23g54mf0dcm"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -208756,6 +209776,8 @@ self: { pname = "servant-swagger-ui-jensoleg"; version = "0.3.3"; sha256 = "02zwymqxq54xwc8wmzhbcfgx9plvk0n4kp1907sbl98mhh2frwrw"; + revision = "1"; + editedCabalFile = "0876wqw08fd39k4hc1739gf727ryq2w2w3sxvc89hp31zc2hm0fi"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -208772,6 +209794,8 @@ self: { pname = "servant-swagger-ui-redoc"; version = "0.3.3.1.22.2"; sha256 = "0qkh4h5ijhizlnps79gg75jy533rpc1vcw7v7yxika585srndim1"; + revision = "1"; + editedCabalFile = "1qi389fjrlnqbsm7kw6rbyga19mw9286g5ibavi888jqyllpmi8f"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -208883,8 +209907,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.1"; sha256 = "00gnbdlcq6cvmhsga8h0csd35pnfib038rqlhm445l4wa0cp8m01"; - revision = "2"; - editedCabalFile = "0scpm5dshnb7izn1xx8q3xm1m5f52y1s7nzgp7sa7zcv3pp6n7lw"; + revision = "3"; + editedCabalFile = "1qq4sg2kmdh45f4cjf36ldkdmhzryd5npy5yp558snbks0358wgs"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -210408,8 +211432,8 @@ self: { }: mkDerivation { pname = "shakespeare-sass"; - version = "0.1.0.3"; - sha256 = "169jkazw4567hcm2gnlpa6jgkz7bn5b83nr0fkqf2bm72zq2g4hl"; + version = "0.1.4.1"; + sha256 = "0y4z898dkmkmvfv1lhsq5rgsda5dz6ginvp62hmshbml8yg8hps7"; libraryHaskellDepends = [ base hsass shakespeare template-haskell yesod yesod-core ]; @@ -210975,8 +211999,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.7.0.5"; - sha256 = "119b9rvvdsw1al0i4lqa25z7ykwwqi46xz22az1b8fi3xiijprs3"; + version = "0.7.0.6"; + sha256 = "0whcynzjsm0agq456kv6dn6d4gk1k3vhvnbwvjar4sbn0yiz4if1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211833,8 +212857,8 @@ self: { ({ mkDerivation, base, optparse-applicative }: mkDerivation { pname = "simple-cmd-args"; - version = "0.1.2"; - sha256 = "1vj5yvqvch8ckf1jzp77d7l6g89wxzb8ngqn6iw3m215f8xl77p8"; + version = "0.1.3"; + sha256 = "09cp664flacsq565pqva7vsqcq5ddndck4rh74y6n2j3xzl24a2k"; libraryHaskellDepends = [ base optparse-applicative ]; description = "Simple command args parsing and execution"; license = stdenv.lib.licenses.bsd3; @@ -213147,6 +214171,32 @@ self: { broken = true; }) {}; + "sized-grid_0_2_0_1" = callPackage + ({ mkDerivation, adjunctions, aeson, ansi-terminal, base, comonad + , constraints, distributive, generics-sop, HUnit, lens + , markdown-unlit, mtl, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, vector, vector-space + }: + mkDerivation { + pname = "sized-grid"; + version = "0.2.0.1"; + sha256 = "15js3x76bz9p38bxk355kpp8aq0ns68yxqnc64bp956wqss69vgi"; + libraryHaskellDepends = [ + adjunctions aeson base comonad constraints distributive + generics-sop lens mtl random vector vector-space + ]; + testHaskellDepends = [ + adjunctions aeson ansi-terminal base comonad distributive + generics-sop HUnit lens markdown-unlit QuickCheck tasty tasty-hunit + tasty-quickcheck vector vector-space + ]; + testToolDepends = [ markdown-unlit ]; + description = "Multidimensional grids with sized specified at compile time"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sized-types" = callPackage ({ mkDerivation, array, base, base-compat, containers, singletons }: @@ -213754,21 +214804,18 @@ self: { }) {}; "slick" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers, lens - , lens-aeson, mustache, pandoc, shake, text, time + ({ mkDerivation, aeson, base, bytestring, directory, extra + , mustache, pandoc, shake, text, unordered-containers }: mkDerivation { pname = "slick"; - version = "0.2.0.0"; - sha256 = "0pxbrqykf11nrdc6zyjxvfc57dfajp5nm4qpqyk26l2jh1gaklz7"; + version = "1.0.0.0"; + sha256 = "11wzfgxx5cjdkwgs23afidvjck8q8vs4p2qm7g9f2zxiq6706y89"; libraryHaskellDepends = [ - aeson base binary bytestring containers lens lens-aeson mustache - pandoc shake text time - ]; - testHaskellDepends = [ - aeson base binary bytestring containers lens lens-aeson mustache - pandoc shake text time + aeson base bytestring directory extra mustache pandoc shake text + unordered-containers ]; + description = "A quick & easy static site builder built with shake and pandoc"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -213928,6 +214975,37 @@ self: { broken = true; }) {}; + "slynx" = callPackage + ({ mkDerivation, async, base, bytestring, containers + , data-memocombinators, elynx-seq, elynx-tools, elynx-tree, hmatrix + , integration, lens, math-functions, matrices, megaparsec + , monad-logger, mwc-random, optparse-applicative, parallel + , primitive, statistics, text, transformers, vector + , vector-th-unbox, word8 + }: + mkDerivation { + pname = "slynx"; + version = "0.0.1"; + sha256 = "1wwzgslhbdn5q5sd9706sbz2zjqk6dhch72jb43cqbfh4jkfr8r1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers data-memocombinators elynx-seq + elynx-tools elynx-tree hmatrix integration lens math-functions + matrices megaparsec monad-logger mwc-random optparse-applicative + parallel primitive statistics text transformers vector + vector-th-unbox word8 + ]; + executableHaskellDepends = [ + async base bytestring containers data-memocombinators elynx-seq + elynx-tools hmatrix integration lens math-functions matrices + megaparsec monad-logger mwc-random optparse-applicative parallel + primitive statistics text transformers vector vector-th-unbox word8 + ]; + description = "Handle molecular sequences"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "small-bytearray-builder" = callPackage ({ mkDerivation, base, byteslice, bytestring, gauge , natural-arithmetic, primitive, primitive-offset, QuickCheck @@ -216654,6 +217732,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "some" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "some"; + version = "1.0.0.3"; + sha256 = "0c2y51gw94faafa0jvb3awnsvj89saan4ryy0d5dwivp0zp9gg64"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base ]; + description = "Existential type: Some"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sonic-visualiser" = callPackage ({ mkDerivation, array, base, bytestring, bzlib, containers, mtl , pretty, utf8-string, xml @@ -217273,8 +218363,8 @@ self: { }: mkDerivation { pname = "sparse-tensor"; - version = "0.2.1.1"; - sha256 = "1bjia89as14i2cif9nf7rsifazg305l7cl040gb7xbi3szlc621y"; + version = "0.2.1.2"; + sha256 = "0rkq0la7l12x9ck96ra8inlz81fcj5z8sxa90sgd082jhrq7jq94"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ ad base bytestring cereal containers deepseq ghc-typelits-knownnat @@ -218490,6 +219580,8 @@ self: { pname = "sqlite-simple"; version = "0.4.16.0"; sha256 = "1pih3nbfczyb91smci2dg9p1wvjsqiv5f5y97q6vqzlns64a3lk0"; + revision = "1"; + editedCabalFile = "123bykwxl3p6918bjxv073ksf8k1hn6s0rlph934h18400n51fdf"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers direct-sqlite Only semigroups template-haskell text time @@ -220339,6 +221431,34 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "statistics_0_15_1_1" = callPackage + ({ mkDerivation, aeson, async, base, base-orphans, binary + , data-default-class, deepseq, dense-linear-algebra, erf, HUnit + , ieee754, math-functions, monad-par, mwc-random, primitive + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-algorithms + , vector-binary-instances, vector-th-unbox + }: + mkDerivation { + pname = "statistics"; + version = "0.15.1.1"; + sha256 = "015rn74f1glii26j4b2fh1fc63xvxzrh2xckiancz48kc8jdzabj"; + libraryHaskellDepends = [ + aeson async base base-orphans binary data-default-class deepseq + dense-linear-algebra math-functions monad-par mwc-random primitive + vector vector-algorithms vector-binary-instances vector-th-unbox + ]; + testHaskellDepends = [ + aeson base binary dense-linear-algebra erf HUnit ieee754 + math-functions mwc-random primitive QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 vector + vector-algorithms + ]; + description = "A library of statistical types, data, and functions"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "statistics-dirichlet" = callPackage ({ mkDerivation, base, deepseq, hmatrix-special , nonlinear-optimization, vector @@ -222068,6 +223188,22 @@ self: { broken = true; }) {}; + "streaming-events" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, http-client + , streaming, streaming-attoparsec, streaming-bytestring, wai-extra + }: + mkDerivation { + pname = "streaming-events"; + version = "1.0.0"; + sha256 = "12rbw1gvcfl2svlsm7x1v01j9bk0fdh6x7j1c0v6a9xjmwq2bgv6"; + libraryHaskellDepends = [ + attoparsec base binary bytestring http-client streaming + streaming-attoparsec streaming-bytestring wai-extra + ]; + description = "Client-side consumption of a ServerEvent"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streaming-eversion" = callPackage ({ mkDerivation, base, doctest, foldl, microlens, pipes , pipes-bytestring, pipes-text, streaming, tasty, tasty-hunit @@ -222548,23 +223684,6 @@ self: { }) {}; "strict-list" = callPackage - ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase - , semigroupoids, tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "strict-list"; - version = "0.1.4"; - sha256 = "0jh158yjly9p54fgbxjxspdnicryik1ax3mlc6i7351v564yc7cz"; - libraryHaskellDepends = [ base semigroupoids ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Strict linked list"; - license = stdenv.lib.licenses.mit; - }) {}; - - "strict-list_0_1_5" = callPackage ({ mkDerivation, base, hashable, QuickCheck, quickcheck-instances , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck }: @@ -222579,7 +223698,6 @@ self: { ]; description = "Strict linked list"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-tuple" = callPackage @@ -223931,8 +225049,8 @@ self: { pname = "summoner"; version = "1.3.0.1"; sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s"; - revision = "4"; - editedCabalFile = "1vjk95n2wqybigy8p55gs7qkiv5v1lwf8qmri1f9bk29599sh74k"; + revision = "5"; + editedCabalFile = "1fy1d12rq8cqafyr0yvwsnslmmvdhpjigjv2ppvhs4ihgghrrij3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224827,6 +225945,8 @@ self: { pname = "swagger2"; version = "2.4"; sha256 = "0m08l7nz53h6ix6xgzynnh3cf6l61437da9swdbsz8avx0rq2wci"; + revision = "1"; + editedCabalFile = "02qlfsgqc5jmc616xn30hn213dwhsqlkrrk2pa6774f0dcn8rpiz"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring containers cookie @@ -225352,8 +226472,8 @@ self: { }: mkDerivation { pname = "symbiote"; - version = "0.0.0"; - sha256 = "1p38lblwd8cxbypnqy7f71ab2s7ia00xv6ysy24lh9xaqns43ad4"; + version = "0.0.0.1"; + sha256 = "06341y9bfr6h9sf7llxm2zc36q0zabn2ildp0gyskspybibl1sdy"; libraryHaskellDepends = [ aeson async base bytestring cereal containers monad-control mtl QuickCheck stm text @@ -226519,8 +227639,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.8.0.4"; - sha256 = "160ns7fd3xivlfirir7lk0ghv1f63b6cyfvnk8p2cn3jjfdp9xb3"; + version = "0.8.0.5"; + sha256 = "1gvajqjw5i2l97zcx607xlc143xq1sli5i1321msgi585h7ksnd4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227852,6 +228972,8 @@ self: { pname = "tasty-hedgehog"; version = "1.0.0.1"; sha256 = "1mbg5q0c0xfrk4npfj60pi693igb7r5l78x6xf9fk2jglw0nmxhz"; + revision = "1"; + editedCabalFile = "1n6797fm8swyrk8cw7zxz593gq82wx8dayvm204rmgcz75bslcpn"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -231978,6 +233100,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "th-printf_0_7" = callPackage + ({ mkDerivation, base, charset, containers, dlist, hspec, HUnit + , integer-logarithms, microlens-platform, mtl, parsec, QuickCheck + , semigroups, template-haskell, text, th-lift, transformers + }: + mkDerivation { + pname = "th-printf"; + version = "0.7"; + sha256 = "1f9lw0scm2bpnhmhgvywzphxn85ln3xcn8cjyvy8h4cn2ymw4aza"; + libraryHaskellDepends = [ + base charset containers dlist integer-logarithms microlens-platform + mtl parsec semigroups template-haskell text th-lift transformers + ]; + testHaskellDepends = [ + base hspec HUnit QuickCheck template-haskell text + ]; + description = "Quasiquoters for printf"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-reify-compat" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -232813,6 +233956,24 @@ self: { broken = true; }) {}; + "thumbnail-polish" = callPackage + ({ mkDerivation, base, bytestring, data-default, directory + , filepath, friday, friday-devil, nonce, resourcet, text + }: + mkDerivation { + pname = "thumbnail-polish"; + version = "0.0.1.0"; + sha256 = "09b5689anqbll8x7mwcwbcm5qwsxvayglfk3k3p55jwp142z75ir"; + libraryHaskellDepends = [ + base bytestring data-default directory filepath friday friday-devil + nonce resourcet text + ]; + description = "Image thumbnail creation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "thyme" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , containers, cpphs, criterion, deepseq, directory, filepath, mtl @@ -232889,6 +234050,8 @@ self: { pname = "tibetan-utils"; version = "0.1.1.10"; sha256 = "11bzcan2vfhdz6lwfvfgiyycqf30p4kdkzn47pm4ydr6bbpz8aia"; + revision = "1"; + editedCabalFile = "0gm271p3m3y0x9lfi5yviznqfr65f0if553z6h977dqk3f3psyfd"; libraryHaskellDepends = [ base composition-prelude megaparsec text ]; @@ -234484,6 +235647,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tlynx" = callPackage + ({ mkDerivation, base, bytestring, containers, elynx-seq + , elynx-tools, elynx-tree, lifted-async, math-functions, megaparsec + , monad-logger, mwc-random, optparse-applicative, parallel + , primitive, QuickCheck, quickcheck-instances, statistics, text + , transformers, vector + }: + mkDerivation { + pname = "tlynx"; + version = "0.0.1"; + sha256 = "0acgwn0czk3kpsnsrlkmxrm7cc0mv6wwx75nr5v3hc1ir1hais6n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers elynx-seq elynx-tools elynx-tree + lifted-async math-functions megaparsec monad-logger mwc-random + optparse-applicative parallel primitive QuickCheck + quickcheck-instances statistics text transformers vector + ]; + executableHaskellDepends = [ + base bytestring containers elynx-tools elynx-tree lifted-async + math-functions megaparsec monad-logger mwc-random + optparse-applicative parallel primitive QuickCheck + quickcheck-instances statistics text transformers vector + ]; + description = "Handle phylogenetic trees"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -236692,18 +237884,18 @@ self: { "tree-sitter" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, fused-effects, hedgehog, hspec, split, template-haskell - , text, unordered-containers + , filepath, fused-effects, hedgehog, split, template-haskell, text + , unordered-containers }: mkDerivation { pname = "tree-sitter"; - version = "0.2.0.0"; - sha256 = "03xdyvmnpjswh0rkn718n1w8kqvly86s6k3cwqgb6r1ygd6kqmim"; + version = "0.3.0.0"; + sha256 = "1ai587a8m67j0rjg1gbhxnv1kl4awpcr7jvh4qnlvx91g7s1gq2g"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath fused-effects - hedgehog split template-haskell text unordered-containers + split template-haskell text unordered-containers ]; - testHaskellDepends = [ base hedgehog hspec ]; + testHaskellDepends = [ base hedgehog ]; description = "Unstable bindings for the tree-sitter parsing library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -236714,10 +237906,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-go"; - version = "0.1.0.0"; - sha256 = "0lpj6sphc8gfyy8yz4pkrykwvrly3vdhy7j9n7jiacjsxnbw33ag"; - revision = "1"; - editedCabalFile = "04cq0vlwk4b0kyjsdc8aykm2m173wxzlvm3pjwfshcg2d5kqcn8a"; + version = "0.2.0.0"; + sha256 = "1yrhn025rdllfcmlcaiz6idxhxqh02qjpw71dm3zynmnmgmpqcc0"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for Go"; @@ -236730,10 +237920,10 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-haskell"; - version = "0.1.0.0"; - sha256 = "0jglvy6p4xwdwpk7jn9sh83j0zv51crvzfc45l10s8lflprydk1m"; + version = "0.2.0.0"; + sha256 = "0cds6xmps88vx3x7ifkpjbbbgvnbc22hxam6qdwy2m1njbff3wad"; revision = "1"; - editedCabalFile = "0326iz5r9bz4qsmqpiih1h28hbr10lhfy810b4p1bwianj7735bp"; + editedCabalFile = "07kgsp70bwggcnxh9229dvbfysc9s4ykzir4973pn02qs5l7kb6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base template-haskell tree-sitter ]; @@ -236748,10 +237938,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-java"; - version = "0.1.0.0"; - sha256 = "1npa7i8c24hb0ds52cphfhn5cw087f8iq5w56x5wsjkvm531zblr"; - revision = "1"; - editedCabalFile = "07b2pwnfn2smaq4x9zhh721r2vqf8ipcgr3m19s9bnsyd7pbqyiy"; + version = "0.2.0.0"; + sha256 = "1gayg7ln4iy56a4pl3dqrl2iq689b1a8z2n59dnrhmzhq87lzx7y"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for Java"; @@ -236764,10 +237952,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-json"; - version = "0.1.0.0"; - sha256 = "0agmr5nj4rjdlwcf64ijjwbmkpgl10gbgg26v8bpnx84cxhfjpa3"; - revision = "1"; - editedCabalFile = "14gyys09392bf46vnhv4skc817ghka0bbqzrzr6lamaszk9a02ax"; + version = "0.2.0.0"; + sha256 = "0x30pwmganjabzkgqgrkk249r8v4frag9ww64j4sfq6r2vbfc7l3"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for JSON"; @@ -236780,8 +237966,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-php"; - version = "0.1.0.1"; - sha256 = "1wbslim9ps3pf29445cxjr5kb4haidb43zl3a87pk5gfbr2wj0r0"; + version = "0.2.0.0"; + sha256 = "0wdyppjp879wb3m73kczsa78c0lyqvpnkvsh13bh22vw66jypj6x"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for PHP"; @@ -236796,8 +237982,8 @@ self: { }: mkDerivation { pname = "tree-sitter-python"; - version = "0.2.0.0"; - sha256 = "1grkz8i3d37cci1w4i1lvdr2bjp7ddhq1fbyf240132rbhx67pg8"; + version = "0.4.0.0"; + sha256 = "02i12ys845j4n0j7a1qpdlbx9ia51m7ab9lhk7d4028ysx82crn9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base directory filepath template-haskell tree-sitter @@ -236814,10 +238000,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-ruby"; - version = "0.1.0.0"; - sha256 = "1rcaqib1ly4p54vqwm2mivijqirc031w18hgkccrnyv97yxrbhw9"; - revision = "1"; - editedCabalFile = "0vwhd6g77s0y0wxflsfvhxcb4hg527nm0h92xxkxk3f50rf2rp0z"; + version = "0.2.0.0"; + sha256 = "0n2ls3mkinqv0h2h05pmi8scmgr70bpg3pdg9wnid1gdpcwn07qx"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for Ruby"; @@ -236830,10 +238014,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-tsx"; - version = "0.1.0.0"; - sha256 = "0jsc5kx5dw4b686dfs7n3vdafyg8mpf94cq2mscwmcyv9w1f3gma"; - revision = "1"; - editedCabalFile = "0hfghgxa138m4krml12yf9s3zqnad14ryynzmyqdwb9j25302hb6"; + version = "0.2.0.0"; + sha256 = "16ql8b2dcp461182rsj2fdgz3z82jh351n436hl61jfja8dc15m8"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for TSX"; @@ -236846,10 +238028,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-typescript"; - version = "0.1.0.0"; - sha256 = "1mpk1vhahbva8733anx624vl66fg3h6l9lsby87kf98yrp55ycbn"; - revision = "1"; - editedCabalFile = "0ahjxiz4jgym12490xmh2vsyvxly5gza01aasxblncf1h2q1nggi"; + version = "0.2.0.0"; + sha256 = "0pcxxgqz0w58fnfy1cbqwj7mmqj8nnkm2rkpp6h6agawsiswi8kz"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for TypeScript"; @@ -237854,8 +239034,8 @@ self: { ({ mkDerivation, base, type-combinators }: mkDerivation { pname = "tuple-ops"; - version = "0.0.0.2"; - sha256 = "05hmw9s4bync4j9sr8cs9nknkgpzwqd55aiw5s3iax4qnbxsccyp"; + version = "0.0.0.3"; + sha256 = "09993bfndv2iljq6sspihysv22d2f8g0lar03p7ghiyp81m6j0ax"; libraryHaskellDepends = [ base type-combinators ]; description = "various operations on n-ary tuples via GHC.Generics"; license = stdenv.lib.licenses.bsd3; @@ -238851,6 +240031,8 @@ self: { pname = "type-combinators"; version = "0.2.4.3"; sha256 = "1xip4gav1fn3ip62mrlbr7p6i1254fa1q542cmp6ffzm55lwn30z"; + revision = "1"; + editedCabalFile = "1m975zq2mxlzk5h4nzrkaxjx5w79p3ws3yli3m6cn3245pjygv5w"; libraryHaskellDepends = [ base ]; description = "A collection of data types for type-level programming"; license = stdenv.lib.licenses.bsd3; @@ -240600,8 +241782,8 @@ self: { }: mkDerivation { pname = "unbound-kind-generics"; - version = "0.2.0.0"; - sha256 = "1hn78dixgd1p0pabh7pg0c7q607irs68vs3ggay8i1s72nc9lvj8"; + version = "0.2.1.0"; + sha256 = "01xfgjgjnv302dy4w7c8z727ppfr30f1h8y0vhxiy296rzzkdwfm"; libraryHaskellDepends = [ base kind-generics kind-generics-th unbound-generics ]; @@ -241542,10 +242724,8 @@ self: { }: mkDerivation { pname = "universe"; - version = "1.1"; - sha256 = "0zghqcv6jyl9x3qfmbnqyfvr4pkf3m6lil0vg66m16xlrgz68hds"; - revision = "1"; - editedCabalFile = "0639gsf8irhpgcp69lq9l7987lsh4wnw3z9ai0dqrvx5ixpg3k5h"; + version = "1.1.1"; + sha256 = "0jm5wi5blc21jn5hfgmx13ra006dc08dvl1sx7ciq8id87kwvxzg"; libraryHaskellDepends = [ universe-base universe-dependent-sum universe-instances-extended universe-reverse-instances @@ -241554,17 +242734,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "universe_1_1_1" = callPackage - ({ mkDerivation, universe-base, universe-dependent-sum - , universe-instances-extended, universe-reverse-instances + "universe_1_2" = callPackage + ({ mkDerivation, universe-base, universe-instances-extended + , universe-reverse-instances, universe-some }: mkDerivation { pname = "universe"; - version = "1.1.1"; - sha256 = "0jm5wi5blc21jn5hfgmx13ra006dc08dvl1sx7ciq8id87kwvxzg"; + version = "1.2"; + sha256 = "0l8g583pgbklxgv7fjb1bdhf1a09wmj8fc59siknqwlankln84qs"; libraryHaskellDepends = [ - universe-base universe-dependent-sum universe-instances-extended - universe-reverse-instances + universe-base universe-instances-extended + universe-reverse-instances universe-some ]; description = "A class for finite and recursively enumerable types"; license = stdenv.lib.licenses.bsd3; @@ -241607,6 +242787,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe-dependent-sum_1_2" = callPackage + ({ mkDerivation, base, dependent-sum, some, universe-base + , universe-some + }: + mkDerivation { + pname = "universe-dependent-sum"; + version = "1.2"; + sha256 = "1xjw6mhlj1vyw6m4b4j0k81p86hls9031sfv59zgiq5y0ngm1f07"; + libraryHaskellDepends = [ + base dependent-sum some universe-base universe-some + ]; + description = "Universe instances for types from dependent-sum"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "universe-instances-base" = callPackage ({ mkDerivation, base, universe-base }: mkDerivation { @@ -241621,19 +242817,6 @@ self: { }) {}; "universe-instances-extended" = callPackage - ({ mkDerivation, adjunctions, base, comonad, universe-base }: - mkDerivation { - pname = "universe-instances-extended"; - version = "1.1"; - sha256 = "12ads0n5md27wznrv7ah668ip2pp3gryn8d6my74kyhsz6g2fn5q"; - revision = "1"; - editedCabalFile = "02267na4xac77q4rnsy53h8nh0gfcmjzkb89qmi4qmvpps8h15y5"; - libraryHaskellDepends = [ adjunctions base comonad universe-base ]; - description = "Universe instances for types from selected extra packages"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "universe-instances-extended_1_1_1" = callPackage ({ mkDerivation, adjunctions, base, comonad, containers , contravariant, universe-base }: @@ -241646,7 +242829,6 @@ self: { ]; description = "Universe instances for types from selected extra packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "universe-instances-trans" = callPackage @@ -241675,6 +242857,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "universe-some" = callPackage + ({ mkDerivation, base, some, template-haskell, th-abstraction + , transformers, universe-base + }: + mkDerivation { + pname = "universe-some"; + version = "1.2"; + sha256 = "1c9pdk682xdzscq77c006x052c9jizpgja3xk0ym8n421h0k8zlh"; + libraryHaskellDepends = [ + base some template-haskell th-abstraction transformers + universe-base + ]; + testHaskellDepends = [ base some template-haskell universe-base ]; + description = "Universe instances for Some from some"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "universe-th" = callPackage ({ mkDerivation, base, checkers, composition, DebugTraceHelpers , HUnit, mtl, QuickCheck, template-haskell, test-framework @@ -242578,17 +243777,15 @@ self: { }) {}; "urbit-hob" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, murmur3 - , text + ({ mkDerivation, base, bytestring, hspec, hspec-core, murmur3 + , QuickCheck, text, vector }: mkDerivation { pname = "urbit-hob"; - version = "0.1.0"; - sha256 = "01mrj3irlsqfxvswm00k893n6wybc6wxcqddd645wb9q5mpzdsqi"; - libraryHaskellDepends = [ - base bytestring cereal containers murmur3 text - ]; - testHaskellDepends = [ base ]; + version = "0.2.0"; + sha256 = "1wyvlwhc8pv4iv2dgkl5a7vz8pyykp42fmsr3ar08q58y7k269fg"; + libraryHaskellDepends = [ base bytestring murmur3 text vector ]; + testHaskellDepends = [ base hspec hspec-core QuickCheck text ]; description = "Hoon-style atom manipulation and printing functions"; license = stdenv.lib.licenses.mit; }) {}; @@ -244425,19 +245622,25 @@ self: { }) {}; "varying" = callPackage - ({ mkDerivation, base, contravariant, criterion, hspec, QuickCheck - , time, transformers + ({ mkDerivation, base, contravariant, criterion, doctest, hspec + , QuickCheck, time, transformers }: mkDerivation { pname = "varying"; - version = "0.7.1.1"; - sha256 = "03k41nik9nl3qqb4xrwfrqwc58wpdcdfmjls84fp140n2pwgd5av"; + version = "0.8.0.0"; + sha256 = "1m71aqa34p1f95mn0mlcm4wq12x5axwhrqnyg4wbxhaz2cmxj4yh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base contravariant transformers ]; - executableHaskellDepends = [ base time transformers ]; - testHaskellDepends = [ base hspec QuickCheck time transformers ]; - benchmarkHaskellDepends = [ base criterion time transformers ]; + executableHaskellDepends = [ + base contravariant time transformers + ]; + testHaskellDepends = [ + base contravariant doctest hspec QuickCheck time transformers + ]; + benchmarkHaskellDepends = [ + base contravariant criterion time transformers + ]; description = "FRP through value streams and monadic splines"; license = stdenv.lib.licenses.mit; }) {}; @@ -245132,6 +246335,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-sized_1_4_0_0" = callPackage + ({ mkDerivation, adjunctions, base, binary, comonad, deepseq + , distributive, finite-typelits, hashable, indexed-list-literals + , primitive, vector + }: + mkDerivation { + pname = "vector-sized"; + version = "1.4.0.0"; + sha256 = "1rh8jjbpw8c6mprwqzd8x7n1kcm5kld3ajrrsahnm91aaw9z1cy6"; + libraryHaskellDepends = [ + adjunctions base binary comonad deepseq distributive + finite-typelits hashable indexed-list-literals primitive vector + ]; + description = "Size tagged vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -245292,18 +246513,19 @@ self: { }) {}; "vega-view" = callPackage - ({ mkDerivation, aeson, base, blaze-html, bytestring, directory - , filepath, http-types, scotty, text, unordered-containers + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , directory, filepath, http-types, scotty, text + , unordered-containers }: mkDerivation { pname = "vega-view"; - version = "0.2.0.2"; - sha256 = "0r9l77xx0bdrpn0jj432cdrw6xw9ni09f08n70kik57raay04bnq"; + version = "0.3.1.5"; + sha256 = "0f120aalldbcwyyjmm6chvqgyp70lifqbas7q442qqficw7yi6hg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base blaze-html bytestring directory filepath http-types - scotty text unordered-containers + aeson base blaze-html blaze-markup bytestring directory filepath + http-types scotty text unordered-containers ]; description = "Easily view Vega or Vega-Lite visualizations"; license = stdenv.lib.licenses.bsd3; @@ -245626,8 +246848,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.29"; - sha256 = "1cy1p1dq6blval791x01rpf1ihqawyj1shfgz46hmmfx1f5dlcdv"; + version = "0.0.0.30"; + sha256 = "0l3hf7dj9y4zr6qzih3xl3yz56pjd4gy9jfk9aqypv2rcvwh1w17"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -245638,14 +246860,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "viewprof_0_0_0_30" = callPackage + "viewprof_0_0_0_31" = callPackage ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens , scientific, text, vector, vector-algorithms, vty }: mkDerivation { pname = "viewprof"; - version = "0.0.0.30"; - sha256 = "0l3hf7dj9y4zr6qzih3xl3yz56pjd4gy9jfk9aqypv2rcvwh1w17"; + version = "0.0.0.31"; + sha256 = "0qw2r89ghyxcyzl360i3h0iwfgp1cmsb5pn0kw9nprqpa2flwfdj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -248582,23 +249804,18 @@ self: { broken = true; }) {}; - "warp-tls" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, streaming-commons, tls, tls-session-manager, wai, warp - }: + "warp-systemd" = callPackage + ({ mkDerivation, base, network, systemd, unix, wai, warp }: mkDerivation { - pname = "warp-tls"; - version = "3.2.7"; - sha256 = "1h6m9jhvk4ai945p5s6sa9lxq40cn00gjfj4yiqhj2q5ymxfgfba"; - libraryHaskellDepends = [ - base bytestring cryptonite data-default-class network - streaming-commons tls tls-session-manager wai warp - ]; - description = "HTTP over TLS support for Warp via the TLS package"; - license = stdenv.lib.licenses.mit; + pname = "warp-systemd"; + version = "0.1.0.0"; + sha256 = "1cfm70dapcxd7ddxs7x0qqlv5w5kr3hasspvg292ik5f5bn40m91"; + libraryHaskellDepends = [ base network systemd unix wai warp ]; + description = "Socket activation and other systemd integration for the Warp web server (WAI)"; + license = stdenv.lib.licenses.bsd3; }) {}; - "warp-tls_3_2_8" = callPackage + "warp-tls" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, streaming-commons, tls, tls-session-manager, wai, warp }: @@ -248612,7 +249829,6 @@ self: { ]; description = "HTTP over TLS support for Warp via the TLS package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-tls-uid" = callPackage @@ -250389,6 +251605,27 @@ self: { broken = true; }) {}; + "wide-word_0_1_0_9" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog + , primitive, QuickCheck, quickcheck-classes, semirings + }: + mkDerivation { + pname = "wide-word"; + version = "0.1.0.9"; + sha256 = "0k8v6iggsrbmmq82b4zziyg9arh6fvwqsfid15nnycdfgsaafph3"; + revision = "1"; + editedCabalFile = "1d9ahyjh7wjpr7llmvj2r7y6c0gl91yq501aj9c5qfpyhbc59jzl"; + libraryHaskellDepends = [ base deepseq primitive ]; + testHaskellDepends = [ + base bytestring ghc-prim hedgehog primitive QuickCheck + quickcheck-classes semirings + ]; + description = "Data types for large but fixed width signed and unsigned integers"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "wigner-symbols" = callPackage ({ mkDerivation, base, bytestring, criterion, cryptonite, primitive , random, vector @@ -250761,8 +251998,8 @@ self: { }: mkDerivation { pname = "withdependencies"; - version = "0.2.4.3"; - sha256 = "1km9mrasxpzpkrm1cb5s06iwmqd33dmiwld8syx1f7rq9l3pk8d7"; + version = "0.2.5"; + sha256 = "13xdcn9fp1nc5378vmjbjwpw4n19bnnfrgr729yh5s366f2cfiv1"; libraryHaskellDepends = [ base conduit containers mtl profunctors ]; @@ -256915,28 +258152,6 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.6.6"; - sha256 = "16m7m7yixsnka926znjy0xn0kp30mbvjq2f46rh987kdr28dks9p"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare text time - transformers wai xss-sanitize yesod-core yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_6_7" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, text, time, transformers, wai - , xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; version = "1.6.7"; sha256 = "0mny71dyp6cp5akyp5wvmrhmip5rkqi8ibdn3lipvmajx9h58r5d"; libraryHaskellDepends = [ @@ -256948,7 +258163,6 @@ self: { testHaskellDepends = [ base hspec text time ]; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bootstrap4" = callPackage @@ -260379,4 +261593,56 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zxcvbn-dvorak" = callPackage + ({ mkDerivation, base, base64-bytestring, binary, binary-instances + , containers, lens, text, unordered-containers, zlib, zxcvbn-hs + }: + mkDerivation { + pname = "zxcvbn-dvorak"; + version = "0.1.0.0"; + sha256 = "07sz5vwgh7vxlr0z2v7bml8j2gy0l2pl62frgl8r211dzjmd7q8m"; + libraryHaskellDepends = [ + base base64-bytestring binary binary-instances containers lens text + unordered-containers zlib zxcvbn-hs + ]; + description = "Password strength estimation based on zxcvbn"; + license = stdenv.lib.licenses.mit; + }) {}; + + "zxcvbn-hs" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , binary-instances, containers, criterion, fgl, hedgehog, lens + , math-functions, tasty, tasty-hedgehog, tasty-hunit, text, time + , unordered-containers, vector, zlib + }: + mkDerivation { + pname = "zxcvbn-hs"; + version = "0.2.0.0"; + sha256 = "1524j8mgvp26cz4n4cd1vyslniw0xbw9ngrgkcyj3jmkh6p53ngh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary binary-instances + containers fgl lens math-functions text time unordered-containers + vector zlib + ]; + executableHaskellDepends = [ + attoparsec base base64-bytestring binary binary-instances + containers fgl lens math-functions text time unordered-containers + vector zlib + ]; + testHaskellDepends = [ + attoparsec base base64-bytestring binary binary-instances + containers fgl hedgehog lens math-functions tasty tasty-hedgehog + tasty-hunit text time unordered-containers vector zlib + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary binary-instances + containers criterion fgl lens math-functions text time + unordered-containers vector zlib + ]; + description = "Password strength estimation based on zxcvbn"; + license = stdenv.lib.licenses.mit; + }) {}; + } diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 54ee243cb33..c4259091f7b 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -1,30 +1,30 @@ -{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security, zeromq }: +{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security, cmake }: rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "1j2vsqgljqw7415rgjlnc1w3nmr9ghizx2mncbm1yipwj8xbrmf6"; + sha256 = "13fs9fgvdf8bh6vc8xs8qhil0a1qhm4gvv0ici37xh8a94ngsn7h"; }; - cargoSha256 = "0ckxpmi547y7q4w287znimpxgaj3mjkgmkcs2n9cp4m8cw143hly"; + cargoSha256 = "0g17g12isah4nkqp9i299qr1sz19k4czcc43rm1wbs0y9szaqvwc"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ zeromq ] ++ stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkgconfig makeWrapper cmake ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; postInstall = '' wrapProgram $out/bin/evcxr --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} rm $out/bin/testing_runtime ''; - meta = { + meta = with stdenv.lib; { description = "An evaluation context for Rust"; homepage = "https://github.com/google/evcxr"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.protoben ]; - platforms = stdenv.lib.platforms.all; + license = licenses.asl20; + maintainers = with maintainers; [ protoben ma27 ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 9292a930703..2315e53220b 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -116,45 +116,11 @@ SEMVER = { } -def _determine_latest_version(current_version, target, versions): - """Determine latest version, given `target`. - """ - current_version = Version(current_version) - - def _parse_versions(versions): - for v in versions: - try: - yield Version(v) - except InvalidVersion: - pass - - versions = _parse_versions(versions) - - index = SEMVER[target] - - ceiling = list(current_version[0:index]) - if len(ceiling) == 0: - ceiling = None - else: - ceiling[-1]+=1 - ceiling = Version(".".join(map(str, ceiling))) - - # We do not want prereleases - versions = SpecifierSet(prereleases=PRERELEASES).filter(versions) - - if ceiling is not None: - versions = SpecifierSet(f"<{ceiling}").filter(versions) - - return (max(sorted(versions))).raw_version - - def _get_latest_version_pypi(package, extension, current_version, target): """Get latest version and hash from PyPI.""" url = "{}/{}/json".format(INDEX, package) json = _fetch_page(url) - - versions = json['releases'].keys() - version = _determine_latest_version(current_version, target, versions) + version = json['info']['version'] try: releases = json['releases'][version] @@ -166,6 +132,7 @@ def _get_latest_version_pypi(package, extension, current_version, target): sha256 = release['digests']['sha256'] break else: + logging.error("Release not found for extension: {}".format(extension)) sha256 = None return version, sha256 diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 8f9477c4c4a..97d2b67372a 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -37,6 +37,12 @@ stdenv.mkDerivation { patchFlags = "-p3"; + # fixes build on gcc8 + postPatch = '' + substituteInPlace ./methodjit/MethodJIT.cpp \ + --replace 'asm volatile' 'asm' + ''; + # On the Sheevaplug, ARM, its nanojit thing segfaults in japi-tests in # "make check". Disabling tracejit makes it work, but then it needs the # patch findvanilla.patch do disable a checker about allocator safety. In case diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index d3e18aa776f..0e24d556b1a 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = ''A library for arbitrary-precision interval arithmetic''; license = stdenv.lib.licenses.lgpl21Plus; maintainers = with maintainers; [ raskin timokau ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix index fbefee48d5b..4f4af87227f 100644 --- a/pkgs/development/libraries/chmlib/default.nix +++ b/pkgs/development/libraries/chmlib/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "chmlib-0.40"; + name = "chmlib-0.40a"; - src = fetchurl { - url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "18zzb4x3z0d7fjh1x5439bs62dmgsi4c1pg3qyr7h5gp1i5xcj9l"; + src = fetchFromGitHub { + owner = "jedwing"; + repo = "CHMLib"; + rev = "2bef8d063ec7d88a8de6fd9f0513ea42ac0fa21f"; + sha256 = "1hah0nw0l05npva2r35ywwd0kzyiiz4vamghm6d71h8170iva6m9"; }; + nativeBuildInputs = [ autoreconfHook ]; + meta = { homepage = http://www.jedrea.com/chmlib; license = stdenv.lib.licenses.lgpl2; description = "A library for dealing with Microsoft ITSS/CHM format files"; - platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; + platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; }; } diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index cd16dea56b1..c7f94945570 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "4.17.1"; + version = "5.0.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "12088cwg3jbqipmbn4843w1cgxi1q6vwx47gy042rkfvbk6azhxl"; + sha256 = "031kiawmrp40sqgd9g5qd82ljglcm9xvynicsn4n8n4ngfgbnc0m"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 45a4f48fd33..78d291e86fa 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -238,11 +238,11 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; stdenv.mkDerivation rec { pname = "ffmpeg-full"; - version = "4.2"; + version = "4.2.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "1mgcxm7sqkajx35px05szsmn9mawwm03cfpmk3br7bcp3a1i0gq2"; + sha256 = "1m5nkc61ihgcf0b2wabm0zyqa8sj3c0w8fi6kr879lb0kdzciiyf"; }; patches = [ ./prefer-libdav1d-over-libaom.patch ]; diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 670f51000a6..a0b95cecaab 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -5,8 +5,8 @@ }@args: callPackage ./generic.nix (args // rec { - version = branch; + version = "4.2.1"; branch = "4.2"; - sha256 = "1f3glany3p2j832a9wia5vj8ds9xpm0xxlyia91y17hy85gxwsrh"; + sha256 = "090naa6rj46pzkgh03bf51hbqdz356qqckr2pw6pykc6ysiryak8"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; }) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 796861a3065..fd35b697d7c 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, enableShared ? true }: stdenv.mkDerivation rec { - version = "5.3.0"; + version = "6.0.0"; pname = "fmt"; src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; rev = version; - sha256 = "1hl9s69a5ql5nckc0ifh2fzlgsgv1wsn6yhqkpnrhasqkhj0hgv4"; + sha256 = "0yfrw6by4h27k3psv9x1q7z2kdbz7pkwxidr494bpa6ppglij6ba"; }; outputs = [ "out" "dev" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - # preCheckHook ensures the test binaries can find libfmt.so.5 + # preCheckHook ensures the test binaries can find libfmt.so preCheck = if enableShared then "export LD_LIBRARY_PATH=\"$PWD\"" else ""; diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index a70e9934520..c2952cb47f1 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = ''Lattice algorithms using floating-point arithmetic''; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 33c8e5076da..8e8e445f017 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -19,7 +19,7 @@ { stdenv, lib , buildPackages -, fetchurl ? null +, fetchurl, fetchpatch , linuxHeaders ? null , gd ? null, libpng ? null , bison @@ -95,7 +95,15 @@ stdenv.mkDerivation ({ ] ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch - ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; + ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch + + # Remove after upgrading to glibc 2.28+ + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) (fetchpatch { + url = "https://sourceware.org/git/?p=glibc.git;a=patch;h=780684eb04298977bc411ebca1eadeeba4877833"; + name = "correct-pwent-parsing-issue-and-resulting-build.patch"; + sha256 = "08fja894vzaj8phwfhsfik6jj2pbji7kypy3q8pgxvsd508zdv1q"; + excludes = [ "ChangeLog" ]; + }); postPatch = '' diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch deleted file mode 100644 index c48eec68a64..00000000000 --- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch +++ /dev/null @@ -1,49 +0,0 @@ -Description: Work around moc limitations - Some parts of Boost, introduced in Boost 1.48 are not - understood by the limited C++ parser of moc. This - patch defines header guards that prevent the troublesome boost - headers from being processed. -Bug-Debian: #653796 -Author: Tobias Frost <tobi@coldtobi.de> -Reviewed-By: Steve Robbins <smr@debian.org> - ---- a/src/QGlib/connect.h -+++ b/src/QGlib/connect.h -@@ -19,6 +19,11 @@ - #ifndef QGLIB_CONNECT_H - #define QGLIB_CONNECT_H - -+#ifdef Q_MOC_RUN -+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED -+#endif -+ -+ - #include "global.h" - #include "quark.h" - #include <QtCore/QObject> ---- a/src/QGst/bin.h -+++ b/src/QGst/bin.h -@@ -19,6 +19,10 @@ - #ifndef QGST_BIN_H - #define QGST_BIN_H - -+#ifdef Q_MOC_RUN -+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED -+#endif -+ - #include "element.h" - #include "childproxy.h" - ---- a/src/QGst/Ui/videowidget.h -+++ b/src/QGst/Ui/videowidget.h -@@ -19,6 +19,10 @@ - #ifndef QGST_UI_VIDEOWIDGET_H - #define QGST_UI_VIDEOWIDGET_H - -+#ifdef Q_MOC_RUN -+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED -+#endif -+ - #include "global.h" - #include "../element.h" - #include <QtGui/QWidget> diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix deleted file mode 100644 index 9797f21c168..00000000000 --- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost155, glib, qt4, cmake -, automoc4, flex, bison, pkgconfig }: - -stdenv.mkDerivation rec { - name = "${pname}-0.10.3"; - pname = "qt-gstreamer"; - - src = fetchurl { - url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2"; - sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl"; - }; - - buildInputs = [ gstreamer gst-plugins-base glib qt4 ]; - propagatedBuildInputs = [ boost155 ]; - nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; - - cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; - - patches = [ ./boost1.48.patch ]; -} diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix deleted file mode 100644 index a099643061a..00000000000 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, gst_all_1, boost, glib, qt4, cmake -, automoc4, flex, bison, pkgconfig }: - -stdenv.mkDerivation rec { - name = "${pname}-1.2.0"; - pname = "qt-gstreamer"; - - src = fetchurl { - url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz"; - sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4"; - }; - - patches = [ - (fetchpatch { - url = "https://cgit.freedesktop.org/gstreamer/qt-gstreamer/patch/?id=e2ca8094aa8d0eac1c3a98df66fe94ce0c754088"; - sha256 = "1qps0nlc26d74wk8h96xl5s3d9qrdx6c0ph0zpl1dnc691lgyf6s"; - }) - ]; - - outputs = [ "out" "dev" ]; - - buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ]; - propagatedBuildInputs = [ boost ]; - nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; - - cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index 5ad3e249fc3..2b85f12115b 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers''; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = https://cs.uwaterloo.ca/~astorjoh/iml.html; updateWalker = true; }; diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index fe2f0eadeeb..4d56c0f1403 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcbor"; - version = "2019-02-23"; + version = "unstable-2019-07-25"; src = fetchFromGitHub { owner = "PJK"; repo = pname; - rev = "87f977e732ca216682a8583a0e43803eb6b9c028"; - sha256 = "17p1ahdcpf5d4r472lhciscaqjq4pyxy9xjhqqx8mv646xmyripm"; + rev = "82512d851205fbc7f65d96a0b4a8e1bad2e4f3c6"; + sha256 = "01hy7n21gxz4gp3gdwm2ywz822p415bj2k9ccxgwz3plvncs4xa1"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index b670172ce1e..5fefdad08e7 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "https://developers.yubico.com/libfido2/Releases/libfido2-${version}.tar.gz"; - sha256 = "1h51q9pgv54czf7k6v90b02gnvqw4dlxmz6vi0n06shpkdzv5jh1"; + sha256 = "1pbllhzcrzkgxad00bai7lna8dpkwiv8khx8p20miy661abv956v"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/development/libraries/libmicrodns/default.nix index 3c55a6b036c..41d81f1f176 100644 --- a/pkgs/development/libraries/libmicrodns/default.nix +++ b/pkgs/development/libraries/libmicrodns/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "0.0.10"; + version = "0.1.0"; pname = "libmicrodns"; src = fetchFromGitHub { owner = "videolabs"; repo = pname; rev = version; - sha256 = "1xvl9k49ng35wbsqmnjnyqvkyjf8dcq2ywsq3jp3wh0rgmxhq2fh"; + sha256 = "1pmf461zn35spbpbls1ih68ki7f8g8xjwhzr2csy63nnyq2k9jji"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 1b73af7037b..894907c23fc 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1qgsngi9z1sr6pzgcq6kgng62arpc5xn2ai1ks69myzzmgwk8adp"; + sha256 = "046fi8cqfqh0ila3kc4sg75yvg24wmghlja2fmhkj96fjjfkzsss"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 71b8d2bb20e..4bfa6cd0b8e 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, cmake }: +{ stdenv, fetchurl, lib, cmake, cacert }: let @@ -31,6 +31,12 @@ let rm configure ''; + # Since 2.9.x the default location can't be configured from the build using + # DEFAULT_CA_FILE anymore, instead we have to patch the default value. + postPatch = lib.optionalString (lib.versionAtLeast version "2.9.2") '' + substituteInPlace ./tls/tls_config.c --replace '"/etc/ssl/cert.pem"' '"${cacert}/etc/ssl/certs/ca-bundle.crt"' + ''; + enableParallelBuilding = true; outputs = [ "bin" "dev" "out" "man" "nc" ]; diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index a297bf61f78..732a529c21f 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -1,28 +1,47 @@ { fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }: -stdenv.mkDerivation rec { - pname = "libwebsockets"; - version = "3.2.0"; - - src = fetchFromGitHub { - owner = "warmcat"; - repo = "libwebsockets"; - rev = "v${version}"; - sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8"; +let + generic = { version, sha256 }: stdenv.mkDerivation rec { + pname = "libwebsockets"; + inherit version; + + src = fetchFromGitHub { + owner = "warmcat"; + repo = "libwebsockets"; + rev = "v${version}"; + inherit sha256; + }; + + buildInputs = [ openssl zlib libuv ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; + + meta = with stdenv.lib; { + description = "Light, portable C library for websockets"; + longDescription = '' + Libwebsockets is a lightweight pure C library built to + use minimal CPU and memory resources, and provide fast + throughput in both directions. + ''; + homepage = "https://libwebsockets.org/"; + license = licenses.lgpl21; + platforms = platforms.all; + }; }; - buildInputs = [ cmake openssl zlib libuv ]; - cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; - - meta = { - description = "Light, portable C library for websockets"; - longDescription = '' - Libwebsockets is a lightweight pure C library built to - use minimal CPU and memory resources, and provide fast - throughput in both directions. - ''; - homepage = https://github.com/warmcat/libwebsockets; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.all; +in +rec { + libwebsockets_3_1 = generic { + sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl"; + version = "3.1.0"; }; + + libwebsockets_3_2 = generic { + version = "3.2.0"; + sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8"; + }; + + libwebsockets = libwebsockets_3_2; } diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix deleted file mode 100644 index 89db7344f99..00000000000 --- a/pkgs/development/libraries/mono-zeroconf/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, which, pkgconfig, mono }: - -stdenv.mkDerivation rec { - pname = "mono-zeroconf"; - version = "0.9.0"; - - src = fetchurl { - url = "http://download.banshee-project.org/mono-zeroconf/mono-zeroconf-${version}.tar.bz2"; - sha256 = "1qfp4qvsx7rc2shj1chi2y7fxn10rwi70rw2y54b2i8a4jq7gpkb"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which mono ]; - - dontStrip = true; - - configureFlags = [ "--disable-docs" ]; - - meta = with stdenv.lib; { - description = "A cross platform Zero Configuration Networking library for Mono and .NET"; - homepage = https://www.mono-project.com/archived/monozeroconf/; - platforms = platforms.linux; - license = licenses.mit; - }; -} diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index baefab487e5..fe46336649e 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = https://gforge.inria.fr/projects/mpfi/; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 06e4726054e..4ab2dd41855 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl -, rdma-core, zlib, numactl, libevent, hwloc +, rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -30,6 +30,13 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs ./ + + # Ensure build is reproducible + ts=`date -d @$SOURCE_DATE_EPOCH` + sed -i 's/OPAL_CONFIGURE_USER=.*/OPAL_CONFIGURE_USER="nixbld"/' configure + sed -i 's/OPAL_CONFIGURE_HOST=.*/OPAL_CONFIGURE_HOST="localhost"/' configure + sed -i "s/OPAL_CONFIGURE_DATE=.*/OPAL_CONFIGURE_DATE=\"$ts\"/" configure + find -name "Makefile.in" -exec sed -i "s/\`date\`/$ts/" \{} \; ''; buildInputs = with stdenv; [ gfortran zlib ] @@ -51,6 +58,23 @@ in stdenv.mkDerivation rec { rm -f $out/lib/*.la ''; + postFixup = '' + # default compilers should be indentical to the + # compilers at build time + + sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \ + $out/share/openmpi/mpicc-wrapper-data.txt + + sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \ + $out/share/openmpi/ortecc-wrapper-data.txt + + sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++:' \ + $out/share/openmpi/mpic++-wrapper-data.txt + + sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.gfortran}/bin/${pkgsTargetTarget.gfortran.targetPrefix}gfortran:' \ + $out/share/openmpi/mpifort-wrapper-data.txt + ''; + doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index bc8133aaf82..e2be8ded31c 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -5,16 +5,18 @@ buildGoModule rec { pname = "packr"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "gobuffalo"; repo = pname; rev = "v${version}"; - sha256 = "1ciffa5xbd93fylwz93wr4m4fj83dcla55dmdshaqz28rbsapnc1"; + sha256 = "11bd0s3hyzvhcg1q0iahv2w9f0w1k57jfxgswhz7dyndxvvr2b8i"; }; - modSha256 = "086gydrl3i35hawb5m7rsb4a0llcpdpgid1xfw2z9n6jkwkclw4n"; + subPackages = [ "packr" "v2/packr2" ]; + + modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv"; meta = with lib; { description = "The simple and easy way to embed static files into Go binaries"; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 357c81fa4f6..c96aef3f4da 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -103,24 +103,27 @@ EOF --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]' ''); - NIX_CFLAGS_COMPILE = - # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940 - # TODO: investigate and fix properly - lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [ "-march=westmere" ] ++ - lib.optionals stdenv.isDarwin [ - "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" - "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10" - - # - # Prevent errors like - # /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7: - # error: pointer to non-const type 'id' with no explicit ownership - # id** _kvcPropertyAccessors; - # - # TODO remove when new Apple SDK is in - # - "-fno-objc-arc" - ]; + NIX_CFLAGS_COMPILE = [ + # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit + "-Wno-class-memaccess" + ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [ + # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940 + # TODO: investigate and fix properly + "-march=westmere" + ] ++ lib.optionals stdenv.isDarwin [ + "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" + "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10" + + # + # Prevent errors like + # /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7: + # error: pointer to non-const type 'id' with no explicit ownership + # id** _kvcPropertyAccessors; + # + # TODO remove when new Apple SDK is in + # + "-fno-objc-arc" + ]; preConfigure = '' export NINJAFLAGS=-j$NIX_BUILD_CORES diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 63b0a9f42a6..9eb43991bd6 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "5.13.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "03drxwpr3xdh4hm8pkd5mhjs0mzhz6634ldyq78pml39ciqm51nl"; + sha256 = "0d2x4djr8lqb4vad8g8vxvd1sgki4issxhyy5r32snh2i8pxpbp9"; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 367fc635c8b..0b13696ad5f 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = http://www.htslib.org/; platforms = platforms.unix; - maintainers = [ maintainers.mimadrid ]; + maintainers = [ maintainers.mimame ]; }; } diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix index bc276b9923c..f08f6425655 100644 --- a/pkgs/development/libraries/science/math/brial/default.nix +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "Legacy version of PolyBoRi maintained by sagemath developers"; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index 5193c2db5c5..08f821dcb2c 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 5a62578481c..076376dc3c1 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ python2 ]; cmakeFlags = [ - "-DUSE_OPTIMIZED_BLAS=ON" "-DCMAKE_Fortran_FLAGS=-fPIC" + "-DLAPACKE=ON" ] ++ (optional shared "-DBUILD_SHARED_LIBS=ON"); diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix index b8c4fa67148..764901adf7b 100644 --- a/pkgs/development/libraries/science/math/m4ri/default.nix +++ b/pkgs/development/libraries/science/math/m4ri/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Library to do fast arithmetic with dense matrices over F_2"; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix index 6a664b1dfff..6a91230002a 100644 --- a/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix index 66c573245db..ded7b7dc90a 100644 --- a/pkgs/development/libraries/science/math/rankwidth/default.nix +++ b/pkgs/development/libraries/science/math/rankwidth/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Calculates rank-width and rank-decompositions"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix index 207406388e0..3b2ddc6f06c 100644 --- a/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/pkgs/development/libraries/science/math/rubiks/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { mit # Dik T. Winter's software ]; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix index 9e2521717ef..fa4b4c3be56 100644 --- a/pkgs/development/node-packages/composition-v10.nix +++ b/pkgs/development/node-packages/composition-v10.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix index 4ed0336ec5c..880d72efd35 100644 --- a/pkgs/development/node-packages/composition-v12.nix +++ b/pkgs/development/node-packages/composition-v12.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-6_x}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 720e0cc0850..670556bf271 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -11,7 +11,7 @@ let cat > $out/bin/tar <<EOF #! ${stdenv.shell} -e - $(type -p tar) "\$@" --warning=no-unknown-keyword + $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore EOF chmod +x $out/bin/tar @@ -72,7 +72,7 @@ let packageDir="$(find . -maxdepth 1 -type d | tail -1)" # Restore write permissions to make building work - find "$packageDir" -type d -print0 | xargs -0 chmod u+x + find "$packageDir" -type d -exec chmod u+x {} \; chmod -R u+w "$packageDir" # Move the extracted tarball into the output folder @@ -219,7 +219,16 @@ let packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. } - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); } @@ -308,6 +317,61 @@ let ''; }; + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${stdenv.lib.optionalString bypassCache '' + ${stdenv.lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + + if [ "$dontNpmInstall" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + fi + ''; + # Builds and composes an NPM package including all its dependencies buildNodePackage = { name @@ -319,6 +383,7 @@ let , npmFlags ? "" , dontNpmInstall ? false , bypassCache ? false + , reconstructLock ? false , preRebuild ? "" , dontStrip ? true , unpackPhase ? "true" @@ -326,11 +391,10 @@ let , ... }@args: let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; in stdenv.mkDerivation ({ - name = "node-${name}-${version}"; + name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool @@ -352,47 +416,7 @@ let # Compose the package and all its dependencies source $compositionScriptPath - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${stdenv.lib.optionalString bypassCache '' - if [ ! -f package-lock.json ] - then - echo "No package-lock.json file found, reconstructing..." - node ${reconstructPackageLock} - fi - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild - - if [ "$dontNpmInstall" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install - fi + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Create symlink to the deployed executable folder, if applicable if [ -d "$out/lib/node_modules/.bin" ] @@ -431,14 +455,13 @@ let , npmFlags ? "" , dontNpmInstall ? false , bypassCache ? false + , reconstructLock ? false , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" , ... }@args: let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; nodeDependencies = stdenv.mkDerivation ({ @@ -473,39 +496,13 @@ let fi ''} - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." + # Go to the parent folder to make sure that all packages are pinpointed cd .. ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - source $pinpointDependenciesScriptPath - cd ${packageName} - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - export HOME=$PWD - - ${stdenv.lib.optionalString bypassCache '' - if [ ! -f package-lock.json ] - then - echo "No package-lock.json file found, reconstructing..." - node ${reconstructPackageLock} - fi - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild - - ${stdenv.lib.optionalString (!dontNpmInstall) '' - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install - ''} + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + # Expose the executables that were installed cd .. ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} @@ -532,6 +529,7 @@ let inherit nodeDependencies; shellHook = stdenv.lib.optionalString (dependencies != []) '' export NODE_PATH=$nodeDependencies/lib/node_modules + export PATH="$nodeDependencies/bin:$PATH" ''; }; in diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index e53f64d8eca..ef5afe37117 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -109,6 +109,7 @@ , "s3http" , "semver" , "serve" +, "serverless" , "shout" , "sloc" , "smartdc" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index ce8a63cfdd3..3f4c4d1b9b5 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -13,67 +13,67 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.802.0" = { + "@angular-devkit/architect-0.803.4" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.802.0"; + version = "0.803.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.802.0.tgz"; - sha512 = "Zd/ao7uE8ctV4n6drKl35cK5xrRsmgva7lsiBRc4J09vDWaRrCsxTKr6nw1gkFBDuSGZc9OmvtEFFPg2I/YHwQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.4.tgz"; + sha512 = "Ek+xb9GfzHLbD+ATmupbzTSNFGddkH6dbb36cB6gme+vnlBVfXP0dxOg5lRKZoUIFJyREl9jSrA5zUhVwXaoVg=="; }; }; - "@angular-devkit/core-8.2.0" = { + "@angular-devkit/core-8.3.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "8.2.0"; + version = "8.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.0.tgz"; - sha512 = "jZQn5hQ84++00+yuD/Ak303/Q06keFVyd+QbSfVrpHTFyOwPeNNSPLbN6A0S7X3bKOuoZhUHg+eQBa5BljVC2g=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.4.tgz"; + sha512 = "QjUN9EakpQ+sFYeMfBMecxVhgI4Vdg0k20h6PZDjZ9lqYNXjpaQVtBo7qiPYHh5kQeJEvdrzca6yeYuCP3TvZw=="; }; }; - "@angular-devkit/schematics-8.2.0" = { + "@angular-devkit/schematics-8.3.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "8.2.0"; + version = "8.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.2.0.tgz"; - sha512 = "/XUWJijLXzhtWdjoQ5ioLo5r5V5+sJ0SSnSP0N8MQyLOgTd1FDGtBMsAMJ3n2/uwUl2/O9WTlV1xNLlg7neYVQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.4.tgz"; + sha512 = "+QXhrAEcReQJL4fn+35NbcdW5d1vawqSZUokqga8E971YUVUk55mHpIQ39Vpj3S9jhTRYwxsHl+7v9N7UaREmg=="; }; }; - "@antora/asciidoc-loader-2.0.0" = { + "@antora/asciidoc-loader-2.1.1" = { name = "_at_antora_slash_asciidoc-loader"; packageName = "@antora/asciidoc-loader"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.0.0.tgz"; - sha512 = "kbpSBMM618Do5dXtG5mC5kk8VEXYDsciJ0orw7vrYeFzRBbR4Y4qpzbsQeuQNB4r2iLoztxErvg04SBb5CsGdQ=="; + url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.1.1.tgz"; + sha512 = "5j4wKrLgoiIoghqMYv9FkEstISozG753L5YMuQ5sbiQToKhZp4frKx8hZfrwlUCyGQ9BKqIVlkhkPValkpp26g=="; }; }; - "@antora/content-aggregator-2.0.0" = { + "@antora/content-aggregator-2.1.1" = { name = "_at_antora_slash_content-aggregator"; packageName = "@antora/content-aggregator"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.0.0.tgz"; - sha512 = "24JQSDQZ609yJHs7abIqF5FikNg0EWvFwBYck1Kbl5vRikmDTpSMBhhPKJhAVe4lREm6/FVYO7t9CEmjp69prA=="; + url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.1.1.tgz"; + sha512 = "uORcwPt2js5i6m492zOyszU0+GA748+Zvcrwf6jeOWsBePyYIVxI2L6TmJ8Ulw65scEQOKTrvsITb8lFCVLkWQ=="; }; }; - "@antora/content-classifier-2.0.0" = { + "@antora/content-classifier-2.1.1" = { name = "_at_antora_slash_content-classifier"; packageName = "@antora/content-classifier"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.0.0.tgz"; - sha512 = "d1MB57X3AaXy30rw+dudxbJ2cdw/Uk1U4JxHbWIkdrEJKty2fbnBu3xjyb70qAv5G0ayovJpqZOaR+YwS0ibbQ=="; + url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.1.1.tgz"; + sha512 = "HQlDCoycTxk8IDMx4IaaNkqlHcik5Q22L2/nHQTevYfiErS4wfCmern1O42DvPj72VT72JnnDg87WBvTgZTRTA=="; }; }; - "@antora/document-converter-2.0.0" = { + "@antora/document-converter-2.1.1" = { name = "_at_antora_slash_document-converter"; packageName = "@antora/document-converter"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.0.0.tgz"; - sha512 = "8slnLdeMxI4kU64fMsNp58HjpFYZ7chrl5tCYr1/4Jr00fVHwn8vx2YS1cKyowcrmb9uG6YI/pMNt9F3kjTtYA=="; + url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.1.1.tgz"; + sha512 = "WnMHE5JCkdOYFQ7ytqq2d6Wj0zmy2ifXzU1M2Eo7ZwbSxjkrLVGRFlPbTIybdgnqhIss6ef01qZ+F/+8ZBTFvw=="; }; }; "@antora/expand-path-helper-1.0.0" = { @@ -85,67 +85,67 @@ let sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw=="; }; }; - "@antora/navigation-builder-2.0.0" = { + "@antora/navigation-builder-2.1.1" = { name = "_at_antora_slash_navigation-builder"; packageName = "@antora/navigation-builder"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.0.0.tgz"; - sha512 = "tuI2dNDy9sqgkHoiqn52M0lWrxxOafrEUIPSskjyGf0MjFP3pBPKnHiBmAl2r+NhXCAfcIb5khe4rSS18bfiVA=="; + url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.1.1.tgz"; + sha512 = "H3VmqIfvuCTAae7Xd1rWYXhQKXhvCLhr0lxWeuSvVp6xzTo3Zf/VnhCGlllLoB+69PSCfcSEm2J5oCy6ySa6WA=="; }; }; - "@antora/page-composer-2.0.0" = { + "@antora/page-composer-2.1.1" = { name = "_at_antora_slash_page-composer"; packageName = "@antora/page-composer"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.0.0.tgz"; - sha512 = "1I0vhO6UCyNJRLYICTU+jCTEmkHeJ13tao0nfOOAiSyamDkyX7vM935qfzGBjwZdur8Clq4jpiCuvFTmXMtIfQ=="; + url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.1.1.tgz"; + sha512 = "PqxMt+s4aTCW2woC/MjjfTG1Hy20A3olsW7ZqpanAao+CGdcqeGbu9LFh65lKGL3MOM0NBIDJG0qqX1RNBX1Nw=="; }; }; - "@antora/playbook-builder-2.0.0" = { + "@antora/playbook-builder-2.1.1" = { name = "_at_antora_slash_playbook-builder"; packageName = "@antora/playbook-builder"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.0.0.tgz"; - sha512 = "uLU4+rpIRZiMit8s1lkbiz5L5V8cPL40RJMRHFb4B7k2PXbvNiZZAMHZBeFgVwfJIKmKAIeUCDgOHgiBIlFc+A=="; + url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.1.1.tgz"; + sha512 = "mdsV8OJq9gbw8IUOhNI5+gCfPJl5UyS7H/TbE4oVimebHpmHSld3/GKc7DjuR0Ge4jxNxwlRyDEtfQiNvnBmug=="; }; }; - "@antora/redirect-producer-2.0.0" = { + "@antora/redirect-producer-2.1.1" = { name = "_at_antora_slash_redirect-producer"; packageName = "@antora/redirect-producer"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.0.0.tgz"; - sha512 = "qlRPGNAhtbIOWK9XHEdH4Iiaz1/8SBvm5rK46R4YinjZqMibMehOfFoIdRf2qsE9mfOsYKwKUSF8Jnv/emXuJw=="; + url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.1.1.tgz"; + sha512 = "jdnx19b5qlbjUZCwSGrUTUozRPj39OxTr8PeF3jp+qD+TMZuA6XV/6Qp6d1TN2d6a5PQ+d5852g+B2wZmPMIoQ=="; }; }; - "@antora/site-mapper-2.0.0" = { + "@antora/site-mapper-2.1.1" = { name = "_at_antora_slash_site-mapper"; packageName = "@antora/site-mapper"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.0.0.tgz"; - sha512 = "rPpDLuJbM7c0fNpzf95qrxsjzNAXuyACXE+FXUOwmFp3SYIFGEWATLk1MMNes7SfLAchMMVwjEr1Uii3D5+/Mw=="; + url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.1.1.tgz"; + sha512 = "nJvzzu/S4B+qm5SLfNToaC576spPx/FGZqvS99QbRQ11KK10y7rqERlq/wR/nu1IL+zISgw5zJW3qNlTq9YSIg=="; }; }; - "@antora/site-publisher-2.0.0" = { + "@antora/site-publisher-2.1.1" = { name = "_at_antora_slash_site-publisher"; packageName = "@antora/site-publisher"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.0.0.tgz"; - sha512 = "kjKfQSEpcLiw653h9IzCG+L9sYm/v9GXAcbzXN1IYoNPO1Od0EPQ2RXGviqeQNYcWJLyRq48cQpNx7o2/KqVag=="; + url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.1.1.tgz"; + sha512 = "sGuUeIV5bo4VgbnVN6lJNLnVrJWJyyM1rfu5eInOvPru0dQ5zzH8ij93q+5Lxc30zwj+TDI371AFluzz+TWK3A=="; }; }; - "@antora/ui-loader-2.0.0" = { + "@antora/ui-loader-2.1.1" = { name = "_at_antora_slash_ui-loader"; packageName = "@antora/ui-loader"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.0.0.tgz"; - sha512 = "CaD+Dp13G7EZhEr6Jg6OEvPHjJZ2FROXwdaY4XP+vBrKmI+QZwS3V+uG0NYbCRxhR1W8N8CYm5hc1UTvGH19cA=="; + url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.1.1.tgz"; + sha512 = "/fPYFRtJsUp4LwOu1MrstAcd+BQFdr5afb5l0iaAi3GuXLLLMasdCIH0jByi4GSiNsYlJ6P+/Jbv+BiUiMY/cg=="; }; }; "@apollographql/apollo-tools-0.4.0" = { @@ -211,13 +211,13 @@ let sha512 = "jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA=="; }; }; - "@babel/core-7.5.5" = { + "@babel/core-7.6.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz"; - sha512 = "i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.6.0.tgz"; + sha512 = "FuRhDRtsd6IptKpHXAa+4WPZYY2ZzgowkbLBecEDDSje1X/apG7jQM33or3NdOmjXBKWGOg4JmSiRfUfuTtHXw=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -238,13 +238,13 @@ let sha512 = "8EXhHRFqlVVWXPezBW5keTiQi/rJMQTg/Y9uVCEZ0CAF3PKtCCaVRnp64Ii1ujhkoDhhF1fVsImoN4yJ2uz4Wg=="; }; }; - "@babel/generator-7.5.5" = { + "@babel/generator-7.6.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz"; - sha512 = "ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.6.0.tgz"; + sha512 = "Ms8Mo7YBdMMn1BYuNtKuP/z0TgEIhbcyB8HVR6PPNYp4P61lMsABiS4A3VG1qznjXVCf3r+fVHhm4efTYVsySA=="; }; }; "@babel/helper-annotate-as-pure-7.0.0" = { @@ -283,13 +283,13 @@ let sha512 = "l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.5.5" = { + "@babel/helper-create-class-features-plugin-7.6.0" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz"; - sha512 = "ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz"; + sha512 = "O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng=="; }; }; "@babel/helper-define-map-7.5.5" = { @@ -436,13 +436,13 @@ let sha512 = "o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ=="; }; }; - "@babel/helpers-7.5.5" = { + "@babel/helpers-7.6.0" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz"; - sha512 = "nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.0.tgz"; + sha512 = "W9kao7OBleOjfXtFGgArGRX6eCP0UEcA2ZWEWNkJdRZnHhW4eEbeswbG3EwaRsnQUAEGWYgMq1HsIXuNNNy2eQ=="; }; }; "@babel/highlight-7.5.0" = { @@ -463,13 +463,13 @@ let sha512 = "tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ=="; }; }; - "@babel/parser-7.5.5" = { + "@babel/parser-7.6.0" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz"; - sha512 = "E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.6.0.tgz"; + sha512 = "+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ=="; }; }; "@babel/plugin-external-helpers-7.0.0" = { @@ -643,13 +643,13 @@ let sha512 = "ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w=="; }; }; - "@babel/plugin-transform-block-scoping-7.5.5" = { + "@babel/plugin-transform-block-scoping-7.6.0" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz"; - sha512 = "82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.0.tgz"; + sha512 = "tIt4E23+kw6TgL/edACZwP1OUKrjOTyMrFMLoT5IOFrfMRabCgekjqFd5o6PaAMildBu46oFkekIdMuGkkPEpA=="; }; }; "@babel/plugin-transform-classes-7.5.5" = { @@ -670,13 +670,13 @@ let sha512 = "kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA=="; }; }; - "@babel/plugin-transform-destructuring-7.5.0" = { + "@babel/plugin-transform-destructuring-7.6.0" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.5.0"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz"; - sha512 = "YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz"; + sha512 = "2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ=="; }; }; "@babel/plugin-transform-dotall-regex-7.4.4" = { @@ -778,13 +778,13 @@ let sha512 = "V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.5.0" = { + "@babel/plugin-transform-modules-commonjs-7.6.0" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.5.0"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz"; - sha512 = "xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz"; + sha512 = "Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g=="; }; }; "@babel/plugin-transform-modules-systemjs-7.5.0" = { @@ -805,13 +805,13 @@ let sha512 = "BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.4.5" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.6.0" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.4.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz"; - sha512 = "z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.0.tgz"; + sha512 = "jem7uytlmrRl3iCAuQyw8BpB4c4LWvSpvIeXKpMb+7j84lkx4m4mYr5ErAcmN5KM7B6BqrAvRGjBIbbzqCczew=="; }; }; "@babel/plugin-transform-new-target-7.4.4" = { @@ -877,13 +877,13 @@ let sha512 = "fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw=="; }; }; - "@babel/plugin-transform-runtime-7.5.5" = { + "@babel/plugin-transform-runtime-7.6.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz"; - sha512 = "6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.0.tgz"; + sha512 = "Da8tMf7uClzwUm/pnJ1S93m/aRXmoYNDD7TkHua8xBDdaAs54uZpTWvEt6NGwmoVMb9mZbntfTqmG2oSzN/7Vg=="; }; }; "@babel/plugin-transform-shorthand-properties-7.2.0" = { @@ -931,13 +931,13 @@ let sha512 = "2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw=="; }; }; - "@babel/plugin-transform-typescript-7.5.5" = { + "@babel/plugin-transform-typescript-7.6.0" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz"; - sha512 = "pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.6.0.tgz"; + sha512 = "yzw7EopOOr6saONZ3KA3lpizKnWRTe+rfBqg4AmQbSow7ik7fqmzrfIqt053osLwLE2AaTqGinLM2tl6+M/uog=="; }; }; "@babel/plugin-transform-unicode-regex-7.4.4" = { @@ -967,13 +967,13 @@ let sha512 = "2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA=="; }; }; - "@babel/preset-env-7.5.5" = { + "@babel/preset-env-7.6.0" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.5.tgz"; - sha512 = "GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.6.0.tgz"; + sha512 = "1efzxFv/TcPsNXlRhMzRnkBFMeIqBBgzwmZwlFDw5Ubj0AGLeufxugirwZmkkX/ayi3owsSqoQ4fw8LkfK9SYg=="; }; }; "@babel/preset-flow-7.0.0" = { @@ -994,22 +994,22 @@ let sha512 = "A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA=="; }; }; - "@babel/preset-typescript-7.3.3" = { + "@babel/preset-typescript-7.6.0" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.3.3"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz"; - sha512 = "mzMVuIP4lqtn4du2ynEfdO0+RYcslwrZiJHXu4MGaC1ctJiW2fyaeDrtjJGs7R/KebZ1sgowcIoWf4uRpEfKEg=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.6.0.tgz"; + sha512 = "4xKw3tTcCm0qApyT6PqM9qniseCE79xGHiUnNdKGdxNsGUc2X7WwZybqIpnTmoukg3nhPceI5KPNzNqLNeIJww=="; }; }; - "@babel/register-7.5.5" = { + "@babel/register-7.6.0" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.5.5.tgz"; - sha512 = "pdd5nNR+g2qDkXZlW1yRCWFlNrAn2PPdnZUB72zjX4l1Vv4fMRRLwyf+n/idFCLI1UgVGboUU8oVziwTBiyNKQ=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.6.0.tgz"; + sha512 = "78BomdN8el+x/nkup9KwtjJXuptW5oXMFmP11WoM2VJBjxrKv4grC3qjpLL8RGGUYUGsm57xnjYFM2uom+jWUQ=="; }; }; "@babel/runtime-7.3.4" = { @@ -1030,22 +1030,22 @@ let sha512 = "TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ=="; }; }; - "@babel/runtime-7.5.5" = { + "@babel/runtime-7.6.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz"; - sha512 = "28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.0.tgz"; + sha512 = "89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ=="; }; }; - "@babel/runtime-corejs2-7.5.5" = { + "@babel/runtime-corejs2-7.6.0" = { name = "_at_babel_slash_runtime-corejs2"; packageName = "@babel/runtime-corejs2"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.5.5.tgz"; - sha512 = "FYATQVR00NSNi7mUfpPDp7E8RYMXDuO8gaix7u/w3GekfUinKgX1AcTxs7SoiEmoEW9mbpjrwqWSW6zCmw5h8A=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.6.0.tgz"; + sha512 = "zbPQzlbyJab2xCYb6VaESn8Tk/XiVpQJU7WvIKiQCwlFyc2NSCzKjqtBXCvpZBbiTOHCx10s2656REVnySwb+A=="; }; }; "@babel/template-7.2.2" = { @@ -1057,13 +1057,13 @@ let sha512 = "zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g=="; }; }; - "@babel/template-7.4.4" = { + "@babel/template-7.6.0" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.4.4"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz"; - sha512 = "CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz"; + sha512 = "5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ=="; }; }; "@babel/traverse-7.3.4" = { @@ -1075,13 +1075,13 @@ let sha512 = "TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ=="; }; }; - "@babel/traverse-7.5.5" = { + "@babel/traverse-7.6.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.5.5"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz"; - sha512 = "MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.0.tgz"; + sha512 = "93t52SaOBgml/xY74lsmt7xOR4ufYvhb5c5qiM6lu4J/dWGMAfAh6eKw4PjLes6DI6nQgearoxnFJk60YchpvQ=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -1102,13 +1102,13 @@ let sha512 = "WEkp8MsLftM7O/ty580wAmZzN1nDmCACc5+jFzUt+GUFNNIi3LdRlueYz0YIlmJhlZx1QYDMZL5vdWCL0fNjFQ=="; }; }; - "@babel/types-7.5.5" = { + "@babel/types-7.6.1" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.5.5"; + version = "7.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz"; - sha512 = "s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz"; + sha512 = "X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g=="; }; }; "@calebboyd/semaphore-1.3.1" = { @@ -1246,13 +1246,13 @@ let sha512 = "k1WGfKRQyhJpIr+P17O5vLIo2ko1PFLKwoetatdduUSt/aQ4J2sJrJwwatdI5Z3SiYk/mRH9S3JpdmMFd/IK4g=="; }; }; - "@evocateur/pacote-9.6.3" = { + "@evocateur/pacote-9.6.5" = { name = "_at_evocateur_slash_pacote"; packageName = "@evocateur/pacote"; - version = "9.6.3"; + version = "9.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/@evocateur/pacote/-/pacote-9.6.3.tgz"; - sha512 = "ExqNqcbdHQprEgKnY/uQz7WRtyHRbQxRl4JnVkSkmtF8qffRrF9K+piZKNLNSkRMOT/3H0e3IP44QVCHaXMWOQ=="; + url = "https://registry.npmjs.org/@evocateur/pacote/-/pacote-9.6.5.tgz"; + sha512 = "EI552lf0aG2nOV8NnZpTxNo2PcXKPmDbF9K8eCBFQdIZwHNGN/mi815fxtmUMa2wTa1yndotICIDt/V0vpEx2w=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -1273,58 +1273,49 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; - "@hapi/address-2.0.0" = { + "@hapi/address-2.1.1" = { name = "_at_hapi_slash_address"; packageName = "@hapi/address"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/address/-/address-2.0.0.tgz"; - sha512 = "mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw=="; + url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.1.tgz"; + sha512 = "DYuHzu978pP1XW1GD3HGvLnAFjbQTIgc2+V153FGkbS2pgo9haigCdwBnUDrbhaOkgiJlbZvoEqDrcxSLHpiWA=="; }; }; - "@hapi/hoek-6.2.4" = { - name = "_at_hapi_slash_hoek"; - packageName = "@hapi/hoek"; - version = "6.2.4"; + "@hapi/bourne-1.3.2" = { + name = "_at_hapi_slash_bourne"; + packageName = "@hapi/bourne"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-6.2.4.tgz"; - sha512 = "HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A=="; + url = "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz"; + sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; }; }; - "@hapi/hoek-8.1.0" = { + "@hapi/hoek-8.2.4" = { name = "_at_hapi_slash_hoek"; packageName = "@hapi/hoek"; - version = "8.1.0"; + version = "8.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.1.0.tgz"; - sha512 = "b1J4jxYnW+n6lC91V6Pqg9imP9BZq0HNCeM+3sbXg05rQsE9cGYrKFpZjyztVesGmNRE6R+QaEoWGATeIiUVjA=="; + url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.2.4.tgz"; + sha512 = "Ze5SDNt325yZvNO7s5C4fXDscjJ6dcqLFXJQ/M7dZRQCewuDj2iDUuBi6jLQt+APbW9RjjVEvLr35FXuOEqjow=="; }; }; - "@hapi/joi-15.1.0" = { + "@hapi/joi-15.1.1" = { name = "_at_hapi_slash_joi"; packageName = "@hapi/joi"; - version = "15.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.0.tgz"; - sha512 = "n6kaRQO8S+kepUTbXL9O/UOL788Odqs38/VOfoCrATDtTvyfiO3fgjlSRaNkHabpTLgM7qru9ifqXlXbXk8SeQ=="; - }; - }; - "@hapi/marker-1.0.0" = { - name = "_at_hapi_slash_marker"; - packageName = "@hapi/marker"; - version = "1.0.0"; + version = "15.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/marker/-/marker-1.0.0.tgz"; - sha512 = "JOfdekTXnJexfE8PyhZFyHvHjt81rBFSAbTIRAhF2vv/2Y1JzoKsGqxH/GpZJoF7aEfYok8JVcAHmSz1gkBieA=="; + url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz"; + sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; }; }; - "@hapi/topo-3.1.2" = { + "@hapi/topo-3.1.3" = { name = "_at_hapi_slash_topo"; packageName = "@hapi/topo"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.2.tgz"; - sha512 = "r+aumOqJ5QbD6aLPJWqVjMAPsx5pZKz+F5yPqXZ/WWG9JTtHbQqlzrJoknJ0iJxLj9vlXtmpSdjlkszseeG8OA=="; + url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.3.tgz"; + sha512 = "JmS9/vQK6dcUYn7wc2YZTqzIKubAQcJKu2KCKAru6es482U5RT5fP1EXCPtlXpiK7PR0On/kpQKI4fRKkzpZBQ=="; }; }; "@iarna/toml-2.2.3" = { @@ -1336,94 +1327,94 @@ let sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg=="; }; }; - "@ionic/cli-framework-2.1.2" = { + "@ionic/cli-framework-2.1.6" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "2.1.2"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.2.tgz"; - sha512 = "PQZ5+T2ccVHTA3tnuGOarQhjB6lkeU9SaVzbkgyUHzBxadfenLFffEyLz7WHaLVQfR2po19NIJ2Hy8dIFKepig=="; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.6.tgz"; + sha512 = "V0jkrOXfPes0N1ECmiWDgcRZSaWq7PUFCctMNNqe4xwbQ61aDNypEIQCvVdgIk16zVBKrMI4EP94Qplvi6CYGw=="; }; }; - "@ionic/discover-2.0.2" = { + "@ionic/discover-2.0.5" = { name = "_at_ionic_slash_discover"; packageName = "@ionic/discover"; - version = "2.0.2"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.2.tgz"; - sha512 = "W4AMv6bmJzKtAz92m7XA+6rCkvO/9Q6+BJzrO9KD3qIt4rIH//CZP05yFK79XlqI3Vt4Ke0GsqBDuEfgBXaN/Q=="; + url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.5.tgz"; + sha512 = "4gVq4UvCHzgQtE0Sffc6MZiwDE9XjWhYsKm81h85dz/iVT4sx0c5fFvJzGXg7OFHCsVN2PhmlIwdgmYetqB5Ow=="; }; }; - "@ionic/utils-array-1.0.1" = { + "@ionic/utils-array-1.2.0" = { name = "_at_ionic_slash_utils-array"; packageName = "@ionic/utils-array"; - version = "1.0.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.0.1.tgz"; - sha512 = "XqGhwcGS5XwXpQbGi1K97UY1bBZLYlj/DQ5HVE6551C6QF6PRM8WAlpKs4m4Y1MZ5FRLbZOSykcx6q4mlFF5FA=="; + url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.0.tgz"; + sha512 = "wJfshi287FRjZM43+w3OkMl4n7hDTmK/9Jxm9Ot5hBDgeLP6Fw/OBb6tt+nGjhRBJbk1oOi7ksJgyBw/+1ldzg=="; }; }; - "@ionic/utils-fs-2.0.3" = { + "@ionic/utils-fs-2.0.6" = { name = "_at_ionic_slash_utils-fs"; packageName = "@ionic/utils-fs"; - version = "2.0.3"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.3.tgz"; - sha512 = "vTZ7ckBWAPyhOQ/EQKtQK2WdTaNdOJHtHLebOoFLy0Bl/fWlqNAaaLfc9IXkp+eGwYBmpa9t48bHjiHtF1IT5Q=="; + url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.6.tgz"; + sha512 = "iU1UwU5NW2nlLvNNE3QoeH6I+wN3a4ypHFcS6Bp7qUDENeI+oTxHzVHKHM6qt7T/24TFLNcHVxcq/pGIt7vgOA=="; }; }; - "@ionic/utils-network-1.0.1" = { + "@ionic/utils-network-1.0.4" = { name = "_at_ionic_slash_utils-network"; packageName = "@ionic/utils-network"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.1.tgz"; - sha512 = "3fqq+2SzlWRpf4029Cry86D/Vb/hTc2zO90GtFlCU+3az2IpGQOzGeVrZ8az9pgzROY/hDfdL6VUsvwF4MF20g=="; + url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.4.tgz"; + sha512 = "VDWlschcLc6t71AAk54ywycVwahRv2qK82DOxdiN02YwurqXclcT2wmZCjnzAgBOPEepqmxj0mKozPA9YYWcbg=="; }; }; - "@ionic/utils-object-1.0.1" = { + "@ionic/utils-object-1.0.4" = { name = "_at_ionic_slash_utils-object"; packageName = "@ionic/utils-object"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.1.tgz"; - sha512 = "SIc8bqsCJA8+zsIPS34TmgTJg0WyqkJzcSEZTdfpMPS+qPq/Sm2yaeDGRhlXGRnfDckulRiCK3mhW2dfNPTGhQ=="; + url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.4.tgz"; + sha512 = "B05kWS+Uj0rGrvG1RvAzDBuggstmWM0X4OUb3p9GhZJJQsNK2/0W03VfPOkNuaDi15NF/WFwLS7/yp7kM25mTw=="; }; }; - "@ionic/utils-process-1.0.1" = { + "@ionic/utils-process-1.0.4" = { name = "_at_ionic_slash_utils-process"; packageName = "@ionic/utils-process"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.1.tgz"; - sha512 = "kEAte96A5xBA0wJX35ykHERgc4KkYS4Xiq7XsSMo3inBbN2rNUkRIzC+aFM3IFeNKtCqgNgh7t9LczvLDEzdiQ=="; + url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.4.tgz"; + sha512 = "F70r4Dup0yz03lDVCiRva2Qz7+VXNtUnfx7pfIFaDQv54sUem7ozG6zl4db5EE3a4RAJUCbM5YQFsAojnEUc+g=="; }; }; - "@ionic/utils-stream-2.0.0" = { + "@ionic/utils-stream-2.0.3" = { name = "_at_ionic_slash_utils-stream"; packageName = "@ionic/utils-stream"; - version = "2.0.0"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.0.tgz"; - sha512 = "xUMsvW6/5R3NpWJD6wkT/324PQ2RU9if9b4SjBgrSBrgKWEiwXopz6JihjRwh1Xq2qn5MiV+2eXSgpq5jnhX0w=="; + url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.3.tgz"; + sha512 = "Y1OAcJwP8uNCYQiRxywfo85jdOVbfdvRwjuvFVupFrLQet6kOBKh9wHHnivoS9du+Wlq4VjuFh03LmmAaHwenA=="; }; }; - "@ionic/utils-subprocess-1.0.3" = { + "@ionic/utils-subprocess-1.0.7" = { name = "_at_ionic_slash_utils-subprocess"; packageName = "@ionic/utils-subprocess"; - version = "1.0.3"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.3.tgz"; - sha512 = "JX65/RBWM/25k0Cum61aFalpcWCymX0uDf7B3rBT7ptzuEdawOrA2ho0t3J4wXgCqmHy+Pq0woaAqwg8rccDKw=="; + url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.7.tgz"; + sha512 = "QXCqdwSSGiyxgs36faSbxiVIRCUBI6ckmCSWSLRGZAo4EZ7MuPQUqU+oVILkTWTOPAMWNcJtS67zJNMTccsSUg=="; }; }; - "@ionic/utils-terminal-1.0.1" = { + "@ionic/utils-terminal-1.0.4" = { name = "_at_ionic_slash_utils-terminal"; packageName = "@ionic/utils-terminal"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.1.tgz"; - sha512 = "y/mEpPNPW2oYfFGtFTCRbZAmp0Go17S7uNUFGKThV397lmHm3yiPiu0M5cDV9v/UDuOZ7nmz3LqwhtIaPPeK9g=="; + url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.4.tgz"; + sha512 = "+iJbFff7mnJ6ROE465+/DG8eweFmINVy69Bdw9fr8Vcf8WhJWxMw0vd59J/gaUSsHuxoufZYftVXVoWUd8RfWA=="; }; }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { @@ -1975,58 +1966,58 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; - "@node-red/editor-api-0.20.7" = { + "@node-red/editor-api-0.20.8" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-0.20.7.tgz"; - sha512 = "wGuJJ9eyFwHT1PHFOzp+VvXm3MhwKUfxB2uoc6668aKSHILcoOTnOc+i+JUlXxPe2zVu9zulgRiSkrWhDAO2Qw=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-0.20.8.tgz"; + sha512 = "VaetYYU/gu4CgUs80ymiBg9BVw4Ge4kYF4NPgs4S8t/c1BRz2ZZd5idCDw7MaN602eDiYnspx3QMH8X3sqYsTQ=="; }; }; - "@node-red/editor-client-0.20.7" = { + "@node-red/editor-client-0.20.8" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-0.20.7.tgz"; - sha512 = "svF01v6Mn1MYv5bSg/zL86ToCG2yZW3/7SqWTe4cJ1MRCRvllAb1IVCFnWm8sQcgfOGmaLT9q4Jsgb5HAF8M/w=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-0.20.8.tgz"; + sha512 = "TyZ+ma0jRU/T0BChpl17hHa0cMOnPX9DYFbpyT8p5ghRHIHYYL/3rFFflwB+5bAwbK1Y8Z2LKB7dngzL7jzpTQ=="; }; }; - "@node-red/nodes-0.20.7" = { + "@node-red/nodes-0.20.8" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-0.20.7.tgz"; - sha512 = "ZDokAULh6Y+d+8WbjQoYXikinXrV/KVv/q2UGculSgDuDWNIju0A8hQyGBQ3fSBe7PIahl/G4B7Znc4ds1HtEg=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-0.20.8.tgz"; + sha512 = "yR+kNSkUQowQLHpk7buY36Pz5utA3q3n/49LvgvyxxRwgOPUBv4KNaFLDipUjqgD2spaznh+VTAMT8UUO0xeig=="; }; }; - "@node-red/registry-0.20.7" = { + "@node-red/registry-0.20.8" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-0.20.7.tgz"; - sha512 = "TdZVO7DSe21FcF/97zJWVVVaZ7M/z1bbai2vNDIyJA4BFKRadUsCVCkRjgOfJTrmcrvwTqhLKI2yZ53Ovty4HQ=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-0.20.8.tgz"; + sha512 = "3B5wYJOAWNLa3qhzdFZYqHa8X2+U4mdno6f0GQ2vzaNMdcxM9VvkpXLvmnThcQJsYqbxAiwuaUZUL1mX0KePsA=="; }; }; - "@node-red/runtime-0.20.7" = { + "@node-red/runtime-0.20.8" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-0.20.7.tgz"; - sha512 = "q5VNbwPJfSlBMvY4M31Q0EFvCbM85r28lFBQVqY6Qqqh7QgxFKzJWGfkvqg9GBjUo+Wx1QfdMYJxBZlTmYMARg=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-0.20.8.tgz"; + sha512 = "R7X3E8VXGlzXbYd0hTqhgU8rzyc2uNXDb3u37C3rduCViotcKWrQho4n/UdQS4H+T1Bu0H6Zoo+1EGAsQ92nGA=="; }; }; - "@node-red/util-0.20.7" = { + "@node-red/util-0.20.8" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-0.20.7.tgz"; - sha512 = "LWFC7wFgm0mZJhv+oSELnmRnFawgAByJA6GCdAOnMSLEHJfqcprSHEIYj+S4/rUnS0xjRgL8FO9D+kOWsgVK0A=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-0.20.8.tgz"; + sha512 = "tid1o8fy94b6XU6/8cVDm5Kn9tNWm1AoaLPrhfDxJaObtrcHC6KtEhJJxPq61nhzZxJOuT/DHqBUGwTXTKg7Zg=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -2038,13 +2029,13 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@octokit/endpoint-5.3.2" = { + "@octokit/endpoint-5.3.5" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "5.3.2"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.2.tgz"; - sha512 = "gRjteEM9I6f4D8vtwU2iGUTn9RX/AJ0SVXiqBUEuYEWVGGAVjSXdT0oNmghH5lvQNWs8mwt6ZaultuG6yXivNw=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.5.tgz"; + sha512 = "f8KqzIrnzPLiezDsZZPB+K8v8YSv6aKFl7eOu59O46lmlW4HagWl1U6NWl6LmT8d1w7NsKBI3paVtzcnRGO1gw=="; }; }; "@octokit/plugin-enterprise-rest-3.6.2" = { @@ -2056,13 +2047,13 @@ let sha512 = "3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA=="; }; }; - "@octokit/request-5.0.2" = { + "@octokit/request-5.1.0" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.0.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.0.2.tgz"; - sha512 = "z1BQr43g4kOL4ZrIVBMHwi68Yg9VbkRUyuAgqCp1rU3vbYa69+2gIld/+gHclw15bJWQnhqqyEb7h5a5EqgZ0A=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.1.0.tgz"; + sha512 = "I15T9PwjFs4tbWyhtFU2Kq7WDPidYMvRB7spmxoQRZfxSmiqullG+Nz+KbSmpkfnlvHwTr1e31R5WReFRKMXjg=="; }; }; "@octokit/request-error-1.0.4" = { @@ -2074,13 +2065,13 @@ let sha512 = "L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig=="; }; }; - "@octokit/rest-16.28.7" = { + "@octokit/rest-16.28.9" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.28.7"; + version = "16.28.9"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.7.tgz"; - sha512 = "cznFSLEhh22XD3XeqJw51OLSfyL2fcFKUO+v2Ep9MTAFfFLS1cK1Zwd1yEgQJmJoDnj4/vv3+fGGZweG+xsbIA=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.9.tgz"; + sha512 = "IKGnX+Tvzt7XHhs8f4ajqxyJvYAMNX5nWfoJm4CQj8LZToMiaJgutf5KxxpxoC3y5w7JTJpW5rnWnF4TsIvCLA=="; }; }; "@parcel/fs-1.11.0" = { @@ -2218,31 +2209,94 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@sailshq/lodash-3.10.3" = { + "@sailshq/lodash-3.10.4" = { name = "_at_sailshq_slash_lodash"; packageName = "@sailshq/lodash"; - version = "3.10.3"; + version = "3.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@sailshq/lodash/-/lodash-3.10.3.tgz"; - sha512 = "XTF5BtsTSiSpTnfqrCGS5Q8FvSHWCywA0oRxFAZo8E1a8k1MMFUvk3VlRk3q/SusEYwy7gvVdyt9vvNlTa2VuA=="; + url = "https://registry.npmjs.org/@sailshq/lodash/-/lodash-3.10.4.tgz"; + sha512 = "YXJqp9gdHcZKAmBY/WnwFpPtNQp2huD/ME2YMurH2YHJvxrVzYsmpKw/pb7yINArRpp8E++fwbQd3ajYXGA45Q=="; }; }; - "@schematics/angular-8.2.0" = { + "@schematics/angular-8.3.4" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "8.2.0"; + version = "8.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.2.0.tgz"; - sha512 = "DOo2wtk9fk0kHCDA/I+/mRrGKirgeqVhDbgOV4d2gbYSAiTl0s1Gb4eFAkJeovQTlARfaL2PIqDDkNeYjc7xpw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.4.tgz"; + sha512 = "/HO6vZosULsJnwZLG9JLePyaR2g4MePrk27c3H/WbFNN4ajBePe1Mj34q6HCzje30NduLV8B3SykPnG1CoNy5Q=="; }; }; - "@schematics/update-0.802.0" = { + "@schematics/update-0.803.4" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.802.0"; + version = "0.803.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.4.tgz"; + sha512 = "ZLCUR7VpUkv3zjeOmcny3UAtwHbQLeBeDsoLYIVQZyepqk3kRPBGaW/xYwmNng04bVfMCtcTx9yrs7n4+Lt/Iw=="; + }; + }; + "@serverless/cli-1.2.1" = { + name = "_at_serverless_slash_cli"; + packageName = "@serverless/cli"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.2.1.tgz"; + sha512 = "+Ip9UsmrH2e6Q36ZHmeEWu4ez36Srl1hgeaM6t6YPGJlNRNFw650Xt43K5EAZpWVvGJNYuNaQs9FZs4ZnakLgQ=="; + }; + }; + "@serverless/component-metrics-1.0.8" = { + name = "_at_serverless_slash_component-metrics"; + packageName = "@serverless/component-metrics"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/component-metrics/-/component-metrics-1.0.8.tgz"; + sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; + }; + }; + "@serverless/core-1.0.0" = { + name = "_at_serverless_slash_core"; + packageName = "@serverless/core"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/core/-/core-1.0.0.tgz"; + sha512 = "XP5KXvEGlrNIOV/KJ0KKwzeov9MqZQ+Ck3z7JW/gtd8ryoKK+5+ah2WL77DXETeHeEwxZhJdrNatqc0FXauEiw=="; + }; + }; + "@serverless/enterprise-plugin-2.0.0" = { + name = "_at_serverless_slash_enterprise-plugin"; + packageName = "@serverless/enterprise-plugin"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-2.0.0.tgz"; + sha512 = "jfTXC3eAFkgXbsHfDwLr6od3evwnmz0KhVs/p5HXXh37BGX8ETVFUoWsrIOf92flbGDPBEyzcHXX5cfNBlfNKA=="; + }; + }; + "@serverless/event-mocks-1.1.1" = { + name = "_at_serverless_slash_event-mocks"; + packageName = "@serverless/event-mocks"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/event-mocks/-/event-mocks-1.1.1.tgz"; + sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; + }; + }; + "@serverless/platform-sdk-2.1.1" = { + name = "_at_serverless_slash_platform-sdk"; + packageName = "@serverless/platform-sdk"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.802.0.tgz"; - sha512 = "vMcFLTuw9jSlWQq6nNgMQi2fT/wGyaucvjkxFAs7pC+lyRwYws3IkOukbET7WeJ3ix0ZBEhMbPJ8EibUNDITjw=="; + url = "https://registry.npmjs.org/@serverless/platform-sdk/-/platform-sdk-2.1.1.tgz"; + sha512 = "bWmXwhUmnDxY4A5zFKinbBQaPcMbxd5i07i8nyJUDjvr8F8gB9fo2n5A20c1ahOIEiFntBRC9y4/6fxNjIsXqQ=="; + }; + }; + "@serverless/template-1.1.0" = { + name = "_at_serverless_slash_template"; + packageName = "@serverless/template"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/template/-/template-1.1.0.tgz"; + sha512 = "ezrtGAf1pKXKfsd+o381L2HAtVxhmXlm59rq7iBPosqChrrE8NI081IIMNTi93JLpTULZaSCRLMDMwVrCJ0ZMw=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -2272,6 +2326,15 @@ let sha512 = "CWr7a3rTVrN5Vs8GYReRAvTourbXHOqB1zglcskj05ICH4GZL5BOAza2ARai+qc3Nz0nY08Bozi1x0014KOqlg=="; }; }; + "@snyk/cli-interface-2.1.0" = { + name = "_at_snyk_slash_cli-interface"; + packageName = "@snyk/cli-interface"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.1.0.tgz"; + sha512 = "b/magC8iNQP9QhSDeV9RQDSaY3sNy57k0UH1Y/sMOSvVLHLsA7dOi/HrPWTiLouyGqcuYzwjkz7bNbu8cwmVDQ=="; + }; + }; "@snyk/composer-lockfile-parser-1.0.3" = { name = "_at_snyk_slash_composer-lockfile-parser"; packageName = "@snyk/composer-lockfile-parser"; @@ -2560,13 +2623,22 @@ let sha512 = "6BmYWSBea18+tSjjSC3QIyV93ZKAeNWGM7R6aYt1ryTZXrlHF+QLV0G2yV0viEGVyRkyQsWfMoJ0k/YghBX5sQ=="; }; }; - "@types/body-parser-1.17.0" = { + "@types/body-parser-1.17.1" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; - version = "1.17.0"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz"; + sha512 = "RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w=="; + }; + }; + "@types/bunyan-1.8.6" = { + name = "_at_types_slash_bunyan"; + packageName = "@types/bunyan"; + version = "1.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz"; - sha512 = "a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w=="; + url = "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.6.tgz"; + sha512 = "YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ=="; }; }; "@types/connect-3.4.32" = { @@ -2587,31 +2659,31 @@ let sha512 = "aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw=="; }; }; - "@types/cookies-0.7.2" = { + "@types/cookies-0.7.3" = { name = "_at_types_slash_cookies"; packageName = "@types/cookies"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.2.tgz"; - sha512 = "jnihWgshWystcJKrz8C9hV+Ot9lqOUyAh2RF+o3BEo6K6AS2l4zYCb9GYaBuZ3C6Il59uIGqpE3HvCun4KKeJA=="; + url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.3.tgz"; + sha512 = "NEkYn8pNsYZIxf3ZrjdPoeyueiPc0RbQClUpTwmdHkpmQQ8iDAlQYKpabuegHy7BJcqTteSTkhURMEs9ZxyEWg=="; }; }; - "@types/cors-2.8.5" = { + "@types/cors-2.8.6" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.5"; + version = "2.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.5.tgz"; - sha512 = "GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.6.tgz"; + sha512 = "invOmosX0DqbpA+cE2yoHGUlF/blyf7nB0OGYBBiH27crcVm5NmFaZkLP4Ta1hGaesckCi5lVLlydNJCxkTOSg=="; }; }; - "@types/debug-4.1.4" = { + "@types/debug-4.1.5" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.4.tgz"; - sha512 = "D9MyoQFI7iP5VdpEyPZyjjqIJ8Y8EDNQFIFVLOmeg1rI1xiHOChyUPMPRUVfqFCerxfE+yS3vMyj37F6IdtOoQ=="; + url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz"; + sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ=="; }; }; "@types/estree-0.0.39" = { @@ -2632,22 +2704,31 @@ let sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; }; }; - "@types/express-4.17.0" = { + "@types/express-4.17.1" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.0"; + version = "4.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.0.tgz"; - sha512 = "CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.1.tgz"; + sha512 = "VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w=="; }; }; - "@types/express-serve-static-core-4.16.7" = { + "@types/express-serve-static-core-4.16.9" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.16.7"; + version = "4.16.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz"; - sha512 = "847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz"; + sha512 = "GqpaVWR0DM8FnRUJYKlWgyARoBUAVfRIeVDZQKOttLFp5SmhhF9YFIYeTPwMd/AXfxlP7xVO2dj1fGu0Q+krKQ=="; + }; + }; + "@types/fs-capacitor-2.0.0" = { + name = "_at_types_slash_fs-capacitor"; + packageName = "@types/fs-capacitor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/fs-capacitor/-/fs-capacitor-2.0.0.tgz"; + sha512 = "FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ=="; }; }; "@types/glob-7.1.1" = { @@ -2659,31 +2740,22 @@ let sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; }; }; - "@types/graphql-14.2.3" = { - name = "_at_types_slash_graphql"; - packageName = "@types/graphql"; - version = "14.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/graphql/-/graphql-14.2.3.tgz"; - sha512 = "UoCovaxbJIxagCvVfalfK7YaNhmxj3BQFRQ2RHQKLiu+9wNXhJnlbspsLHt/YQM99IaLUUFJNzCwzc6W0ypMeQ=="; - }; - }; - "@types/graphql-upload-8.0.0" = { + "@types/graphql-upload-8.0.3" = { name = "_at_types_slash_graphql-upload"; packageName = "@types/graphql-upload"; - version = "8.0.0"; + version = "8.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.0.tgz"; - sha512 = "xeDYfZb0SeRpCRuivN9TXLEVsbG0F4inFtx03yadZeaTXr1kC224/ZvlV6NKqQ//HNvUxneYcEoUB5ugJc8dnA=="; + url = "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.3.tgz"; + sha512 = "hmLg9pCU/GmxBscg8GCr1vmSoEmbItNNxdD5YH2TJkXm//8atjwuprB+xJBK714JG1dkxbbhp5RHX+Pz1KsCMA=="; }; }; - "@types/http-assert-1.5.0" = { + "@types/http-assert-1.5.1" = { name = "_at_types_slash_http-assert"; packageName = "@types/http-assert"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.0.tgz"; - sha512 = "8CBLG8RmxSvoY07FE6M/QpvJ7J5KzeKqF8eWN7Dq6Ks+lBTQae8Roc2G81lUu2Kw5Ju1gymOuvgyUsussbjAaA=="; + url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz"; + sha512 = "PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ=="; }; }; "@types/keygrip-1.0.1" = { @@ -2713,6 +2785,15 @@ let sha512 = "ioou0rxkuWL+yBQYsHUQAzRTfVxAg8Y2VfMftU+Y3RA03/MzuFL0x/M2sXXj3PkfnENbHsjeHR1aMdezLYpTeA=="; }; }; + "@types/lodash-4.14.138" = { + name = "_at_types_slash_lodash"; + packageName = "@types/lodash"; + version = "4.14.138"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.138.tgz"; + sha512 = "A4uJgHz4hakwNBdHNPdxOTkYmXNgmUAKLbXZ7PKGslgeV0Mb8P3BlbYfPovExek1qnod4pDfRbxuzcVs3dlFLg=="; + }; + }; "@types/long-4.0.0" = { name = "_at_types_slash_long"; packageName = "@types/long"; @@ -2740,22 +2821,22 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-10.14.14" = { + "@types/node-10.14.18" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.14.14"; + version = "10.14.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.14.14.tgz"; - sha512 = "xXD08vZsvpv4xptQXj1+ky22f7ZoKu5ZNI/4l+/BXG3X+XaeZsmaFbbTKuhSE3NjjvRuZFxFf9sQBMXIcZNFMQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.14.18.tgz"; + sha512 = "ryO3Q3++yZC/+b8j8BdKd/dn9JlzlHBPdm80656xwYUdmPkpTGTjkAdt6BByiNupGPE8w0FhBgvYy/fX9hRNGQ=="; }; }; - "@types/node-12.6.9" = { + "@types/node-12.7.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.6.9"; + version = "12.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.6.9.tgz"; - sha512 = "+YB9FtyxXGyD54p8rXwWaN1EWEyar5L58GlGWgtH2I9rGmLGBQcw63+0jw+ujqVavNuO47S1ByAjm9zdHMnskw=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz"; + sha512 = "9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w=="; }; }; "@types/node-6.14.7" = { @@ -2767,13 +2848,13 @@ let sha512 = "YbPXbaynBTe0pVExPhL76TsWnxSPeFAvImIsmylpBWn/yfw+lHy+Q68aawvZHsgskT44ZAoeE67GM5f+Brekew=="; }; }; - "@types/node-8.10.51" = { + "@types/node-8.10.54" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.51"; + version = "8.10.54"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.51.tgz"; - sha512 = "cArrlJp3Yv6IyFT/DYe+rlO8o3SIHraALbBW/+CcCYW/a9QucpLI+n2p4sRxAvl2O35TiecpX2heSZtJjvEO+Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.54.tgz"; + sha512 = "kaYyLYf6ICn6/isAyD4K1MyWWd5Q3JgH6bnMN089LUx88+s4W8GvK9Q6JMBVu5vsFFp7pMdSxdKmlBXwH/VFRg=="; }; }; "@types/q-1.5.2" = { @@ -2794,13 +2875,31 @@ let sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; - "@types/serve-static-1.13.2" = { + "@types/restify-4.3.6" = { + name = "_at_types_slash_restify"; + packageName = "@types/restify"; + version = "4.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/restify/-/restify-4.3.6.tgz"; + sha512 = "4l4f0EXnleXQttlhRCXtTuJ8UelsKiAKIK2AAEd2epBHu41aEbM0U2z6E5tUrNwlbxz7qaNBISduGMeg+G3PaA=="; + }; + }; + "@types/semver-5.5.0" = { + name = "_at_types_slash_semver"; + packageName = "@types/semver"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz"; + sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ=="; + }; + }; + "@types/serve-static-1.13.3" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.2"; + version = "1.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.2.tgz"; - sha512 = "/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz"; + sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g=="; }; }; "@types/superagent-3.8.2" = { @@ -2839,13 +2938,22 @@ let sha512 = "mlGER3Aqmq7bqR1tTTIVHq8KSAFFRyGbrxuM8C/H82g6k7r2fS+IMEkIu3D7JHzG10NvPdR8DNx0jr0pwpp4dA=="; }; }; - "@types/ws-6.0.2" = { + "@types/ws-6.0.3" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.2.tgz"; - sha512 = "22XiR1ox9LftTaAtn/c5JCninwc7moaqbkJfaDUb7PkaUitcf5vbTZHdq9dxSMviCm9C3W85rzB8e6yNR70apQ=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.3.tgz"; + sha512 = "yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w=="; + }; + }; + "@types/xml2js-0.4.3" = { + name = "_at_types_slash_xml2js"; + packageName = "@types/xml2js"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.3.tgz"; + sha512 = "Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g=="; }; }; "@types/zen-observable-0.8.0" = { @@ -2857,40 +2965,40 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-3.10.0" = { + "@vue/cli-shared-utils-3.11.0" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.10.0.tgz"; - sha512 = "i96XBUtLdWeKFCC/ot12ngqnVikN/dXpelGdyxvNZczCkX7Je0FUdrZkiw0+uTYTu1RmuYWpLs+vb/YQerjiWg=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.11.0.tgz"; + sha512 = "D7pst/4v9H1DD66fLxlZOwRR09R03MV0ROdKxBHmh3FmnApCA/RiaolFA/8w+B3CnevYMlV3SJ5fOAgedbswbA=="; }; }; - "@vue/cli-ui-3.10.0" = { + "@vue/cli-ui-3.11.0" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.10.0.tgz"; - sha512 = "Tekgh54ClA+x3ey3H1td/RVhGt9MG02/z/OtG+q2Dcy9j47bscDDiTv3OJgw64WrH5tqz1aKEA/SibxL9ehS+Q=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.11.0.tgz"; + sha512 = "mbCUUOJSPGLQ+wxPTX+NE6HsiCpt3wpv56AuUlCv14mUEkm98p+4xzkgPQ1neYxG7fg5Vn8fExiFvge73Lvzdg=="; }; }; - "@vue/cli-ui-addon-webpack-3.10.0" = { + "@vue/cli-ui-addon-webpack-3.11.0" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.10.0.tgz"; - sha512 = "c930BWpeFu1H+mbUZT4VSLngD95yaOAg9qr21Kq1KMZ3CW7gakbttwpgXjn8edwdkvUl65IpSkdh/n/XyYyXxg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.11.0.tgz"; + sha512 = "q0kELq8c6nPAM74J2NELxn9NdaQ0bqYS9l8EsvLbqfTd/GM7leWytkdO6GYClu1VJ3Ohm3xQsKjpDHCcKSW7tw=="; }; }; - "@vue/cli-ui-addon-widgets-3.10.0" = { + "@vue/cli-ui-addon-widgets-3.11.0" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.10.0.tgz"; - sha512 = "FvPB05n8Gp0TbvWPXnlwcQPSLZIwEY+Mzwh0pMDTN9yoxnf+/xhIt2PwRmFtecIBqyBZAIyYI50wmCxs9c2Hbw=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.11.0.tgz"; + sha512 = "iEKaaWyGafYmHJKDd2rISSqMw61L3XX9E9Vo/sVWK0uVITTsSyBmNwZeTcaaEB6YVbZeCHRJtq2Q/JRjvD9SPA=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -3370,13 +3478,13 @@ let sha1 = "5faad9c2c07f60dd76770f71cf025b62a63cfd4e"; }; }; - "abab-2.0.0" = { + "abab-2.0.1" = { name = "abab"; packageName = "abab"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz"; - sha512 = "sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w=="; + url = "https://registry.npmjs.org/abab/-/abab-2.0.1.tgz"; + sha512 = "1zSbbCuoIjafKZ3mblY5ikvAb0ODUbqBnFuUb7f6uLeQhhGJ0vEV4ntmtxKLT2WgXCO94E07BjunsIw1jOMPZw=="; }; }; "abbrev-1.1.1" = { @@ -3415,6 +3523,15 @@ let sha512 = "jzewKKpZbaYUa6HTThnrl+GrJhzjEAeuc7hTVpZdzg7kupXZFoqQDFwyOwLNbmJKJlmzw8yiipMPkDiuKkT06Q=="; }; }; + "abstract-leveldown-6.1.1" = { + name = "abstract-leveldown"; + packageName = "abstract-leveldown"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.1.1.tgz"; + sha512 = "7fK/KySVqzKIomdhkSWzX4YBQhzkzEMbWSiaB6mSN9e+ZdV3KEeKxia/8xQzCkATA5xnnukdP88cFR0D2FsFXw=="; + }; + }; "abstract-logging-1.0.0" = { name = "abstract-logging"; packageName = "abstract-logging"; @@ -3442,15 +3559,6 @@ let sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; }; }; - "accepts-1.3.3" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"; - sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; - }; - }; "accepts-1.3.7" = { name = "accepts"; packageName = "accepts"; @@ -3514,22 +3622,22 @@ let sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; }; }; - "acorn-6.2.1" = { + "acorn-6.3.0" = { name = "acorn"; packageName = "acorn"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz"; - sha512 = "JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q=="; + url = "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz"; + sha512 = "/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="; }; }; - "acorn-dynamic-import-4.0.0" = { - name = "acorn-dynamic-import"; - packageName = "acorn-dynamic-import"; - version = "4.0.0"; + "acorn-7.0.0" = { + name = "acorn"; + packageName = "acorn"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz"; - sha512 = "d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz"; + sha512 = "PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ=="; }; }; "acorn-globals-1.0.9" = { @@ -3550,13 +3658,13 @@ let sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf"; }; }; - "acorn-globals-4.3.3" = { + "acorn-globals-4.3.4" = { name = "acorn-globals"; packageName = "acorn-globals"; - version = "4.3.3"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz"; - sha512 = "vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ=="; + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz"; + sha512 = "clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A=="; }; }; "acorn-jsx-3.0.1" = { @@ -3568,13 +3676,13 @@ let sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; - "acorn-jsx-5.0.1" = { + "acorn-jsx-5.0.2" = { name = "acorn-jsx"; packageName = "acorn-jsx"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz"; - sha512 = "HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg=="; + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz"; + sha512 = "tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw=="; }; }; "acorn-loose-6.1.0" = { @@ -3586,13 +3694,13 @@ let sha512 = "FHhXoiF0Uch3IqsrnPpWwCtiv5PYvipTpT1k9lDMgQVVYc9iDuSl5zdJV358aI8twfHCYMFBRVYvAVki9wC/ng=="; }; }; - "acorn-node-1.7.0" = { + "acorn-node-1.8.2" = { name = "acorn-node"; packageName = "acorn-node"; - version = "1.7.0"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.7.0.tgz"; - sha512 = "XhahLSsCB6X6CJbe+uNu3Mn9sJBNFxtBN9NLgAOQovfS6Kh0lDUtmlclhjn9CvEK7A7YyRU13PXlNcpSiLI9Yw=="; + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz"; + sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A=="; }; }; "acorn-walk-6.2.0" = { @@ -3604,6 +3712,15 @@ let sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="; }; }; + "acorn-walk-7.0.0" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.0.0.tgz"; + sha512 = "7Bv1We7ZGuU79zZbb6rRqcpxo3OY+zrdtloZWoyD8fmGX+FeXRjE+iuGkZjSXLVovLzrsvMGMy0EkwA0E0umxg=="; + }; + }; "adal-node-0.1.28" = { name = "adal-node"; packageName = "adal-node"; @@ -4180,13 +4297,13 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; - "ansi-styles-4.0.0" = { + "ansi-styles-4.1.0" = { name = "ansi-styles"; packageName = "ansi-styles"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.0.0.tgz"; - sha512 = "8zjUtFJ3db/QoPXuuEMloS2AUf79/yeyttJ7Abr3hteopJu9HK8vsgGviGUMq+zyA6cZZO6gAyZoMTF6TgaEjA=="; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.1.0.tgz"; + sha512 = "Qts4KCLKG+waHc9C4m07weIY8qyeixoS0h6RnbsNVD6Fw+pEZGW3vTyObL3WXpE09Mq4Oi7/lBEyLmOiLtlYWQ=="; }; }; "ansi-term-0.0.2" = { @@ -4261,13 +4378,13 @@ let sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; }; }; - "anymatch-3.0.3" = { + "anymatch-3.1.0" = { name = "anymatch"; packageName = "anymatch"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz"; - sha512 = "c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g=="; + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.0.tgz"; + sha512 = "Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA=="; }; }; "ap-0.1.0" = { @@ -4306,31 +4423,31 @@ let sha512 = "+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg=="; }; }; - "apollo-cache-control-0.8.1" = { + "apollo-cache-control-0.8.4" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.8.1"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.8.1.tgz"; - sha512 = "yQy5KB/OuX90PsdztWc4vfc4R//ZmW/AxNgXKWga0xW5OzEsysdJWHAsTzb40/rkJ9VNeQ+0N5wGikiS+jSCzg=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.8.4.tgz"; + sha512 = "IZ1d3AXZtkZhLYo0kWqTbZ6nqLFaeUvLdMESs+9orMadBZ7mvzcAfBwrhKyCWPGeAAZ/jKv8FtYHybpchHgFAg=="; }; }; - "apollo-cache-inmemory-1.6.2" = { + "apollo-cache-inmemory-1.6.3" = { name = "apollo-cache-inmemory"; packageName = "apollo-cache-inmemory"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz"; - sha512 = "AyCl3PGFv5Qv1w4N9vlg63GBPHXgMCekZy5mhlS042ji0GW84uTySX+r3F61ZX3+KM1vA4m9hQyctrEGiv5XjQ=="; + url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz"; + sha512 = "S4B/zQNSuYc0M/1Wq8dJDTIO9yRgU0ZwDGnmlqxGGmFombOZb9mLjylewSfQKmjNpciZ7iUIBbJ0mHlPJTzdXg=="; }; }; - "apollo-client-2.6.3" = { + "apollo-client-2.6.4" = { name = "apollo-client"; packageName = "apollo-client"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.3.tgz"; - sha512 = "DS8pmF5CGiiJ658dG+mDn8pmCMMQIljKJSTeMNHnFuDLV0uAPZoeaAwVFiAmB408Ujqt92oIZ/8yJJAwSIhd4A=="; + url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.4.tgz"; + sha512 = "oWOwEOxQ9neHHVZrQhHDbI6bIibp9SHgxaLRVPoGvOFy7OH5XUykZE7hBQAVxq99tQjBzgytaZffQkeWo1B4VQ=="; }; }; "apollo-codegen-0.20.2" = { @@ -4405,22 +4522,22 @@ let sha512 = "0/h5hce2FIGn6Y4+EHMeMINQxFwcgjw1vU+xV3KGaaEgyEAEQ3/n9pyz43M8mOm/JVgg8Eb4CtM1AtCkRQuFGw=="; }; }; - "apollo-datasource-0.6.1" = { + "apollo-datasource-0.6.3" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "0.6.1"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.6.1.tgz"; - sha512 = "oy7c+9Up8PSZwJ1qTK9Idh1acDpIocvw+C0zcHg14ycvNz7qWHSwLUSaAjuQMd9SYFzB3sxfyEhyfyhIogT2+Q=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.6.3.tgz"; + sha512 = "gRYyFVpJgHE2hhS+VxMeOerxXQ/QYxWG7T6QddfugJWYAG9DRCl65e2b7txcGq2NP3r+O1iCm4GNwhRBDJbd8A=="; }; }; - "apollo-engine-reporting-1.4.3" = { + "apollo-engine-reporting-1.4.6" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.4.3"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.4.3.tgz"; - sha512 = "xv27qfc9dhi1yaWOhNQRmfF+SoLy74hl+M42arpIWdkoDe22fVTmTIqxqGwo4TFR3Z2OkAV5tNzuuOI/icd0Rg=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.4.6.tgz"; + sha512 = "acfb7oFnru/8YQdY4x6+7WJbZfzdVETI8Cl+9ImgUrvUnE8P+f2SsGTKXTC1RuUvve4c56PAvaPgE+z8X1a1Mw=="; }; }; "apollo-engine-reporting-protobuf-0.4.0" = { @@ -4450,31 +4567,31 @@ let sha512 = "t3CO/xIDVsCG2qOvx2MEbuu4b/6LzQjcBBwiVnxclmmFyAxYCIe7rpPlnLHSq7HyOMlCWDMozjoeWfdqYSaLqQ=="; }; }; - "apollo-link-1.2.12" = { + "apollo-link-1.2.13" = { name = "apollo-link"; packageName = "apollo-link"; - version = "1.2.12"; + version = "1.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.12.tgz"; - sha512 = "fsgIAXPKThyMVEMWQsUN22AoQI+J/pVXcjRGAShtk97h7D8O+SPskFinCGEkxPeQpE83uKaqafB2IyWdjN+J3Q=="; + url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.13.tgz"; + sha512 = "+iBMcYeevMm1JpYgwDEIDt/y0BB7VWyvlm/7x+TIPNLHCTCMgcEgDuW5kH86iQZWo0I7mNwQiTOz+/3ShPFmBw=="; }; }; - "apollo-link-context-1.0.18" = { + "apollo-link-context-1.0.19" = { name = "apollo-link-context"; packageName = "apollo-link-context"; - version = "1.0.18"; + version = "1.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.18.tgz"; - sha512 = "aG5cbUp1zqOHHQjAJXG7n/izeMQ6LApd/whEF5z6qZp5ATvcyfSNkCfy3KRJMMZZ3iNfVTs6jF+IUA8Zvf+zeg=="; + url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.19.tgz"; + sha512 = "TUi5TyufU84hEiGkpt+5gdH5HkB3Gx46npNfoxR4of3DKBCMuItGERt36RCaryGcU/C3u2zsICU3tJ+Z9LjFoQ=="; }; }; - "apollo-link-http-common-0.2.14" = { + "apollo-link-http-common-0.2.15" = { name = "apollo-link-http-common"; packageName = "apollo-link-http-common"; - version = "0.2.14"; + version = "0.2.15"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.14.tgz"; - sha512 = "v6mRU1oN6XuX8beVIRB6OpF4q1ULhSnmy7ScnHnuo1qV6GaFmDcbdvXqxIkAV1Q8SQCo2lsv4HeqJOWhFfApOg=="; + url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.15.tgz"; + sha512 = "+Heey4S2IPsPyTf8Ag3PugUupASJMW894iVps6hXbvwtg1aHSNMXUYO5VG7iRHkPzqpuzT4HMBanCTXPjtGzxg=="; }; }; "apollo-link-persisted-queries-0.2.2" = { @@ -4495,13 +4612,13 @@ let sha512 = "xMPcAfuiPVYXaLwC6oJFIZrKgV3GmdO31Ag2eufRoXpvT0AfJZjdaPB4450Nu9TslHRePN9A3quxNueILlQxlw=="; }; }; - "apollo-link-ws-1.0.18" = { + "apollo-link-ws-1.0.19" = { name = "apollo-link-ws"; packageName = "apollo-link-ws"; - version = "1.0.18"; + version = "1.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.18.tgz"; - sha512 = "nrWh9m7k1FQw1AK1GB1VTJS0o01cpsP2RYmTAh2j+P4lL2/72WgsblhbuF+yA1/jsgVrzg6xa+TNw3UwgGp3+g=="; + url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.19.tgz"; + sha512 = "mRXmeUkc55ixOdYRtfq5rq3o9sboKghKABKroDVhJnkdS56zthBEWMAD+phajujOUbqByxjok0te8ABqByBdeQ=="; }; }; "apollo-server-caching-0.5.0" = { @@ -4513,67 +4630,67 @@ let sha512 = "l7ieNCGxUaUAVAAp600HjbUJxVaxjJygtPV0tPTe1Q3HkPy6LEWoY6mNHV7T268g1hxtPTxcdRu7WLsJrg7ufw=="; }; }; - "apollo-server-core-2.8.1" = { + "apollo-server-core-2.9.3" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.8.1"; + version = "2.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.8.1.tgz"; - sha512 = "BpvhKdycTI1v5n8biJ5c/DVF7MCbTL3JtB9llHGkqYgHaTH1gXguh2qD8Vcki+rpUNO5P1lcj5V6oVXoSUFXlA=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.9.3.tgz"; + sha512 = "KQpOM3nAXdMqKVE0HHcOkH/EVhyDqFEKLNFlsyGHGOn9ujpI6RsltX+YpXRyAdbfQHpTk11v/IAo6XksWN+g1Q=="; }; }; - "apollo-server-env-2.4.1" = { + "apollo-server-env-2.4.3" = { name = "apollo-server-env"; packageName = "apollo-server-env"; - version = "2.4.1"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.1.tgz"; - sha512 = "J4G1Q6qyb7KjjqvQdVM5HUH3QDb52VK1Rv+MWL0rHcstJx9Fh/NK0sS+nujrMfKw57NVUs2d4KuYtl/EnW/txg=="; + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.3.tgz"; + sha512 = "23R5Xo9OMYX0iyTu2/qT0EUb+AULCBriA9w8HDfMoChB8M+lFClqUkYtaTTHDfp6eoARLW8kDBhPOBavsvKAjA=="; }; }; - "apollo-server-errors-2.3.1" = { + "apollo-server-errors-2.3.3" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; - version = "2.3.1"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.3.1.tgz"; - sha512 = "errZvnh0vUQChecT7M4A/h94dnBSRL213dNxpM5ueMypaLYgnp4hiCTWIEaooo9E4yMGd1qA6WaNbLDG2+bjcg=="; + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.3.3.tgz"; + sha512 = "MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g=="; }; }; - "apollo-server-express-2.8.1" = { + "apollo-server-express-2.9.3" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.8.1"; + version = "2.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.8.1.tgz"; - sha512 = "XoWqSuNQkL8ivBq5LXJW6wV0/Ef+m8w4fAK/7PBspLHVfDAbHRyRr6zraotim2Kl7NOnzcqHtb6sB9yozjL0hA=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.9.3.tgz"; + sha512 = "Hkfs+ce6GqaoSzDOJs8Pj7W3YUjH0BzGglo5HMsOXOnjPZ0pJE9v8fmK76rlkITLw7GjvIq5GKlafymC31FMBw=="; }; }; - "apollo-server-plugin-base-0.6.1" = { + "apollo-server-plugin-base-0.6.4" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.6.1"; + version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.1.tgz"; - sha512 = "gLLF0kz4QOOyczDGWuR2ZNDfa1nHfyFNG76ue8Es0/0ujnMT9KoSokXkx1hDh0X7FFTMj/MelYYoNEqgTH88zw=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.4.tgz"; + sha512 = "4rY+cBAIpQomGWYBtk8hHkLQWHrh5hgIBPQqmhXh00YFdcY+Ob1/cU2/2iqTcIzhtcaezsc8OZ63au6ahSBQqg=="; }; }; - "apollo-server-types-0.2.1" = { + "apollo-server-types-0.2.4" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "0.2.1"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.2.1.tgz"; - sha512 = "ls26d6jjY7x91ctLWtbpQHGW0lcFR1LcOpDvBQUC2aCwQzuW/6yV7F3hfcEdLR9pjIxcA4yAtFQcKf5olDWVkA=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.2.4.tgz"; + sha512 = "G4FvBVgGQcTW6ZBS2+hvcDQkSfdOIKV+cHADduXA275v+5zl42g+bCaGd/hCCKTDRjmQvObLiMxH/BJ6pDMQgA=="; }; }; - "apollo-tracing-0.8.1" = { + "apollo-tracing-0.8.4" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.8.1"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.8.1.tgz"; - sha512 = "zhVNC7N6hg9IJEeSEXFDxcnXD5GJQAbHxaoKVBKEolcIIsz6EGd700ORdagJgFKLReVp9O65HPrZJCg66sVx7g=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.8.4.tgz"; + sha512 = "DjbFW0IvHicSlTVG+vK+1WINfBMRCdPPHJSW/j65JMir9Oe56WGeqL8qz8hptdUUmLYEb+azvcyyGsJsiR3zpQ=="; }; }; "apollo-upload-client-10.0.1" = { @@ -4711,6 +4828,15 @@ let sha1 = "f92e72233056dfc6969472749c267bdb046b1d70"; }; }; + "archiver-1.3.0" = { + name = "archiver"; + packageName = "archiver"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/archiver/-/archiver-1.3.0.tgz"; + sha1 = "4f2194d6d8f99df3f531e6881f14f15d55faaf22"; + }; + }; "archiver-2.1.1" = { name = "archiver"; packageName = "archiver"; @@ -5719,13 +5845,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.504.0" = { + "aws-sdk-2.529.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.504.0"; + version = "2.529.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.504.0.tgz"; - sha512 = "azOX54oovJv0zWzO23fBgIprwsvx8KUuMR+cAUAOx23D8LJ5S+sl3UYS9Q1X4qF/blBTa4+ZNawZDV0N1HiQmw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.529.0.tgz"; + sha512 = "CtRxgI4ZVZ8cdFCddlIVIy06cEW5gzTJBpyouZ/ySgZ6BiYj+0e77LwoNsnQE2nUNWCbydTLn3dbz4ZZMDpuIg=="; }; }; "aws-sign2-0.6.0" = { @@ -6088,13 +6214,13 @@ let sha512 = "ab0LlM5Q3pcKm+V6F6yx2ShzGOTYMcmJvLdL3PQsC9hF+hrYsBdkTCdNZdlPBgrSB8jp5vzhmK83qHGRs14hHw=="; }; }; - "azure-keyvault-3.0.4" = { + "azure-keyvault-3.0.5" = { name = "azure-keyvault"; packageName = "azure-keyvault"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-3.0.4.tgz"; - sha1 = "b7733d8f58d99a66f9ae766451556eb3b058dae5"; + url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-3.0.5.tgz"; + sha512 = "59fzKRq9dnzv03lEuImvgXc3QjRJoSJtK0gv1WXoqCivBuPdFNK+x6hAjoEDS2WEOXG+7m3uiJWqpMh/8NW3ow=="; }; }; "azure-monitoring-0.10.6" = { @@ -6322,13 +6448,13 @@ let sha512 = "Vj97CTn/lE9hR1D+jKUeHfNy+m1baNiJ1wJvoGyOBUx7F7kJqDZxr9nCHjO/Ad+irbR3HzR6jABpSSA29QsrXQ=="; }; }; - "babel-plugin-minify-dead-code-elimination-0.5.0" = { + "babel-plugin-minify-dead-code-elimination-0.5.1" = { name = "babel-plugin-minify-dead-code-elimination"; packageName = "babel-plugin-minify-dead-code-elimination"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.0.tgz"; - sha512 = "XQteBGXlgEoAKc/BhO6oafUdT4LBa7ARi55mxoyhLHNuA+RlzRmeMAfc31pb/UqU01wBzRc36YqHQzopnkd/6Q=="; + url = "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.1.tgz"; + sha512 = "x8OJOZIrRmQBcSqxBcLbMIK8uPmTvNWPXH2bh5MDCW1latEqYiRMuUkPImKcfpo59pTUB2FT7HfcgtG8ZlR5Qg=="; }; }; "babel-plugin-minify-flip-comparisons-0.4.3" = { @@ -6340,13 +6466,13 @@ let sha1 = "00ca870cb8f13b45c038b3c1ebc0f227293c965a"; }; }; - "babel-plugin-minify-guarded-expressions-0.4.3" = { + "babel-plugin-minify-guarded-expressions-0.4.4" = { name = "babel-plugin-minify-guarded-expressions"; packageName = "babel-plugin-minify-guarded-expressions"; - version = "0.4.3"; + version = "0.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.3.tgz"; - sha1 = "cc709b4453fd21b1f302877444c89f88427ce397"; + url = "https://registry.npmjs.org/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.4.tgz"; + sha512 = "RMv0tM72YuPPfLT9QLr3ix9nwUIq+sHT6z8Iu3sLbqldzC1Dls8DPCywzUIzkTx9Zh1hWX4q/m9BPoPed9GOfA=="; }; }; "babel-plugin-minify-infinity-0.4.3" = { @@ -6385,13 +6511,13 @@ let sha512 = "aXZiaqWDNUbyNNNpWs/8NyST+oU7QTpK7J9zFEFSA0eOmtUNMU3fczlTTTlnCxHmq/jYNFEmkkSG3DDBtW3Y4Q=="; }; }; - "babel-plugin-minify-simplify-0.5.0" = { + "babel-plugin-minify-simplify-0.5.1" = { name = "babel-plugin-minify-simplify"; packageName = "babel-plugin-minify-simplify"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.0.tgz"; - sha512 = "TM01J/YcKZ8XIQd1Z3nF2AdWHoDsarjtZ5fWPDksYZNsoOjQ2UO2EWm824Ym6sp127m44gPlLFiO5KFxU8pA5Q=="; + url = "https://registry.npmjs.org/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.1.tgz"; + sha512 = "OSYDSnoCxP2cYDMk9gxNAed6uJDiDz65zgL6h8d3tm8qXIagWGMLWhqysT6DY3Vs7Fgq7YUDcjOomhVUb+xX6A=="; }; }; "babel-plugin-minify-type-constructors-0.4.3" = { @@ -6583,13 +6709,13 @@ let sha1 = "8ec7a03a138f001a1a8fb1e8113652bf1a55da46"; }; }; - "babel-preset-minify-0.5.0" = { + "babel-preset-minify-0.5.1" = { name = "babel-preset-minify"; packageName = "babel-preset-minify"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.5.0.tgz"; - sha512 = "xj1s9Mon+RFubH569vrGCayA9Fm2GMsCgDRm1Jb8SgctOB7KFcrVc2o8K3YHUyMz+SWP8aea75BoS8YfsXXuiA=="; + url = "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.5.1.tgz"; + sha512 = "1IajDumYOAPYImkHbrKeiN5AKKP9iOmRoO2IPbIuVp0j2iuCcj0n7P260z38siKMZZ+85d3mJZdtW8IgOv+Tzg=="; }; }; "babel-register-6.26.0" = { @@ -6790,15 +6916,6 @@ let sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; }; }; - "base64-url-1.2.1" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; - sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; - }; - }; "base64-url-2.3.2" = { name = "base64-url"; packageName = "base64-url"; @@ -6844,15 +6961,6 @@ let sha1 = "e9be8ce33540cada4881768c59bd63865736e913"; }; }; - "basic-auth-1.0.4" = { - name = "basic-auth"; - packageName = "basic-auth"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; - sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; - }; - }; "basic-auth-1.1.0" = { name = "basic-auth"; packageName = "basic-auth"; @@ -6871,24 +6979,6 @@ let sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; }; }; - "basic-auth-connect-1.0.0" = { - name = "basic-auth-connect"; - packageName = "basic-auth-connect"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; - sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; - }; - }; - "batch-0.5.3" = { - name = "batch"; - packageName = "batch"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"; - sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464"; - }; - }; "batch-0.6.1" = { name = "batch"; packageName = "batch"; @@ -7177,31 +7267,31 @@ let sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ=="; }; }; - "bittorrent-dht-9.0.1" = { + "bittorrent-dht-9.0.3" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "9.0.1"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-9.0.1.tgz"; - sha512 = "DgymMDZyv5y0pyys73pFa3rImRliqxkiDvVwJ35e+co6MHQJ30M5ZvTstwJ38CtdMlF36RoLnL2z14ICl7pv/A=="; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-9.0.3.tgz"; + sha512 = "6FISjApL62THEMyptDm0kPTAnInBn8Sft3dK/JZcCI07LRIpIP+3Z6gle6xJUhyRVs6K5HmXAtaRatFsOEySOg=="; }; }; - "bittorrent-peerid-1.3.0" = { + "bittorrent-peerid-1.3.2" = { name = "bittorrent-peerid"; packageName = "bittorrent-peerid"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.3.0.tgz"; - sha512 = "SYd5H3RbN1ex+TrWAKXkEkASFWxAR7Tk6iLt9tfAT9ehBvZb/Y3AQDVRVJynlrixcWpnmsLYKI7tkRWgp7ORoQ=="; + url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.3.2.tgz"; + sha512 = "3xPhNfklf4xzxFVw9Y7W5dnGNhubVF0r8BK3imIsB6E3aDA4d6WhsceK1Yusos0TiiB9QZrdCsVXVqs26sFMxw=="; }; }; - "bittorrent-protocol-3.1.0" = { + "bittorrent-protocol-3.1.1" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.0.tgz"; - sha512 = "XPi4PpU8iaHA1HC8ku+3kr+r6TzhG8WFprJs/yUzTE67JSkRcKO5X+XphqeQPj6LkP0syNcUUOp22EDV7Eg4Sg=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.1.tgz"; + sha512 = "kthSXghQ9DRQ4Lrjr1ceyIeEMeL5x9WiaSrQyR+5Nrr3g9QY6MvDeq+KLQz17R6094iDmT/LgFbQYAPj09/oUA=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -7213,13 +7303,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.12.1" = { + "bittorrent-tracker-9.14.4" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.12.1"; + version = "9.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.12.1.tgz"; - sha512 = "5gjqHG3xV3eEy3UOOn4kkB09sl66t+fYzBGFMI83lRC/+33xmgpDYnu2lOnjYdRPAKWv0nBJT5XR/l9JkQ341A=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.14.4.tgz"; + sha512 = "2Y/MNRjYhysD6t4r38z7l1WTT7g23IAqRWZRsj7xnnpciFn4xE4qiKmyFwA4gtbFGAZ14K3DdaqZbiQsC3PEfQ=="; }; }; "bl-0.8.2" = { @@ -7249,15 +7339,6 @@ let sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; }; }; - "bl-2.2.0" = { - name = "bl"; - packageName = "bl"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-2.2.0.tgz"; - sha512 = "wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA=="; - }; - }; "bl-3.0.0" = { name = "bl"; packageName = "bl"; @@ -7321,15 +7402,6 @@ let sha1 = "b89562bd6994af95ba1e812155536333aa23cf24"; }; }; - "blob-0.0.4" = { - name = "blob"; - packageName = "blob"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz"; - sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; - }; - }; "blob-0.0.5" = { name = "blob"; packageName = "blob"; @@ -7483,15 +7555,6 @@ let sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; }; }; - "body-parser-1.13.3" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz"; - sha1 = "c08cf330c3358e151016a05746f13f029c97fa97"; - }; - }; "body-parser-1.18.3" = { name = "body-parser"; packageName = "body-parser"; @@ -7780,13 +7843,13 @@ let sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; - "browserify-16.3.0" = { + "browserify-16.5.0" = { name = "browserify"; packageName = "browserify"; - version = "16.3.0"; + version = "16.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.3.0.tgz"; - sha512 = "BWaaD7alyGZVEBBwSTYx4iJF5DswIGzK17o8ai9w4iKRbYpk3EOiprRHMRRA8DCZFmFeOdx7A385w2XdFvxWmg=="; + url = "https://registry.npmjs.org/browserify/-/browserify-16.5.0.tgz"; + sha512 = "6bfI3cl76YLAnCZ75AGu/XPOsqUhRyc0F/olGIJeCxtfxF2HvPKEcmjU9M8oAPxl4uBY1U7Nry33Q6koV3f2iw=="; }; }; "browserify-aes-1.2.0" = { @@ -7879,13 +7942,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.6.6" = { + "browserslist-4.7.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.6.6"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz"; - sha512 = "D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.7.0.tgz"; + sha512 = "9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA=="; }; }; "btoa-lite-1.0.0" = { @@ -7933,13 +7996,13 @@ let sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; - "buffer-5.2.1" = { + "buffer-5.4.3" = { name = "buffer"; packageName = "buffer"; - version = "5.2.1"; + version = "5.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz"; - sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz"; + sha512 = "zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A=="; }; }; "buffer-alloc-1.2.0" = { @@ -8122,13 +8185,22 @@ let sha1 = "7afd74a45f937fa422a1d338c08bbfdc76cd725d"; }; }; - "bufrw-1.2.1" = { + "bufrw-1.3.0" = { name = "bufrw"; packageName = "bufrw"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/bufrw/-/bufrw-1.2.1.tgz"; - sha1 = "93f222229b4f5f5e2cd559236891407f9853663b"; + url = "https://registry.npmjs.org/bufrw/-/bufrw-1.3.0.tgz"; + sha512 = "jzQnSbdJqhIltU9O5KUiTtljP9ccw2u5ix59McQy4pV2xGhVLhRZIndY8GIrgh5HjXa6+QJ9AQhOd2QWQizJFQ=="; + }; + }; + "builtin-modules-1.1.1" = { + name = "builtin-modules"; + packageName = "builtin-modules"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; }; }; "builtin-modules-2.0.0" = { @@ -8140,6 +8212,15 @@ let sha512 = "3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg=="; }; }; + "builtin-modules-3.1.0" = { + name = "builtin-modules"; + packageName = "builtin-modules"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz"; + sha512 = "k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw=="; + }; + }; "builtin-status-codes-3.0.0" = { name = "builtin-status-codes"; packageName = "builtin-status-codes"; @@ -8266,15 +8347,6 @@ let sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4"; }; }; - "bytes-2.4.0" = { - name = "bytes"; - packageName = "bytes"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"; - sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; - }; - }; "bytes-3.0.0" = { name = "bytes"; packageName = "bytes"; @@ -8311,13 +8383,13 @@ let sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42"; }; }; - "cacache-12.0.2" = { + "cacache-12.0.3" = { name = "cacache"; packageName = "cacache"; - version = "12.0.2"; + version = "12.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz"; - sha512 = "ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg=="; + url = "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz"; + sha512 = "kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw=="; }; }; "cache-base-1.0.1" = { @@ -8365,6 +8437,15 @@ let sha512 = "5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg=="; }; }; + "cachedir-2.2.0" = { + name = "cachedir"; + packageName = "cachedir"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cachedir/-/cachedir-2.2.0.tgz"; + sha512 = "VvxA0xhNqIIfg0V9AmJkDg91DaJwryutH5rVEZAhcNi4iJFj9f+QxmAjgK1LT9I8OgToX27fypX6/MeCXVbBjQ=="; + }; + }; "call-me-maybe-1.0.1" = { name = "call-me-maybe"; packageName = "call-me-maybe"; @@ -8536,13 +8617,13 @@ let sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; - "camelcase-keys-5.2.0" = { + "camelcase-keys-6.0.1" = { name = "camelcase-keys"; packageName = "camelcase-keys"; - version = "5.2.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-5.2.0.tgz"; - sha512 = "mSM/OQKD1HS5Ll2AXxeaHSdqCGC/QQ8IrgTbKYA/rxnC36thBKysfIr9+OVBWuW17jyZF4swHkjtglawgBmVFg=="; + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.0.1.tgz"; + sha512 = "Pet+fVo99HMVy183qJuyTiQECQlb0dCXg89qhixcud88j4BSns+gzhSrjRT0ustEYSWJqKMO42arm1cS1VG5FA=="; }; }; "caniuse-api-3.0.0" = { @@ -8599,13 +8680,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "castv2-0.1.9" = { + "castv2-0.1.10" = { name = "castv2"; packageName = "castv2"; - version = "0.1.9"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/castv2/-/castv2-0.1.9.tgz"; - sha1 = "d0b0fab1fd06b0d9cca636886716ec1293a5905a"; + url = "https://registry.npmjs.org/castv2/-/castv2-0.1.10.tgz"; + sha512 = "3QWevHrjT22KdF08Y2a217IYCDQDP7vEJaY4n0lPBeC5UBYbMFMadDfVTsaQwq7wqsEgYUHElPGm3EO1ey+TNw=="; }; }; "castv2-client-1.2.0" = { @@ -8968,31 +9049,31 @@ let sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; - "chokidar-2.1.6" = { + "chokidar-2.1.8" = { name = "chokidar"; packageName = "chokidar"; - version = "2.1.6"; + version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz"; - sha512 = "V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz"; + sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; }; }; - "chokidar-3.0.0" = { + "chokidar-3.0.2" = { name = "chokidar"; packageName = "chokidar"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.0.tgz"; - sha512 = "ebzWopcacB2J19Jsb5RPtMrzmjUZ5VAQnsL0Ztrix3lswozHbiDp+1Lg3AWSKHdwsps/W2vtshA/x3I827F78g=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz"; + sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; - "chokidar-3.0.2" = { + "chokidar-3.1.0" = { name = "chokidar"; packageName = "chokidar"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz"; - sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.1.0.tgz"; + sha512 = "6vZfo+7W0EOlbSo0nhVKMz4yyssrwiPbBZ8wj1lq8/+l4ZhGZ2U4Md7PspvmijXp1a26D3B7AHEBmIB7aVtaOQ=="; }; }; "chownr-0.0.2" = { @@ -9013,13 +9094,40 @@ let sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="; }; }; - "chroma-js-2.0.4" = { + "chroma-js-2.0.6" = { name = "chroma-js"; packageName = "chroma-js"; - version = "2.0.4"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.0.6.tgz"; + sha512 = "IiiClbBRkRwuXNl6impq5ssEhUGpmWvc5zzImZbDUWLWcFbj6ZbtsdZEx6sIXMKes7azgYaUpnmsY1T8BL6PqQ=="; + }; + }; + "chrome-dgram-3.0.3" = { + name = "chrome-dgram"; + packageName = "chrome-dgram"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chrome-dgram/-/chrome-dgram-3.0.3.tgz"; + sha512 = "rktbTuXuzriInBm9qESjTqRhnscp26gAdsQnUSWIY4a3miF9gnFOBGib+DO0zcJ0ZF2wj6wwQrPgyWfT4+as3g=="; + }; + }; + "chrome-dns-1.0.1" = { + name = "chrome-dns"; + packageName = "chrome-dns"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.0.4.tgz"; - sha512 = "gk71qOrSdBTLbsd0DIUO3QjZL8tTvMwpG1EoXYScy7rI4rcO4EyYH6zGuvCgUDumKumqg0pt6Ua+vWnMJsTYhw=="; + url = "https://registry.npmjs.org/chrome-dns/-/chrome-dns-1.0.1.tgz"; + sha512 = "HqsYJgIc8ljJJOqOzLphjAs79EUuWSX3nzZi2LNkzlw3GIzAeZbaSektC8iT/tKvLqZq8yl1GJu5o6doA4TRbg=="; + }; + }; + "chrome-net-3.3.3" = { + name = "chrome-net"; + packageName = "chrome-net"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chrome-net/-/chrome-net-3.3.3.tgz"; + sha512 = "11jL8+Ogna8M5TEdyalE8IG6cpaFEU3YcaxAj3YjZKjRM/PeT70pZbrUY+xoGwqiEJZwJE4Td2CvGxUvS9ytKQ=="; }; }; "chrome-remote-interface-0.26.1" = { @@ -9229,15 +9337,6 @@ let sha1 = "adc3200fa471cc211b0da7f566b71e98b9d67347"; }; }; - "cli-color-1.2.0" = { - name = "cli-color"; - packageName = "cli-color"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-color/-/cli-color-1.2.0.tgz"; - sha1 = "3a5ae74fd76b6267af666e69e2afbbd01def34d1"; - }; - }; "cli-cursor-1.0.2" = { name = "cli-cursor"; packageName = "cli-cursor"; @@ -9256,6 +9355,15 @@ let sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; }; }; + "cli-cursor-3.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; + }; + }; "cli-list-0.2.0" = { name = "cli-list"; packageName = "cli-list"; @@ -9562,22 +9670,13 @@ let sha512 = "FXDYw4TjR8wgPZYui2LeTqWh1BLpfQ8lB6upMtlpDF6WlOOxghmTTxWyngdKTgozqBgKnHbTVwTE+hOHqAykuQ=="; }; }; - "closest-to-2.0.0" = { - name = "closest-to"; - packageName = "closest-to"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/closest-to/-/closest-to-2.0.0.tgz"; - sha1 = "bb2a860edb7769b62d04821748ae50da24dbefaa"; - }; - }; - "cmd-shim-2.0.2" = { + "cmd-shim-2.1.0" = { name = "cmd-shim"; packageName = "cmd-shim"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz"; - sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb"; + url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.1.0.tgz"; + sha512 = "A5C0Cyf2H8sKsHqX0tvIWRXw5/PK++3Dc0lDbsugr90nOECLLuSPahVQBG8pgmgiXgm/TzBWMqI2rWdZwHduAw=="; }; }; "cmdln-3.2.1" = { @@ -9769,13 +9868,13 @@ let sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; }; - "color-convert-2.0.0" = { + "color-convert-2.0.1" = { name = "color-convert"; packageName = "color-convert"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.0.tgz"; - sha512 = "hzTicsCJIHdxih9+2aLR1tNGZX5qSJGRHDPVwSY26tVrEf55XNajLOBWz2UuWSIergszA09/bqnOiHyqx9fxQg=="; + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; }; "color-name-1.1.3" = { @@ -10075,15 +10174,6 @@ let sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873"; }; }; - "commander-2.6.0" = { - name = "commander"; - packageName = "commander"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; - sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; - }; - }; "commander-2.8.1" = { name = "commander"; packageName = "commander"; @@ -10102,6 +10192,24 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; + "commander-3.0.0" = { + name = "commander"; + packageName = "commander"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-3.0.0.tgz"; + sha512 = "pl3QrGOBa9RZaslQiqnnKX2J068wcQw7j9AIaBQ9/JEp5RY6je4jKTImg0Bd+rpoONSe7GUFSgkxLeo17m3Pow=="; + }; + }; + "commander-3.0.1" = { + name = "commander"; + packageName = "commander"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-3.0.1.tgz"; + sha512 = "UNgvDd+csKdc9GD4zjtkHKQbT8Aspt2jCBqNSPp53vAS0L1tS9sXB2TCEOPHJ7kt9bN/niWkYj8T3RQSoMXdSQ=="; + }; + }; "commist-1.1.0" = { name = "commist"; packageName = "commist"; @@ -10246,15 +10354,6 @@ let sha512 = "BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw=="; }; }; - "compression-1.5.2" = { - name = "compression"; - packageName = "compression"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; - sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"; - }; - }; "compression-1.7.3" = { name = "compression"; packageName = "compression"; @@ -10372,15 +10471,6 @@ let sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }; }; - "connect-2.30.2" = { - name = "connect"; - packageName = "connect"; - version = "2.30.2"; - src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz"; - sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609"; - }; - }; "connect-3.7.0" = { name = "connect"; packageName = "connect"; @@ -10408,24 +10498,6 @@ let sha1 = "b269b2bb82ddb1ac3db5099c0fb582aba99fb37a"; }; }; - "connect-pushstate-1.1.0" = { - name = "connect-pushstate"; - packageName = "connect-pushstate"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-pushstate/-/connect-pushstate-1.1.0.tgz"; - sha1 = "bcab224271c439604a0fb0f614c0a5f563e88e24"; - }; - }; - "connect-timeout-1.6.2" = { - name = "connect-timeout"; - packageName = "connect-timeout"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz"; - sha1 = "de9a5ec61e33a12b6edaab7b5f062e98c599b88e"; - }; - }; "connections-1.4.2" = { name = "connections"; packageName = "connections"; @@ -10705,13 +10777,13 @@ let sha1 = "f67a4938c5233443564250479c67014bac878499"; }; }; - "convict-4.4.1" = { + "convict-5.1.0" = { name = "convict"; packageName = "convict"; - version = "4.4.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/convict/-/convict-4.4.1.tgz"; - sha512 = "celpR4hOWWwb/S8azhzgQwDon6muAJlNe2LTLeOGyoSgH390TsaqoieAe9BLbAv7+9wNfG7DTA2q3IfFp2viKw=="; + url = "https://registry.npmjs.org/convict/-/convict-5.1.0.tgz"; + sha512 = "0+Rf3wUfEpz+UuwksNgjREf+81eRDsiQ64ZAs3Gh2rZeXIjiI5m0pxwybRZUebpSKEfOFxN5oUthIUpnqIMh6w=="; }; }; "cookie-0.0.4" = { @@ -10741,15 +10813,6 @@ let sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; }; }; - "cookie-0.1.3" = { - name = "cookie"; - packageName = "cookie"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz"; - sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435"; - }; - }; "cookie-0.3.1" = { name = "cookie"; packageName = "cookie"; @@ -10768,15 +10831,6 @@ let sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; }; }; - "cookie-parser-1.3.5" = { - name = "cookie-parser"; - packageName = "cookie-parser"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz"; - sha1 = "9d755570fb5d17890771227a02314d9be7cf8356"; - }; - }; "cookie-parser-1.4.4" = { name = "cookie-parser"; packageName = "cookie-parser"; @@ -10939,15 +10993,6 @@ let sha512 = "h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w=="; }; }; - "core-js-2.5.7" = { - name = "core-js"; - packageName = "core-js"; - version = "2.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz"; - sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="; - }; - }; "core-js-2.6.9" = { name = "core-js"; packageName = "core-js"; @@ -10957,31 +11002,22 @@ let sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="; }; }; - "core-js-3.1.4" = { + "core-js-3.2.1" = { name = "core-js"; packageName = "core-js"; - version = "3.1.4"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz"; - sha512 = "YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz"; + sha512 = "Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw=="; }; }; - "core-js-compat-3.1.4" = { + "core-js-compat-3.2.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.4.tgz"; - sha512 = "Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg=="; - }; - }; - "core-js-pure-3.1.4" = { - name = "core-js-pure"; - packageName = "core-js-pure"; - version = "3.1.4"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.4.tgz"; - sha512 = "uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.2.1.tgz"; + sha512 = "MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A=="; }; }; "core-util-is-1.0.2" = { @@ -11092,15 +11128,6 @@ let sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; }; }; - "crc-3.3.0" = { - name = "crc"; - packageName = "crc"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz"; - sha1 = "fa622e1bc388bf257309082d6b65200ce67090ba"; - }; - }; "crc-3.8.0" = { name = "crc"; packageName = "crc"; @@ -11173,13 +11200,13 @@ let sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; - "create-torrent-4.2.1" = { + "create-torrent-4.4.1" = { name = "create-torrent"; packageName = "create-torrent"; - version = "4.2.1"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.2.1.tgz"; - sha512 = "IlKF2B3vrAGVzcgYVVgfsekp4p2N9BqkGeVqckTljajs+qIQ5oAwAzELJtb6sZ14UQBT7ZQNOOyvxgIL98VpZg=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.4.1.tgz"; + sha512 = "LuoXnCRMKEo3KR3jEbCRpP3Nu2TUhLTlb/axP9+rl+ouhBpxTaHaTTN1bdUS2x2VK3wWyCBl1OZHyHhlRBntWg=="; }; }; "creato-1.0.5" = { @@ -11191,6 +11218,15 @@ let sha512 = "bneB5jF+I0XNe4d3E6PYszPRb+5S8B3UQ3hDlY6ZSkfEU34RKqCfbUodxwwJn8DhmPYiuefEqEGxvstXEwXuUA=="; }; }; + "crocks-0.12.1" = { + name = "crocks"; + packageName = "crocks"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/crocks/-/crocks-0.12.1.tgz"; + sha512 = "2qCRJwBmPlRQXzd50k9gt9PaItultOP8lj/cKSH2Eai9aeBuNqAnDuyolAm9TGn6Pw/4BgbxtPJLU1S+tQ4WMQ=="; + }; + }; "cron-1.7.1" = { name = "cron"; packageName = "cron"; @@ -11326,15 +11362,6 @@ let sha1 = "a230f64f568310e1498009940790ec99545bca7e"; }; }; - "csrf-3.0.6" = { - name = "csrf"; - packageName = "csrf"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz"; - sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a"; - }; - }; "csrf-3.1.0" = { name = "csrf"; packageName = "csrf"; @@ -11389,13 +11416,13 @@ let sha1 = "5908668294a1becd261ae0a4ce21b0b551f21d16"; }; }; - "css-parse-1.7.0" = { + "css-parse-2.0.0" = { name = "css-parse"; packageName = "css-parse"; - version = "1.7.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz"; - sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; + url = "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz"; + sha1 = "a468ee667c16d81ccf05c58c38d2a97c780dbfd4"; }; }; "css-select-1.2.0" = { @@ -11614,15 +11641,6 @@ let sha512 = "fh725p0R83wA5JukCik5hdEko/LizW/Vl7pkKDa1WJUVCosg141mqaAWCScB+nkEaRMFMGbutHMOr6oBNc/j9A=="; }; }; - "csurf-1.8.3" = { - name = "csurf"; - packageName = "csurf"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz"; - sha1 = "23f2a13bf1d8fce1d0c996588394442cba86a56a"; - }; - }; "csv-0.4.6" = { name = "csv"; packageName = "csv"; @@ -11776,13 +11794,13 @@ let sha1 = "1bcfa56b081448cdb5e12bfc1bfad34b47fba8f3"; }; }; - "cyclist-0.2.2" = { + "cyclist-1.0.1" = { name = "cyclist"; packageName = "cyclist"; - version = "0.2.2"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz"; - sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; + url = "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz"; + sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; }; }; "d-1.0.1" = { @@ -12136,15 +12154,6 @@ let sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; }; }; - "debug-2.3.3" = { - name = "debug"; - packageName = "debug"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; - sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; - }; - }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -12343,6 +12352,15 @@ let sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; }; }; + "deep-equal-1.1.0" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz"; + sha512 = "ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw=="; + }; + }; "deep-extend-0.2.11" = { name = "deep-extend"; packageName = "deep-extend"; @@ -12370,13 +12388,13 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; - "deep-freeze-0.0.1" = { - name = "deep-freeze"; - packageName = "deep-freeze"; - version = "0.0.1"; + "deep-freeze-node-1.1.3" = { + name = "deep-freeze-node"; + packageName = "deep-freeze-node"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz"; - sha1 = "3a0b0005de18672819dfd38cd31f91179c893e84"; + url = "https://registry.npmjs.org/deep-freeze-node/-/deep-freeze-node-1.1.3.tgz"; + sha512 = "CrA+1BVGfs9ZrGFMYtHfFHncWivh9XPb+6g8bLOzYPJmW8FmUs1dXLjALzU1SMqOMdoD5pQJARXtzxfeLqE9HQ=="; }; }; "deep-is-0.1.2" = { @@ -12442,15 +12460,6 @@ let sha512 = "GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA=="; }; }; - "deepmerge-4.0.0" = { - name = "deepmerge"; - packageName = "deepmerge"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.0.0.tgz"; - sha512 = "YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww=="; - }; - }; "default-browser-id-1.0.4" = { name = "default-browser-id"; packageName = "default-browser-id"; @@ -12469,13 +12478,13 @@ let sha512 = "QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ=="; }; }; - "default-gateway-2.7.2" = { + "default-gateway-4.2.0" = { name = "default-gateway"; packageName = "default-gateway"; - version = "2.7.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz"; - sha512 = "lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ=="; + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz"; + sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; }; }; "default-resolution-2.0.0" = { @@ -12514,6 +12523,15 @@ let sha512 = "k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw=="; }; }; + "deferred-0.7.11" = { + name = "deferred"; + packageName = "deferred"; + version = "0.7.11"; + src = fetchurl { + url = "https://registry.npmjs.org/deferred/-/deferred-0.7.11.tgz"; + sha512 = "8eluCl/Blx4YOGwMapBvXRKxHXhA8ejDXYzEaK8+/gtcm8hRMhSLmXSqDmNUKNc/C8HNSmuyyp/hflhqDAvK2A=="; + }; + }; "deferred-leveldown-0.2.0" = { name = "deferred-leveldown"; packageName = "deferred-leveldown"; @@ -12523,13 +12541,13 @@ let sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; }; }; - "deferred-leveldown-5.1.0" = { + "deferred-leveldown-5.2.0" = { name = "deferred-leveldown"; packageName = "deferred-leveldown"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.1.0.tgz"; - sha512 = "PvDY+BT2ONu2XVRgxHb77hYelLtMYxKSGuWuJJdVRXh9ntqx9GYTFJno/SKAz5xcd+yjQwyQeIZrUPjPvA52mg=="; + url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.2.0.tgz"; + sha512 = "E1s224a+nv7nEZQL/s+q4ARzBhsfo3KiEjK3qdvDAvMfWE68GnGsMRYKanoZgYqq+LNgyRMYPzBgEmAXjM2i5g=="; }; }; "define-properties-1.1.3" = { @@ -12595,6 +12613,15 @@ let sha1 = "fcf490a37ece266464d9cc431ab98c5819ced095"; }; }; + "delay-4.3.0" = { + name = "delay"; + packageName = "delay"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delay/-/delay-4.3.0.tgz"; + sha512 = "Lwaf3zVFDMBop1yDuFZ19F9WyGcZcGacsbdlZtWjQmM50tOcMntm1njF/Nb/Vjij3KaSvCF+sEYGKrrjObu2NA=="; + }; + }; "delayed-stream-0.0.5" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -12811,6 +12838,15 @@ let sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; }; }; + "detect-node-2.0.4" = { + name = "detect-node"; + packageName = "detect-node"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz"; + sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="; + }; + }; "detective-4.7.1" = { name = "detective"; packageName = "detective"; @@ -13252,15 +13288,6 @@ let sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; }; }; - "dom4-2.1.3" = { - name = "dom4"; - packageName = "dom4"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dom4/-/dom4-2.1.3.tgz"; - sha512 = "begvh4z5GV0kyxx+YgJZ7sIo/jsELx/v7MQxoLZpOvT5yFo18X8dfgtUmKAwdGuyMeugncylarLHlO4gIK6YNw=="; - }; - }; "domain-browser-1.2.0" = { name = "domain-browser"; packageName = "domain-browser"; @@ -13414,6 +13441,15 @@ let sha512 = "HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="; }; }; + "dotenv-8.1.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-8.1.0.tgz"; + sha512 = "GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA=="; + }; + }; "dotenv-expand-4.2.0" = { name = "dotenv-expand"; packageName = "dotenv-expand"; @@ -13423,6 +13459,15 @@ let sha1 = "def1f1ca5d6059d24a766e587942c21106ce1275"; }; }; + "dotnet-deps-parser-4.5.0" = { + name = "dotnet-deps-parser"; + packageName = "dotnet-deps-parser"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.5.0.tgz"; + sha512 = "t6rBxcWVZSDNhhWdsbq9ozaCzfPXV79FiyES1JLNEoA7nYF+zDC2VZvFZSnH8ilU3bghJXxZPH+EcKYvfw8g/g=="; + }; + }; "downgrade-root-1.2.2" = { name = "downgrade-root"; packageName = "downgrade-root"; @@ -13513,13 +13558,13 @@ let sha1 = "0b078d5517937d873101452d9146737557b75e51"; }; }; - "dtrace-provider-0.8.7" = { + "dtrace-provider-0.8.8" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.8.7"; + version = "0.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.7.tgz"; - sha1 = "dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz"; + sha512 = "b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg=="; }; }; "duplexer-0.1.1" = { @@ -13684,13 +13729,13 @@ let sha512 = "gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg=="; }; }; - "editions-2.1.3" = { + "editions-2.2.0" = { name = "editions"; packageName = "editions"; - version = "2.1.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-2.1.3.tgz"; - sha512 = "xDZyVm0A4nLgMNWVVLJvcwMjI80ShiH/27RyLiCnW1L273TcJIA25C4pwJ33AWV01OX6UriP35Xu+lH4S7HWQw=="; + url = "https://registry.npmjs.org/editions/-/editions-2.2.0.tgz"; + sha512 = "RYg3iEA2BDLCNVe8PUkD+ox5vAKxB9XS/mAhx1bdxGCF0CpX077C0pyTA9t5D6idCYA3avl5/XDHKPsHFrygfw=="; }; }; "editor-1.0.0" = { @@ -13747,22 +13792,22 @@ let sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a"; }; }; - "ejs-2.6.2" = { + "ejs-2.7.1" = { name = "ejs"; packageName = "ejs"; - version = "2.6.2"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-2.6.2.tgz"; - sha512 = "PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="; + url = "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz"; + sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ=="; }; }; - "electron-to-chromium-1.3.215" = { + "electron-to-chromium-1.3.260" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.215"; + version = "1.3.260"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.215.tgz"; - sha512 = "ZV3OnwF0FlIygwxAG2H92yt7WGjWBpawyFAFu8e9k7xJatY+BPowID0D0Bs3PMACYAJATEejw/I9cawO27ZvTg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.260.tgz"; + sha512 = "wGt+OivF1C1MPwaSv3LJ96ebNbLAWlx3HndivDDWqwIVSQxmhL17Y/YmwUdEMtS/bPyommELt47Dct0/VZNQBQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -13774,13 +13819,13 @@ let sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; }; }; - "element-helper-json-2.0.5" = { + "element-helper-json-2.0.6" = { name = "element-helper-json"; packageName = "element-helper-json"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/element-helper-json/-/element-helper-json-2.0.5.tgz"; - sha512 = "XBFDNA4aAygKLqt3S7jhwWivUJInO9Yw2zlJjayPDSNDsg9OMIHbi/UE3JfJq7kw9BHDn6CchnSRVIcWG1AuzA=="; + url = "https://registry.npmjs.org/element-helper-json/-/element-helper-json-2.0.6.tgz"; + sha512 = "AzJvyAAYwFvv4zesXVQbB8zNBMJl/6HjDulY2NfxHdOEhsjq1knIoYOI+Ln20OlYX431sxSBO/5ji+aaQr/VoQ=="; }; }; "elementtree-0.1.7" = { @@ -13792,22 +13837,22 @@ let sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; }; }; - "elliptic-6.5.0" = { + "elliptic-6.5.1" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.0"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz"; - sha512 = "eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg=="; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz"; + sha512 = "xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg=="; }; }; - "elm-serve-0.4.0" = { - name = "elm-serve"; - packageName = "elm-serve"; - version = "0.4.0"; + "elm-hot-1.1.1" = { + name = "elm-hot"; + packageName = "elm-hot"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-serve/-/elm-serve-0.4.0.tgz"; - sha512 = "NYXzzaJT/zw8v7jzDWGXuvX3/soj+5NTLHxX0n/T6DICbmyDj8kO7rlI2wSKs9UTNjXhZ7quFQEKcgcf/SZksw=="; + url = "https://registry.npmjs.org/elm-hot/-/elm-hot-1.1.1.tgz"; + sha512 = "ZHjoHd2Ev6riNXNQirj3J+GKKXXwedAUikfFBYzlVL/+3CdGs96cpZ7nhAk4c5l//Qa9ymltrqX36mOlr0pPFA=="; }; }; "email-validator-2.0.4" = { @@ -13937,13 +13982,13 @@ let sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; }; }; - "encoding-down-6.1.0" = { + "encoding-down-6.2.0" = { name = "encoding-down"; packageName = "encoding-down"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/encoding-down/-/encoding-down-6.1.0.tgz"; - sha512 = "pBW1mbuQDHQhQLBtqarX8x2oLynahiOzBY5L/BosNqcstJ8MjpSc3rx1yCUIqb6bUE2vsp3t0BaXS0ZDP1s5pg=="; + url = "https://registry.npmjs.org/encoding-down/-/encoding-down-6.2.0.tgz"; + sha512 = "XlIoQMBMbU4aE01uSKpAix0sXBJWK8YPhuOdvKa1CroThZyUpj0zWzt+bbe7g1KWsdhNFFzHkQHSdDymVtpJ1w=="; }; }; "end-of-stream-0.1.5" = { @@ -14018,15 +14063,6 @@ let sha1 = "2d968308fffae5d17f5209b6775246e90d8a705e"; }; }; - "engine.io-1.8.5" = { - name = "engine.io"; - packageName = "engine.io"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.5.tgz"; - sha512 = "j1DWIcktw4hRwrv6nWx++5nFH2X64x16MAG2P0Lmi5Dvdfi3I+Jhc7JKJIdAmDJa+5aZ/imHV7dWRPy2Cqjh3A=="; - }; - }; "engine.io-3.2.1" = { name = "engine.io"; packageName = "engine.io"; @@ -14054,15 +14090,6 @@ let sha1 = "1c5a65d5c5af6d04b44c22c3dbcd95c39ed1c989"; }; }; - "engine.io-client-1.8.5" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.5.tgz"; - sha512 = "AYTgHyeVUPitsseqjoedjhYJapNVoSPShbZ+tEUX9/73jgZ/Z3sUlJf9oYgdEBBdVhupUpUqSxH0kBCXlQnmZg=="; - }; - }; "engine.io-client-3.2.1" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -14090,15 +14117,6 @@ let sha1 = "d38813143a411cb3b914132ab05bf99e6f7a248e"; }; }; - "engine.io-parser-1.3.2" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz"; - sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a"; - }; - }; "engine.io-parser-2.1.3" = { name = "engine.io-parser"; packageName = "engine.io-parser"; @@ -14198,15 +14216,6 @@ let sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b"; }; }; - "envinfo-7.1.0" = { - name = "envinfo"; - packageName = "envinfo"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/envinfo/-/envinfo-7.1.0.tgz"; - sha512 = "38LJhrmyQafVInoYlaEDxomIfjtK+HUtp1JsInWdKtpxk0MlTU60fqYHg0LrKgxxJuq6H89ddw4IkxfQejZ77g=="; - }; - }; "envinfo-7.3.1" = { name = "envinfo"; packageName = "envinfo"; @@ -14234,13 +14243,13 @@ let sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; }; }; - "errlop-1.1.1" = { + "errlop-1.1.2" = { name = "errlop"; packageName = "errlop"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/errlop/-/errlop-1.1.1.tgz"; - sha512 = "WX7QjiPHhsny7/PQvrhS5VMizXXKoKCS3udaBp8gjlARdbn+XmK300eKBAAN0hGyRaTCtRpOaxK+xFVPUJ3zkw=="; + url = "https://registry.npmjs.org/errlop/-/errlop-1.1.2.tgz"; + sha512 = "djkRp+urJ+SmqDBd7F6LUgm4Be1TTYBxia2bhjNdFBuBDQtJDHExD2VbxR6eyst3h1TZy3qPRCdqb6FBoFttTA=="; }; }; "errno-0.1.7" = { @@ -14270,15 +14279,6 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "errorhandler-1.4.3" = { - name = "errorhandler"; - packageName = "errorhandler"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz"; - sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f"; - }; - }; "errorhandler-1.5.1" = { name = "errorhandler"; packageName = "errorhandler"; @@ -14288,13 +14288,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.13.0" = { + "es-abstract-1.14.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.13.0"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz"; - sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz"; + sha512 = "DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg=="; }; }; "es-to-primitive-1.2.0" = { @@ -14306,13 +14306,13 @@ let sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; }; }; - "es5-ext-0.10.50" = { + "es5-ext-0.10.51" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.50"; + version = "0.10.51"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz"; - sha512 = "KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz"; + sha512 = "oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ=="; }; }; "es5-ext-0.8.2" = { @@ -14423,6 +14423,15 @@ let sha512 = "J3ZkwbEnnO+fGAKrjVpeUAnZshAdfZvbhQpqfIH9kSAspReRC4nJnu8ewm55b4y9ElyeuhCTzJD0XiH8Tsbhlw=="; }; }; + "es6-promisify-6.0.2" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.0.2.tgz"; + sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg=="; + }; + }; "es6-set-0.1.5" = { name = "es6-set"; packageName = "es6-set"; @@ -14441,6 +14450,15 @@ let sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; }; }; + "es6-symbol-3.1.2" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz"; + sha512 = "/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ=="; + }; + }; "es6-weak-map-2.0.3" = { name = "es6-weak-map"; packageName = "es6-weak-map"; @@ -14468,15 +14486,6 @@ let sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; }; }; - "escape-html-1.0.2" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz"; - sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c"; - }; - }; "escape-html-1.0.3" = { name = "escape-html"; packageName = "escape-html"; @@ -14522,13 +14531,13 @@ let sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; }; }; - "escodegen-1.11.1" = { + "escodegen-1.12.0" = { name = "escodegen"; packageName = "escodegen"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz"; - sha512 = "JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw=="; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz"; + sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg=="; }; }; "escodegen-1.9.1" = { @@ -14576,13 +14585,13 @@ let sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; }; }; - "eslint-6.1.0" = { + "eslint-6.4.0" = { name = "eslint"; packageName = "eslint"; - version = "6.1.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-6.1.0.tgz"; - sha512 = "QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-6.4.0.tgz"; + sha512 = "WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -14639,13 +14648,13 @@ let sha512 = "oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw=="; }; }; - "eslint-utils-1.4.0" = { + "eslint-utils-1.4.2" = { name = "eslint-utils"; packageName = "eslint-utils"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz"; - sha512 = "7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ=="; + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz"; + sha512 = "eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q=="; }; }; "eslint-visitor-keys-1.0.0" = { @@ -14657,6 +14666,15 @@ let sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="; }; }; + "eslint-visitor-keys-1.1.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; + sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="; + }; + }; "esm-3.2.25" = { name = "esm"; packageName = "esm"; @@ -14666,6 +14684,15 @@ let sha512 = "U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA=="; }; }; + "esniff-1.1.0" = { + name = "esniff"; + packageName = "esniff"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esniff/-/esniff-1.1.0.tgz"; + sha1 = "c66849229f91464dede2e0d40201ed6abf65f2ac"; + }; + }; "espree-3.5.4" = { name = "espree"; packageName = "espree"; @@ -14693,13 +14720,13 @@ let sha512 = "qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A=="; }; }; - "espree-6.0.0" = { + "espree-6.1.1" = { name = "espree"; packageName = "espree"; - version = "6.0.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-6.0.0.tgz"; - sha512 = "lJvCS6YbCn3ImT3yKkPe0+tJ+mH6ljhGNjHQH9mRtiO6gjhVAOhVXW1yjnwqGwTkK3bGbye+hb00nFNmu0l/1Q=="; + url = "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz"; + sha512 = "EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ=="; }; }; "esprima-2.0.0" = { @@ -14765,13 +14792,13 @@ let sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; }; }; - "estraverse-4.2.0" = { + "estraverse-4.3.0" = { name = "estraverse"; packageName = "estraverse"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; - sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; "estree-walker-0.5.2" = { @@ -14810,15 +14837,6 @@ let sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; }; }; - "etag-1.7.0" = { - name = "etag"; - packageName = "etag"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"; - sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; - }; - }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -14981,6 +14999,15 @@ let sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; + "eventemitter3-4.0.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz"; + sha512 = "qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg=="; + }; + }; "events-1.1.1" = { name = "events"; packageName = "events"; @@ -15224,15 +15251,6 @@ let sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; }; }; - "express-3.21.2" = { - name = "express"; - packageName = "express"; - version = "3.21.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz"; - sha1 = "0c2903ee5c54e63d65a96170764703550665a3de"; - }; - }; "express-3.4.4" = { name = "express"; packageName = "express"; @@ -15287,15 +15305,6 @@ let sha512 = "0Dzn6LQG0ohd2S+zJVMhsntwcDakEzm/uKJSZxH7B66ZBvTsB5LU/HvfO1dHG+RRiKuCg0aWfUa66PljnDjEdw=="; }; }; - "express-session-1.11.3" = { - name = "express-session"; - packageName = "express-session"; - version = "1.11.3"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz"; - sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af"; - }; - }; "express-session-1.16.2" = { name = "express-session"; packageName = "express-session"; @@ -15629,13 +15638,13 @@ let sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402"; }; }; - "fast-json-patch-2.2.0" = { + "fast-json-patch-2.2.1" = { name = "fast-json-patch"; packageName = "fast-json-patch"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.2.0.tgz"; - sha512 = "LdR6I9Cukps4lPUbSwrk81EHYo2XKsMnbiJJDQyBGGX7oTGovqBFxSVqQ+gOVoMxWfI1ua0vlHcXGpIggxtEFA=="; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.2.1.tgz"; + sha512 = "4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig=="; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -15674,13 +15683,13 @@ let sha512 = "QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw=="; }; }; - "fast-safe-stringify-2.0.6" = { + "fast-safe-stringify-2.0.7" = { name = "fast-safe-stringify"; packageName = "fast-safe-stringify"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz"; - sha512 = "q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg=="; + url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; + sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; "fast-text-encoding-1.0.0" = { @@ -15836,6 +15845,15 @@ let sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; }; }; + "figures-3.0.0" = { + name = "figures"; + packageName = "figures"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz"; + sha512 = "HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g=="; + }; + }; "file-entry-cache-2.0.0" = { name = "file-entry-cache"; packageName = "file-entry-cache"; @@ -15863,13 +15881,13 @@ let sha512 = "uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw=="; }; }; - "file-type-12.0.1" = { + "file-type-12.1.0" = { name = "file-type"; packageName = "file-type"; - version = "12.0.1"; + version = "12.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-12.0.1.tgz"; - sha512 = "YIs1E51cmqcmgF38ODjy0+M/l5DyfIIy3vngTOujQr/lXqkaSskfBniaZoZ1HVIpa5FTf5e7hCXS4TzxfNGMRQ=="; + url = "https://registry.npmjs.org/file-type/-/file-type-12.1.0.tgz"; + sha512 = "aZkf42yWGiH+vSOpbVgvbnoRuX4JiitMX9pHYqTHemNQ3lrx64iHi33YGAP7TSJSno56kxQY1lHmw8S6ujlFUg=="; }; }; "file-type-3.9.0" = { @@ -16034,15 +16052,6 @@ let sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426"; }; }; - "finalhandler-0.4.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz"; - sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b"; - }; - }; "finalhandler-1.1.1" = { name = "finalhandler"; packageName = "finalhandler"; @@ -16088,6 +16097,15 @@ let sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; }; }; + "find-requires-1.0.0" = { + name = "find-requires"; + packageName = "find-requires"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-requires/-/find-requires-1.0.0.tgz"; + sha512 = "UME7hNwBfzeISSFQcBEDemEEskpOjI/shPrpJM5PI4DSdn6hX0dmz+2dL70blZER2z8tSnTRL+2rfzlYgtbBoQ=="; + }; + }; "find-up-1.1.2" = { name = "find-up"; packageName = "find-up"; @@ -16331,13 +16349,13 @@ let sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ=="; }; }; - "flow-parser-0.104.0" = { + "flow-parser-0.107.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.104.0"; + version = "0.107.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.104.0.tgz"; - sha512 = "S2VGfM/qU4g9NUf2hA5qH/QmQsZIflxFO7victnYN1LR5SoOUsn3JtMhXLKHm2QlnZwwJKIdLt/uYyPr4LiQAA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.107.0.tgz"; + sha512 = "GtMCS8qzP0VskiE5qfN4zYiwjnClV/BxPZ4zUqMRUfyaF+gBuLHDTPqVLJ4ndGedrdv54510rsXDSbkCqUig+g=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -16457,13 +16475,13 @@ let sha1 = "5214d7537a4d06a4a301c0cc262feb84188002e7"; }; }; - "follow-redirects-1.7.0" = { + "follow-redirects-1.9.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.7.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz"; - sha512 = "m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz"; + sha512 = "CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A=="; }; }; "for-each-0.3.3" = { @@ -16610,13 +16628,13 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; - "form-data-2.5.0" = { + "form-data-2.5.1" = { name = "form-data"; packageName = "form-data"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.5.0.tgz"; - sha512 = "WXieX3G/8side6VIqx44ablyULoGruSde5PNTxoUyo5CeyAMX6nVWUd0rgist/EuX655cjhUhTo1Fo3tRYqbcA=="; + url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz"; + sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA=="; }; }; "format-0.2.2" = { @@ -16691,6 +16709,15 @@ let sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; }; }; + "freelist-1.0.3" = { + name = "freelist"; + packageName = "freelist"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/freelist/-/freelist-1.0.3.tgz"; + sha1 = "006775509f3935701784d3ed2fc9f12c9df1bab2"; + }; + }; "fresh-0.1.0" = { name = "fresh"; packageName = "fresh"; @@ -16718,15 +16745,6 @@ let sha1 = "3582499206c9723714190edd74b4604feb4a614c"; }; }; - "fresh-0.3.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"; - sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; - }; - }; "fresh-0.5.2" = { name = "fresh"; packageName = "fresh"; @@ -16772,6 +16790,15 @@ let sha512 = "KhjJmZAs2eqfhCb6PdPx4RcZtheGTz86tpTC5JTvqBn/xda+Nb+0C7dCyjOSN7T76H6a56LvH0SVXQMchLXDRw=="; }; }; + "fs-chunk-store-2.0.1" = { + name = "fs-chunk-store"; + packageName = "fs-chunk-store"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-2.0.1.tgz"; + sha512 = "V9PXz33rhq6E9lFmvmElmLyvEvnSeryU/TzfHnCEIpEU6Y/2Fyc4xEeeneV/pUgKG1mRAKSU+DBtHyO2GQ2EBA=="; + }; + }; "fs-constants-1.0.0" = { name = "fs-constants"; packageName = "fs-constants"; @@ -16817,6 +16844,15 @@ let sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9"; }; }; + "fs-extra-0.30.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz"; + sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0"; + }; + }; "fs-extra-0.6.4" = { name = "fs-extra"; packageName = "fs-extra"; @@ -16880,13 +16916,13 @@ let sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; }; - "fs-minipass-1.2.6" = { + "fs-minipass-1.2.7" = { name = "fs-minipass"; packageName = "fs-minipass"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz"; - sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ=="; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; + sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; }; }; "fs-mkdirp-stream-1.0.0" = { @@ -16934,6 +16970,15 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; + "fs2-0.3.5" = { + name = "fs2"; + packageName = "fs2"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fs2/-/fs2-0.3.5.tgz"; + sha512 = "EL6G81ucjbmmycRwgekYMjjbKGFSop+eHgYLvBiQydp0H0Qugwbs5qOhifSzbCLZPy25rgXxsxsSrFqpTkitwA=="; + }; + }; "fsevents-1.2.9" = { name = "fsevents"; packageName = "fsevents"; @@ -17564,15 +17609,6 @@ let sha1 = "3b44afa0943bdc31b2037b934791e2e084bcb7f6"; }; }; - "glob-7.0.6" = { - name = "glob"; - packageName = "glob"; - version = "7.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; - sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; - }; - }; "glob-7.1.2" = { name = "glob"; packageName = "glob"; @@ -17699,13 +17735,13 @@ let sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; }; - "global-agent-2.0.1" = { + "global-agent-2.1.0" = { name = "global-agent"; packageName = "global-agent"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/global-agent/-/global-agent-2.0.1.tgz"; - sha512 = "2iGb96/51XxsekctZR4IiP7SoWuGEkmFpsyySasq3RFmvIwDCQJzatB2NqK0sk7h2hVYQdRphL52lrO5grF/jg=="; + url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.0.tgz"; + sha512 = "o5BKvbhjGKHFRMkw+xtZeTEyyHGDsdXaFvOHDQx6pzCURtIaznEL2URkXfp2xxzth8Y/6n9yysHXnjjLH6soBw=="; }; }; "global-dirs-0.1.1" = { @@ -17817,6 +17853,15 @@ let sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; }; }; + "globalthis-1.0.0" = { + name = "globalthis"; + packageName = "globalthis"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.0.tgz"; + sha512 = "vcCAZTJ3r5Qcu5l8/2oyVdoFwxKgfYnMTR2vwWeux/NAVZK3PwcMaWkdUIn4GJbmKuRK7xcvDsLuK+CKcXyodg=="; + }; + }; "globalyzer-0.1.4" = { name = "globalyzer"; packageName = "globalyzer"; @@ -17835,6 +17880,15 @@ let sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8"; }; }; + "globby-6.1.0" = { + name = "globby"; + packageName = "globby"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + }; + }; "globby-8.0.2" = { name = "globby"; packageName = "globby"; @@ -17988,13 +18042,13 @@ let sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"; }; }; - "graceful-fs-3.0.11" = { + "graceful-fs-3.0.12" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "3.0.11"; + version = "3.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz"; - sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz"; + sha512 = "J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg=="; }; }; "graceful-fs-4.1.11" = { @@ -18006,13 +18060,13 @@ let sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; - "graceful-fs-4.2.1" = { + "graceful-fs-4.2.2" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz"; - sha512 = "b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz"; + sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="; }; }; "graceful-readlink-1.0.1" = { @@ -18078,13 +18132,13 @@ let sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog=="; }; }; - "graphql-14.4.2" = { + "graphql-14.5.6" = { name = "graphql"; packageName = "graphql"; - version = "14.4.2"; + version = "14.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-14.4.2.tgz"; - sha512 = "6uQadiRgnpnSS56hdZUSvFrVcQ6OF9y6wkxJfKquFtHlnl7+KSuWwSJsdwiK1vybm1HgcdbpGkCpvhvsVQ0UZQ=="; + url = "https://registry.npmjs.org/graphql/-/graphql-14.5.6.tgz"; + sha512 = "zJ6Oz8P1yptV4O4DYXdArSwvmirPetDOBnGFRBl0zQEC68vNW3Ny8qo8VzMgfr+iC8PKiRYJ+f2wub41oDCoQg=="; }; }; "graphql-anywhere-4.2.4" = { @@ -18132,22 +18186,13 @@ let sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw=="; }; }; - "graphql-extensions-0.8.1" = { + "graphql-extensions-0.10.3" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.8.1.tgz"; - sha512 = "d/L4x7/PPWhviJqi7jIWOVJPzfzagYgPizSQUpa+3hozbWhwpWEnfxwgL5/If5MnPUikBnqlkOLCyjHMNdipYA=="; - }; - }; - "graphql-extensions-0.9.1" = { - name = "graphql-extensions"; - packageName = "graphql-extensions"; - version = "0.9.1"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.9.1.tgz"; - sha512 = "JR/KStdwALd48B/xSG/Mi85zamuJd8THvVlzGM5juznPDN0wTYG5SARGzzvoqHxgxuUHYdzpvESwMAisORJdCQ=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.10.3.tgz"; + sha512 = "kwU0gUe+Qdfr8iZYT91qrPSwQNgPhB/ClF1m1LEPdxlptk5FhFmjpxAcbMZ8q7j0kjfnbp2IeV1OhRDCEPqz2w=="; }; }; "graphql-import-0.4.5" = { @@ -18411,13 +18456,13 @@ let sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; - "handlebars-4.1.2" = { + "handlebars-4.2.0" = { name = "handlebars"; packageName = "handlebars"; - version = "4.1.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz"; - sha512 = "nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw=="; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.2.0.tgz"; + sha512 = "Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw=="; }; }; "har-schema-1.0.5" = { @@ -18519,15 +18564,6 @@ let sha1 = "36077ef1d15f333484aa7fa77a28606f1c655b37"; }; }; - "has-binary-0.1.7" = { - name = "has-binary"; - packageName = "has-binary"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz"; - sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; - }; - }; "has-binary-data-0.1.1" = { name = "has-binary-data"; packageName = "has-binary-data"; @@ -18915,6 +18951,15 @@ let sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; }; }; + "hexer-1.5.0" = { + name = "hexer"; + packageName = "hexer"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hexer/-/hexer-1.5.0.tgz"; + sha1 = "b86ce808598e8a9d1892c571f3cedd86fc9f0653"; + }; + }; "highlight.js-8.2.0" = { name = "highlight.js"; packageName = "highlight.js"; @@ -18933,13 +18978,13 @@ let sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e"; }; }; - "highlight.js-9.15.9" = { + "highlight.js-9.15.10" = { name = "highlight.js"; packageName = "highlight.js"; - version = "9.15.9"; + version = "9.15.10"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.9.tgz"; - sha512 = "M0zZvfLr5p0keDMCAhNBp03XJbKBxUx5AfyfufMdFMEP4N/Xj6dh0IqC75ys7BAzceR34NgcvXjupRVaHBPPVQ=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.10.tgz"; + sha512 = "RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw=="; }; }; "hipchatter-0.3.2" = { @@ -19014,13 +19059,13 @@ let sha1 = "08a74d9272a9cc83ae8e6bbe0303f0ee76432094"; }; }; - "hosted-git-info-2.8.2" = { + "hosted-git-info-2.8.4" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.8.2"; + version = "2.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz"; - sha512 = "CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz"; + sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="; }; }; "hsl-regex-1.0.0" = { @@ -19203,15 +19248,6 @@ let sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew=="; }; }; - "http-errors-1.3.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; - sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; - }; - }; "http-errors-1.6.3" = { name = "http-errors"; packageName = "http-errors"; @@ -19257,6 +19293,16 @@ let sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; }; }; + "http-node-git://github.com/feross/http-node#webtorrent" = { + name = "http-node"; + packageName = "http-node"; + version = "1.2.0"; + src = fetchgit { + url = "git://github.com/feross/http-node"; + rev = "342ef8624495343ffd050bd0808b3750cf0e3974"; + sha256 = "d7408d01b05fcbd5bb4fb44fd3d7d71463bafd5124d7e69c6f3e97cef8c65368"; + }; + }; "http-parser-js-0.4.10" = { name = "http-parser-js"; packageName = "http-parser-js"; @@ -19266,6 +19312,15 @@ let sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; }; }; + "http-parser-js-0.4.13" = { + name = "http-parser-js"; + packageName = "http-parser-js"; + version = "0.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz"; + sha1 = "3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"; + }; + }; "http-proxy-1.17.0" = { name = "http-proxy"; packageName = "http-proxy"; @@ -19410,13 +19465,13 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; - "hypercore-7.5.1" = { + "hypercore-7.7.1" = { name = "hypercore"; packageName = "hypercore"; - version = "7.5.1"; + version = "7.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-7.5.1.tgz"; - sha512 = "tgololYj3O6Y0Mg6PK7EJntRu+auKSYuER2a8pVetPqnDSJ1RfAVlyVr3VmuS5W9hS0PwH4OXl4R/uVfkuNNoQ=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-7.7.1.tgz"; + sha512 = "boEiPCK848pNGACW1j111tJApu530e/UPpwbHytJZlrVf3YdgUIP1KL3aSi5xJFLUnuO8GLGl4lIsSeH8TaQQA=="; }; }; "hypercore-crypto-1.0.0" = { @@ -19428,13 +19483,13 @@ let sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw=="; }; }; - "hypercore-protocol-6.11.1" = { + "hypercore-protocol-6.12.0" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; - version = "6.11.1"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.11.1.tgz"; - sha512 = "4vyYGzSTRCfpIPnpYO/WN0VeS2oGeIrzCCwIXfz5TL2dyyHu7wF5xiigNuUfTn9n3cTOwwbH+EKsygTNsO2yfw=="; + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.12.0.tgz"; + sha512 = "T3oy9/7QFejqJX2RGcCUU1944e5/eKbLlSz9JPTNN1QbYFJgat/r7eTyOO8SMSLUimUmQx6YBMKhgYbdKzp7Bw=="; }; }; "hyperdrive-9.16.0" = { @@ -19491,24 +19546,6 @@ let sha512 = "7cCrVn/BcoSOGJwTilAjGgWWzUDg4scTLX1sIBMWq6QjYYBrT+ChSAvmgVyQxkHinaIcswC04XK6l15RxM4Dkg=="; }; }; - "iconv-lite-0.4.11" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.11"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz"; - sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; - }; - }; - "iconv-lite-0.4.13" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.13"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; - sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; - }; - }; "iconv-lite-0.4.23" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -19608,13 +19645,13 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; - "ignore-5.1.2" = { + "ignore-5.1.4" = { name = "ignore"; packageName = "ignore"; - version = "5.1.2"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.2.tgz"; - sha512 = "vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz"; + sha512 = "MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A=="; }; }; "ignore-by-default-1.0.1" = { @@ -19626,13 +19663,13 @@ let sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; }; }; - "ignore-walk-3.0.1" = { + "ignore-walk-3.0.2" = { name = "ignore-walk"; packageName = "ignore-walk"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; - sha512 = "DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ=="; + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.2.tgz"; + sha512 = "EXyErtpHbn75ZTsOADsfx6J/FPo6/5cjev46PXrcTpd8z3BoRkXgYu9/JVqrI7tusjmwCZutGeRJeU0Wo1e4Cw=="; }; }; "image-data-uri-2.0.1" = { @@ -19698,13 +19735,13 @@ let sha1 = "0ecdad0c546332672d7b5b511b26bb18ce56e73f"; }; }; - "immediate-chunk-store-2.0.0" = { + "immediate-chunk-store-2.1.0" = { name = "immediate-chunk-store"; packageName = "immediate-chunk-store"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-2.0.0.tgz"; - sha512 = "5s6NiCGbtWc+OQA60jrre54w12U7tynIyUNjO5LJjNA5lWwvCv6640roq8Wk/wIuaqnd4Pgtp453OyJ7hbONkQ=="; + url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-2.1.0.tgz"; + sha512 = "QshP0SFpsy/bHQBjYMgzCcnLoqTj6PHFg8ZkPi2WbTw1qddNy0puuPDaFlXyrsZAdWMT3QziPDMzfj+mzCVMYg=="; }; }; "import-fresh-2.0.0" = { @@ -20031,22 +20068,31 @@ let sha512 = "QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg=="; }; }; - "inquirer-6.2.2" = { + "inquirer-6.5.0" = { name = "inquirer"; packageName = "inquirer"; - version = "6.2.2"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz"; - sha512 = "Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA=="; + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz"; + sha512 = "scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA=="; }; }; - "inquirer-6.5.0" = { + "inquirer-6.5.1" = { name = "inquirer"; packageName = "inquirer"; - version = "6.5.0"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz"; - sha512 = "scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA=="; + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz"; + sha512 = "uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw=="; + }; + }; + "inquirer-6.5.2" = { + name = "inquirer"; + packageName = "inquirer"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz"; + sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; }; }; "inquirer-autocomplete-prompt-1.0.1" = { @@ -20166,13 +20212,13 @@ let sha1 = "ae9fbf93b984878785d50a8de1b356956058cf5c"; }; }; - "internal-ip-3.0.1" = { + "internal-ip-4.3.0" = { name = "internal-ip"; packageName = "internal-ip"; - version = "3.0.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz"; - sha512 = "NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q=="; + url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz"; + sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; "interpret-1.1.0" = { @@ -20418,13 +20464,13 @@ let sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; }; }; - "is-absolute-url-3.0.0" = { + "is-absolute-url-3.0.2" = { name = "is-absolute-url"; packageName = "is-absolute-url"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.0.tgz"; - sha512 = "3OkP8XrM2Xq4/IxsJnClfMp3OaM3TAatLPLKPeWcxLBTrpe6hihwtX+XZfJTcXg/FTRi4qjy0y/C5qiyNxY24g=="; + url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.2.tgz"; + sha512 = "+5g/wLlcm1AcxSP7014m6GvbPHswDx980vD/3bZaap8aGV9Yfs7Q6y6tfaupgZ5O74Byzc8dGrSCJ+bFXx0KdA=="; }; }; "is-accessor-descriptor-0.1.6" = { @@ -20463,6 +20509,15 @@ let sha512 = "A1IGAPO5AW9vSh7omxIlOGwIqEvpW/TA+DksVOPM5ODuxKlZS09+TEM1E3275lJqO2oJ38vDpeAL3DCIiHE6eA=="; }; }; + "is-arguments-1.0.4" = { + name = "is-arguments"; + packageName = "is-arguments"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz"; + sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="; + }; + }; "is-arrayish-0.2.1" = { name = "is-arrayish"; packageName = "is-arrayish"; @@ -21147,13 +21202,13 @@ let sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="; }; }; - "is-retry-allowed-1.1.0" = { + "is-retry-allowed-1.2.0" = { name = "is-retry-allowed"; packageName = "is-retry-allowed"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; - sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; + sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="; }; }; "is-root-1.0.0" = { @@ -21471,6 +21526,15 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; + "iso8601-duration-1.2.0" = { + name = "iso8601-duration"; + packageName = "iso8601-duration"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/iso8601-duration/-/iso8601-duration-1.2.0.tgz"; + sha512 = "ErTBd++b17E8nmWII1K1uZtBgD1E8RjyvwmxlCjPHNqHMD7gmcMHOw0E8Ro/6+QT4PhHRSnnMo7bxa1vFPkwhg=="; + }; + }; "isobject-2.1.0" = { name = "isobject"; packageName = "isobject"; @@ -21606,13 +21670,13 @@ let sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; }; }; - "jaeger-client-3.15.0" = { + "jaeger-client-3.16.0" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.15.0.tgz"; - sha512 = "0SfuEE7E6XVLhu8th5JG/ACtnIWq4Tad0iSst3+De9HOMSz1RI0Tl1MLXzetudI670rqfCs4m37XCTMRgu8oxg=="; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.16.0.tgz"; + sha512 = "F4y4rQ7RTYFDu6QGsFXOnrZb2Pk6BvhnecOZQZvM+BmNahgE+5y9mfToMe4SsELuJ7NQM5JF+Oau1u/xwefr9A=="; }; }; "javascript-stringify-1.6.0" = { @@ -21678,13 +21742,13 @@ let sha512 = "57mw92ZOKoR77YBLUkauN1xNq1xlxOm2KaPty/jlYrkEyGotUBBvq46a6wXh6d3aM4CccGuwymSge18/9IoB3A=="; }; }; - "joplin-turndown-plugin-gfm-1.0.8" = { + "joplin-turndown-plugin-gfm-1.0.9" = { name = "joplin-turndown-plugin-gfm"; packageName = "joplin-turndown-plugin-gfm"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.8.tgz"; - sha512 = "uXgq2zGvjiMl/sXG7946EGhh1pyGbZ0L/6z21LBi8D6BJgHQufmXdve/UP3zpgnhiFhfXvzGY10uNaTuDQ99iQ=="; + url = "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.9.tgz"; + sha512 = "SOa/Uiy3nyoBGtHqFe+TBg10UTIOzzcUUzNhx2MyR4Z0vbKL3enGggGypig1t7G5uHwv5j+NhooRuM619Zk0bw=="; }; }; "jpeg-js-0.1.2" = { @@ -21732,13 +21796,13 @@ let sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="; }; }; - "js-beautify-1.10.1" = { + "js-beautify-1.10.2" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.1.tgz"; - sha512 = "4y8SHOIRC+/YQ2gs3zJEKBUraQerq49FJYyXRpdzUGYQzCq8q9xtIh0YXial1S5KmonVui4aiUb6XaGyjE51XA=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz"; + sha512 = "ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ=="; }; }; "js-levenshtein-1.1.6" = { @@ -21885,13 +21949,13 @@ let sha512 = "y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw=="; }; }; - "jsdom-15.1.1" = { + "jsdom-14.1.0" = { name = "jsdom"; packageName = "jsdom"; - version = "15.1.1"; + version = "14.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-15.1.1.tgz"; - sha512 = "cQZRBB33arrDAeCrAEWn1U3SvrvC8XysBua9Oqg1yWrsY/gYcusloJC3RZJXuY5eehSCmws8f2YeliCqGSkrtQ=="; + url = "https://registry.npmjs.org/jsdom/-/jsdom-14.1.0.tgz"; + sha512 = "O901mfJSuTdwU2w3Sn+74T+RnDVP+FuV5fH8tcPWyqrseRAb0s5xOtPgCFiPOtLcyK7CLIJwPyD83ZqQWvA5ng=="; }; }; "jsdom-7.2.2" = { @@ -21957,6 +22021,15 @@ let sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; }; }; + "json-cycle-1.3.0" = { + name = "json-cycle"; + packageName = "json-cycle"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-cycle/-/json-cycle-1.3.0.tgz"; + sha512 = "FD/SedD78LCdSvJaOUQAXseT8oQBb5z6IVYaQaCrVUlu9zOAr1BDdKyVYQaSD/GDsAMrXpKcOyBD4LIl8nfjHw=="; + }; + }; "json-edm-parser-0.1.2" = { name = "json-edm-parser"; packageName = "json-edm-parser"; @@ -22128,15 +22201,6 @@ let sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; }; }; - "json3-3.3.2" = { - name = "json3"; - packageName = "json3"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; - sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; - }; - }; "json5-0.5.1" = { name = "json5"; packageName = "json5"; @@ -22525,22 +22589,22 @@ let sha512 = "mgAJZeFYbpP0xzJzmS0TQTYoFI0sjy3GnKFhg8wyboL+KvWg2WLaA2Oy9PthLPx2Rxz4WeBMk4y3MSOrDJ95FA=="; }; }; - "k-rpc-5.0.0" = { + "k-rpc-5.1.0" = { name = "k-rpc"; packageName = "k-rpc"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc/-/k-rpc-5.0.0.tgz"; - sha512 = "vCH2rQdfMOS+MlUuTSuar1pS2EMrltURf9LmAR9xR6Jik0XPlMX3vEixgqMn17wKmFVCublJqSJ4hJIP7oKZ3Q=="; + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-5.1.0.tgz"; + sha512 = "FGc+n70Hcjoa/X2JTwP+jMIOpBz+pkRffHnSl9yrYiwUxg3FIgD50+u1ePfJUOnRCnx6pbjmVk5aAeB1wIijuQ=="; }; }; - "k-rpc-socket-1.8.0" = { + "k-rpc-socket-1.11.1" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.8.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.8.0.tgz"; - sha512 = "f/9TynsO8YYjZ6JjNNtSSH7CJcIHcio1buy3zqByGxb/GX8AWLdL6FZEWTrN8V3/J7W4/E0ZTQQ+Jt2rVq7ELg=="; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.11.1.tgz"; + sha512 = "8xtA8oqbZ6v1Niryp2/g4GxW16EQh5MvrUylQoOG+zcrDff5CKttON2XUXvMwlIHq4/2zfPVFiinAccJ+WhxoA=="; }; }; "keep-alive-agent-0.0.1" = { @@ -22912,13 +22976,13 @@ let sha512 = "XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="; }; }; - "length-prefixed-message-3.0.3" = { + "length-prefixed-message-3.0.4" = { name = "length-prefixed-message"; packageName = "length-prefixed-message"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/length-prefixed-message/-/length-prefixed-message-3.0.3.tgz"; - sha1 = "245474d69abc0614dca368dc35aa8074982a23ac"; + url = "https://registry.npmjs.org/length-prefixed-message/-/length-prefixed-message-3.0.4.tgz"; + sha512 = "Tqyx4nggb9nkLD6p4hyIz7UiVNg5u3OnCP2h0hS/HXpheH88rsoNEgNB8xTnpPMw6zWXGZ7Cpg1zhWPlsJ0/TQ=="; }; }; "less-2.7.3" = { @@ -22993,13 +23057,13 @@ let sha512 = "m5JRIyHZn5VnCCFeRegJkn5bQd3MJK5qZX12zg3Oivc8+BUIS2yFS6ANMMeHX2ieGxucNvEn6/ZnyjmZQLLUWw=="; }; }; - "level-packager-5.0.2" = { + "level-packager-5.0.3" = { name = "level-packager"; packageName = "level-packager"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/level-packager/-/level-packager-5.0.2.tgz"; - sha512 = "sJWdeW5tObvTvgP4Xf2psL5CEUsZjDjiTtlcimHp3Ifd4qbmkEGquN82C5ZtC7VpWEiISeUIBtIcCskVzEpvFw=="; + url = "https://registry.npmjs.org/level-packager/-/level-packager-5.0.3.tgz"; + sha512 = "Ut62o3nvUNCxYldM5+13+0sYow6ifKj2C26/0ToB7zKgdypF5wRKcVkcztQVwsQi+ZnrmDzhimp7FKP5Ynv6Rg=="; }; }; "level-post-1.0.7" = { @@ -23020,13 +23084,13 @@ let sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA=="; }; }; - "leveldown-5.1.1" = { + "leveldown-5.2.0" = { name = "leveldown"; packageName = "leveldown"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/leveldown/-/leveldown-5.1.1.tgz"; - sha512 = "4n2R/vEA/sssh5TKtFwM9gshW2tirNoURLqekLRUUzuF+eUBLFAufO8UW7bz8lBbG2jw8tQDF3LC+LcUCc12kg=="; + url = "https://registry.npmjs.org/leveldown/-/leveldown-5.2.0.tgz"; + sha512 = "Ml6mWFqhhyUbuJUVaOd6ZVBHA5T0XLOK0cwNRIBEDJCjBiJBM3fpi4gdTIhU5/tWqtxMFMQbmo/U7a9rbA1stg=="; }; }; "levelup-0.19.1" = { @@ -23038,13 +23102,13 @@ let sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; }; }; - "levelup-4.1.0" = { + "levelup-4.2.0" = { name = "levelup"; packageName = "levelup"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/levelup/-/levelup-4.1.0.tgz"; - sha512 = "+Qhe2/jb5affN7BeFgWUUWVdYoGXO2nFS3QLEZKZynnQyP9xqA+7wgOz3fD8SST2UKpHQuZgjyJjTcB2nMl2dQ=="; + url = "https://registry.npmjs.org/levelup/-/levelup-4.2.0.tgz"; + sha512 = "TiHUSYrSUQhG7a5MZIKq6ClDcARSvMvSy5GTM8I62tHV5XiWqf+aInF+CAenQKzVRG2s6fufg62Lv8614Extyg=="; }; }; "leven-2.1.0" = { @@ -23389,15 +23453,6 @@ let sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777"; }; }; - "lodash-4.17.14" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.14"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz"; - sha512 = "mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw=="; - }; - }; "lodash-4.17.15" = { name = "lodash"; packageName = "lodash"; @@ -24415,13 +24470,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log-update-3.2.0" = { + "log-update-3.3.0" = { name = "log-update"; packageName = "log-update"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-3.2.0.tgz"; - sha512 = "KJ6zAPIHWo7Xg1jYror6IUDFJBq1bQ4Bi4wAEp2y/0ScjBBVi/g0thr0sUVhuvuXauWzczt7T2QHghPDNnKBuw=="; + url = "https://registry.npmjs.org/log-update/-/log-update-3.3.0.tgz"; + sha512 = "YSKm5n+YjZoGZT5lfmOqasVH1fIH9xQA9A81Y48nZ99PxAP62vdCCtua+Gcu6oTn0nqtZd/LwRV+Vflo53ZDWA=="; }; }; "log4js-4.5.1" = { @@ -24442,13 +24497,13 @@ let sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; - "loglevel-1.6.3" = { + "loglevel-1.6.4" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz"; - sha512 = "LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz"; + sha512 = "p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g=="; }; }; "loglevel-colored-level-prefix-1.0.0" = { @@ -24730,6 +24785,15 @@ let sha1 = "3b1ded0d1ba82e188b9bdaba9eee6486f864a434"; }; }; + "lsmod-1.0.0" = { + name = "lsmod"; + packageName = "lsmod"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz"; + sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b"; + }; + }; "lstream-0.0.4" = { name = "lstream"; packageName = "lstream"; @@ -25036,13 +25100,13 @@ let sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; }; }; - "map-obj-3.1.0" = { + "map-obj-4.1.0" = { name = "map-obj"; packageName = "map-obj"; - version = "3.1.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-3.1.0.tgz"; - sha512 = "Xg1iyYz/+iIW6YoMldux47H/e5QZyDSB41Kb0ev+YYHh3FJnyyzY0vTk/WbVeWcCvdXd70cOriUBmhP8alUFBA=="; + url = "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz"; + sha512 = "glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g=="; }; }; "map-stream-0.0.7" = { @@ -25225,15 +25289,6 @@ let sha1 = "c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"; }; }; - "matcher-1.1.1" = { - name = "matcher"; - packageName = "matcher"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz"; - sha512 = "+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg=="; - }; - }; "matcher-2.0.0" = { name = "matcher"; packageName = "matcher"; @@ -25261,6 +25316,16 @@ let sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="; }; }; + "mathjax-full-git://github.com/mathjax/MathJax-src.git" = { + name = "mathjax-full"; + packageName = "mathjax-full"; + version = "3.0.0"; + src = fetchgit { + url = "git://github.com/mathjax/MathJax-src.git"; + rev = "0d74266e1820220d33cb6b29d4ca3575b352ac0d"; + sha256 = "a4d1a272ec79367f3e4515d1cbd9bbe3f77687aa17443398288e91a6f23b1241"; + }; + }; "md5-2.2.1" = { name = "md5"; packageName = "md5"; @@ -25576,15 +25641,6 @@ let sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; }; }; - "merge-descriptors-1.0.0" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; - sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; - }; - }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -25603,13 +25659,13 @@ let sha1 = "a5de46538dae84d4114cc5ea02b4772a6346701f"; }; }; - "merge2-1.2.4" = { + "merge2-1.3.0" = { name = "merge2"; packageName = "merge2"; - version = "1.2.4"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.2.4.tgz"; - sha512 = "FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A=="; + url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz"; + sha512 = "2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw=="; }; }; "merkle-tree-stream-3.0.3" = { @@ -25639,15 +25695,6 @@ let sha1 = "833afbb5a2a6385e2d9ae3d935e39e33eaea5231"; }; }; - "method-override-2.3.10" = { - name = "method-override"; - packageName = "method-override"; - version = "2.3.10"; - src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz"; - sha1 = "e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4"; - }; - }; "method-override-3.0.0" = { name = "method-override"; packageName = "method-override"; @@ -25801,6 +25848,15 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; + "mime-2.4.3" = { + name = "mime"; + packageName = "mime"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz"; + sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="; + }; + }; "mime-2.4.4" = { name = "mime"; packageName = "mime"; @@ -25837,6 +25893,15 @@ let sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; + "mime-db-1.41.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.41.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.41.0.tgz"; + sha512 = "B5gxBI+2K431XW8C2rcc/lhppbuji67nf9v39eH8pkWoZDxnAL0PxdpH32KYRScniF8qDHBDlI+ipgg5WrCUYw=="; + }; + }; "mime-types-2.0.14" = { name = "mime-types"; packageName = "mime-types"; @@ -26026,13 +26091,13 @@ let sha512 = "oP88Dw3LK/pdrKyMdlbmg3W50969UNr4ctISzJfPl+YPYHTAOrS+dihXnsgRNKSRIzDsrnV3eE2CCVlZbpOKdQ=="; }; }; - "minipass-2.3.5" = { + "minipass-2.6.2" = { name = "minipass"; packageName = "minipass"; - version = "2.3.5"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz"; - sha512 = "Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA=="; + url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz"; + sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ=="; }; }; "minitouch-prebuilt-1.2.0" = { @@ -26044,13 +26109,13 @@ let sha512 = "YBTCTK0kPQIry0dJUqnj+OKw7qk1BDk4JnOH55ujaL4vtf9f3fRsHtD+zz899SKwT2t319HrrfBNwMLx6h2Vtg=="; }; }; - "minizlib-1.2.1" = { + "minizlib-1.2.2" = { name = "minizlib"; packageName = "minizlib"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz"; - sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA=="; + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz"; + sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ=="; }; }; "mired-0.0.0" = { @@ -26107,6 +26172,15 @@ let sha1 = "4fb949441dab182540f1fe035ba60e1947a5e57e"; }; }; + "mj-context-menu-0.2.0" = { + name = "mj-context-menu"; + packageName = "mj-context-menu"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mj-context-menu/-/mj-context-menu-0.2.0.tgz"; + sha512 = "yJxrWBHCjFZEHsZgfs7m5g9OSCNzsVYadW6f6lX3pgZL67vmodtSW/4zhsYmuDKweXfHs0M1kJge1uQIasWA+g=="; + }; + }; "mkdirp-0.3.0" = { name = "mkdirp"; packageName = "mkdirp"; @@ -26260,15 +26334,6 @@ let sha512 = "IrhznRheWtDcT/TEL3cqaT4UJOqc5G3K8TnGq29PRXZil+sWGPkcM6SHVUZVirTKFKceuCadfyDMjmRoXCN21A=="; }; }; - "morgan-1.6.1" = { - name = "morgan"; - packageName = "morgan"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz"; - sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2"; - }; - }; "morgan-1.9.1" = { name = "morgan"; packageName = "morgan"; @@ -26296,22 +26361,22 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; - "mp4-box-encoding-1.3.0" = { + "mp4-box-encoding-1.4.1" = { name = "mp4-box-encoding"; packageName = "mp4-box-encoding"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.3.0.tgz"; - sha512 = "U4pMLpjT/UzB8d36dxj6Mf1bG9xypEvgbuRIa1fztRXNKKTCAtRxsnFZhNOd7YDFOKtjBgssYGvo4H/Q3ZY1MA=="; + url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.4.1.tgz"; + sha512 = "2/PRtGGiqPc/VEhbm7xAQ+gbb7yzHjjMAv6MpAifr5pCpbh3fQUdj93uNgwPiTppAGu8HFKe3PeU+OdRyAxStA=="; }; }; - "mp4-stream-3.0.0" = { + "mp4-stream-3.1.0" = { name = "mp4-stream"; packageName = "mp4-stream"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.0.0.tgz"; - sha512 = "UCvsZaEP2b+Tl2mJOmb+TXdA2f24ggNUadgQkpgvaNDZQNGs6/O8ivFcj9ogf4Bj4R6dbqv18VXUdp16BhXk/A=="; + url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.1.0.tgz"; + sha512 = "ZQQjf0VEiqPucwRvmT3e0pfZfMSE3nc5ngGUiN1+2VMxCtrInrlAjZ2K6jpNmxSZ/roiQne/ovYJYTeOvZDXPw=="; }; }; "mpath-0.2.1" = { @@ -26368,15 +26433,6 @@ let sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; }; - "ms-0.7.2" = { - name = "ms"; - packageName = "ms"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; - }; - }; "ms-2.0.0" = { name = "ms"; packageName = "ms"; @@ -26584,15 +26640,6 @@ let sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4"; }; }; - "multiparty-3.3.2" = { - name = "multiparty"; - packageName = "multiparty"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; - sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; - }; - }; "multiparty-4.2.1" = { name = "multiparty"; packageName = "multiparty"; @@ -26647,13 +26694,13 @@ let sha512 = "xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ=="; }; }; - "multistream-3.1.0" = { + "multistream-4.0.0" = { name = "multistream"; packageName = "multistream"; - version = "3.1.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/multistream/-/multistream-3.1.0.tgz"; - sha512 = "zBgD3kn8izQAN/TaL1PCMv15vYpf+Vcrsfub06njuYVYlzUldzpopTlrEZ53pZVEbfn3Shtv7vRFoOv6LOV87Q=="; + url = "https://registry.npmjs.org/multistream/-/multistream-4.0.0.tgz"; + sha512 = "t0C8MAtH/d3Y+5nooEtUMWli92lVw9Jhx4uOhRl5GAwS5vc+YTmp/VXNJNsCBAMeEyK/6zhbk6x9JE3AiCvo4g=="; }; }; "mustache-2.3.2" = { @@ -26881,13 +26928,22 @@ let sha512 = "Hv9USGyH8EsPy0o8pPWE7x3YRIfuZDgMBirzjU6XLebhiSK2g53JlfqgolD0c39ne6wXAfaBNcIAvYe22Bav+Q=="; }; }; - "nanoid-2.0.3" = { + "nanoguard-1.2.1" = { + name = "nanoguard"; + packageName = "nanoguard"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoguard/-/nanoguard-1.2.1.tgz"; + sha512 = "XowCxURA68arCQEypYKAxyIvBUP2EkqA8mZCXqJ2yzLpFblxSjiP06PUUpVK2no3cgGhsbRlBrsEuYIflxu79w=="; + }; + }; + "nanoid-2.1.1" = { name = "nanoid"; packageName = "nanoid"; - version = "2.0.3"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-2.0.3.tgz"; - sha512 = "NbaoqdhIYmY6FXDRB4eYtDVC9Z9eCbn8TyaiC16LNKtpPv/aqa0tOPD8y6gNE4yUNnaZ7LLhYtXOev/6+cBtfw=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-2.1.1.tgz"; + sha512 = "0YbJdaL4JFoejIOoawgLcYValFGJ2iyUuVDIWL3g8Es87SSOWFbWdRUMV3VMSiyPs3SQ3QxCIxFX00q5DLkMCw=="; }; }; "nanolru-1.0.0" = { @@ -26944,6 +27000,15 @@ let sha512 = "Tr0DNY4RzTaBG2W2m3l7ZtFuJChTH6VZhXVhkGGjF/4cZTt+i8GcM9ozD+30Lmr4mDoZ5Xx34t2o4GJqYWDGcg=="; }; }; + "napi-macros-2.0.0" = { + name = "napi-macros"; + packageName = "napi-macros"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/napi-macros/-/napi-macros-2.0.0.tgz"; + sha512 = "A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg=="; + }; + }; "native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = { name = "native-dns-cache"; packageName = "native-dns-cache"; @@ -27029,6 +27094,15 @@ let sha1 = "17b09581988979fddafe0201e931ba933c96cbb4"; }; }; + "ncjsm-3.0.0" = { + name = "ncjsm"; + packageName = "ncjsm"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ncjsm/-/ncjsm-3.0.0.tgz"; + sha512 = "UEEzv/yccTNNyS7ZLmOUquT/k9ttrJCgGrswRrfuj4riplQquZoxAhCaoxSATj59gdpLaGWqXDXRxrRS2zOarw=="; + }; + }; "nconf-0.10.0" = { name = "nconf"; packageName = "nconf"; @@ -27110,13 +27184,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.18.0" = { + "nearley-2.19.0" = { name = "nearley"; packageName = "nearley"; - version = "2.18.0"; + version = "2.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.18.0.tgz"; - sha512 = "/zQOMCeJcioI0xJtd5RpBiWw2WP7wLe6vq8/3Yu0rEwgus/G/+pViX80oA87JdVgjRt2895mZSv2VfZmy4W1uw=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.0.tgz"; + sha512 = "2v52FTw7RPqieZr3Gth1luAXZR7Je6q3KaDHY5bjl/paDUdMu35fZ8ICNgiYJRr3tf3NMvIQQR1r27AvEr9CRA=="; }; }; "neat-csv-2.1.0" = { @@ -27209,15 +27283,6 @@ let sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }; }; - "negotiator-0.6.1" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"; - sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; - }; - }; "negotiator-0.6.2" = { name = "negotiator"; packageName = "negotiator"; @@ -27326,13 +27391,13 @@ let sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; }; }; - "nextgen-events-1.1.1" = { + "nextgen-events-1.3.0" = { name = "nextgen-events"; packageName = "nextgen-events"; - version = "1.1.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.1.1.tgz"; - sha512 = "vnKAjcvttm+ILOpLuNEFUuqYAfMYfvThpTGLLZT8w+mSCMmnRsKt/qWNuNkb3/RgNyon3EqPT6bDy4xSJkbKsA=="; + url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.3.0.tgz"; + sha512 = "eBz5mrO4Hw2eenPVm0AVPHuAzg/RZetAWMI547RH8O9+a0UYhCysiZ3KoNWslnWNlHetb9kzowEshsKsmFo2YQ=="; }; }; "nice-try-1.0.5" = { @@ -27425,13 +27490,13 @@ let sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg=="; }; }; - "node-abi-2.10.0" = { + "node-abi-2.11.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.10.0.tgz"; - sha512 = "OT0WepUvYHXdki6DU8LWhEkuo3M44i2paWBYtH9qXtPb9YiKlYEKa5WUII20XEcOv7UJPzfB0kZfPZdW46zdkw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.11.0.tgz"; + sha512 = "kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g=="; }; }; "node-addon-api-1.7.1" = { @@ -27615,13 +27680,13 @@ let sha512 = "zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A=="; }; }; - "node-gyp-build-4.1.0" = { + "node-gyp-build-4.1.1" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.0.tgz"; - sha512 = "rGLv++nK20BG8gc0MzzcYe1Nl3p3mtwJ74Q2QD0HTEDKZ6NvOFSelY6s2QBPWIHRR8h7hpad0LiwajfClBJfNg=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz"; + sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ=="; }; }; "node-int64-0.4.0" = { @@ -27669,13 +27734,13 @@ let sha512 = "SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ=="; }; }; - "node-notifier-5.4.2" = { + "node-notifier-5.4.3" = { name = "node-notifier"; packageName = "node-notifier"; - version = "5.4.2"; + version = "5.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.2.tgz"; - sha512 = "85nkTziazE2dR4pyoLxMwz0b9MmxFQPVXYs/WlWI7CPtBkARJOV+89khdNjpbclXIJDECQYnTvh1xuZV3WHkCA=="; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz"; + sha512 = "M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q=="; }; }; "node-persist-2.1.0" = { @@ -27732,13 +27797,13 @@ let sha512 = "OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ=="; }; }; - "node-red-node-email-1.6.2" = { + "node-red-node-email-1.6.3" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-1.6.2.tgz"; - sha512 = "px5xvIE649aEAh08hAqnFV/IyqN1EQ9nHsTp8OWvVdNZqfAEcT0O6jjMONN/ur5Az1Uyrc7cA3c+iYmc2yzGMg=="; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-1.6.3.tgz"; + sha512 = "78O7CASdGAP2wmMJvqsMYdNrCHI54lSE97hWpbNQPG2QC2d15TEUQU+E8KgNzquPtJn0Pjh/cvzt+kQwKjkaUg=="; }; }; "node-red-node-feedparser-0.1.14" = { @@ -27750,13 +27815,13 @@ let sha512 = "Bb9M5bFrOqoFxBVxfstBM/g+VPaV4EPQptXQBMrlsCd3P40CXcGL0mDylXU+3cekWNd5hLHfqTHvXJdkowHGDw=="; }; }; - "node-red-node-rbe-0.2.4" = { + "node-red-node-rbe-0.2.5" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.4.tgz"; - sha512 = "ft/8/dTRGzGQ9vCnAzuBxzR+aDv4Yun/vuSKi/eI5Qj2/ZBal28L9HpWziSTWlLrMhZns8CRz7s2p84P2ee/vA=="; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.5.tgz"; + sha512 = "WPwIOZIdDprgfqOe8bEun47wkFFc+5Uw/1w3O/kZn/kS2IpI1q+wijUDK+Hw8q4d8KgA58B30wh+10UvXzsPDA=="; }; }; "node-red-node-sentiment-0.1.4" = { @@ -27786,13 +27851,13 @@ let sha512 = "8V4tLL0nM1DOUgEtTOBSTZcLbtZ4Gg4CPFVHiPmLCo2QYTMQ0JdBIYj4pg95LbJbYkV721fqsw1RDsitBfYuCQ=="; }; }; - "node-releases-1.1.26" = { + "node-releases-1.1.32" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.26"; + version = "1.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.26.tgz"; - sha512 = "fZPsuhhUHMTlfkhDLGtfY80DSJTjOcx+qD1j5pqPkuhUHVS7xHZIg9EE4DHK8O3f0zTxXHX5VIkDG8pu98/wfQ=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.32.tgz"; + sha512 = "VhVknkitq8dqtWoluagsGPn3dxTvN9fwgR59fV3D7sLBHe0JfDramsMI8n8mY//ccq/Kkrf8ZRHRpsyVZ3qw1A=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -27903,13 +27968,13 @@ let sha512 = "TEHBNBPHv7Ie/0o3HXnb7xrPSSQmH1dXwQKRaMKDBGt/ZN54lvDVujP6hKkO/vjkIYL9rK8kHSG11+G42Nhxuw=="; }; }; - "nodemon-1.19.1" = { + "nodemon-1.19.2" = { name = "nodemon"; packageName = "nodemon"; - version = "1.19.1"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.1.tgz"; - sha512 = "/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.2.tgz"; + sha512 = "hRLYaw5Ihyw9zK7NF+9EUzVyS6Cvgc14yh8CAYr38tPxJa6UrOxwAQ351GwrgoanHCF0FalQFn6w5eoX/LGdJw=="; }; }; "nomnom-1.8.1" = { @@ -28119,13 +28184,13 @@ let sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67"; }; }; - "npm-lifecycle-3.1.2" = { + "npm-lifecycle-3.1.3" = { name = "npm-lifecycle"; packageName = "npm-lifecycle"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.2.tgz"; - sha512 = "nhfOcoTHrW1lJJlM2o77vTE2RWR4YOVyj7YzmY0y5itsMjEuoJHteio/ez0BliENEPsNxIUQgwhyEW9dShj3Ww=="; + url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.3.tgz"; + sha512 = "M0QmmqbEHBXxDrmc6X3+eKjW9+F7Edg1ENau92WkYw1sox6wojHzEZJIRm1ItljEiaigZlKL8mXni/4ylAy1Dg=="; }; }; "npm-package-arg-6.1.0" = { @@ -28137,6 +28202,15 @@ let sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA=="; }; }; + "npm-package-arg-6.1.1" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz"; + sha512 = "qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg=="; + }; + }; "npm-packlist-1.4.4" = { name = "npm-packlist"; packageName = "npm-packlist"; @@ -28173,6 +28247,15 @@ let sha512 = "+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA=="; }; }; + "npm-pick-manifest-3.0.2" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz"; + sha512 = "wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw=="; + }; + }; "npm-prefix-1.2.0" = { name = "npm-prefix"; packageName = "npm-prefix"; @@ -28200,13 +28283,13 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-4.0.0" = { + "npm-registry-fetch-4.0.1" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz"; - sha512 = "Jllq35Jag8dtv0M17ue74XtdQTyqKzuAYGiX9mAjOhkmNjib3bBUgK6mUY61+AHnXeSRobQkpY3/xIOS/omptw=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.1.tgz"; + sha512 = "1ZQ+yjnxc698R5h9Yje9CASapzAZr7aYDkJDdERg9xg2hOEY0vRJwskOaJAXq8N/eLavzvW4g564YAfq6zMn/A=="; }; }; "npm-run-4.1.2" = { @@ -28435,15 +28518,6 @@ let sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; }; }; - "object-assign-4.1.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; - sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; - }; - }; "object-assign-4.1.1" = { name = "object-assign"; packageName = "object-assign"; @@ -28507,6 +28581,15 @@ let sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="; }; }; + "object-is-1.0.1" = { + name = "object-is"; + packageName = "object-is"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz"; + sha1 = "0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"; + }; + }; "object-keys-0.4.0" = { name = "object-keys"; packageName = "object-keys"; @@ -28822,6 +28905,15 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; + "onetime-5.1.0" = { + name = "onetime"; + packageName = "onetime"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; + sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; + }; + }; "ono-4.0.11" = { name = "ono"; packageName = "ono"; @@ -28930,15 +29022,6 @@ let sha512 = "nNnZDkUNExBwEpb7LZaeMeQgvrlO8l4bgY/LvGNZCR0xG/dGWqHqjKrAmR5GUoYo0FIz38kxasvA1aevxWs2CA=="; }; }; - "opn-5.3.0" = { - name = "opn"; - packageName = "opn"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz"; - sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g=="; - }; - }; "opn-5.5.0" = { name = "opn"; packageName = "opn"; @@ -28957,13 +29040,13 @@ let sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ=="; }; }; - "optimism-0.9.6" = { + "optimism-0.10.3" = { name = "optimism"; packageName = "optimism"; - version = "0.9.6"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/optimism/-/optimism-0.9.6.tgz"; - sha512 = "bWr/ZP32UgFCQAoSkz33XctHwpq2via2sBvGvO5JIlrU8gaiM0LvoKj3QMle9LWdSKlzKik8XGSerzsdfYLNxA=="; + url = "https://registry.npmjs.org/optimism/-/optimism-0.10.3.tgz"; + sha512 = "9A5pqGoQk49H6Vhjb9kPgAeeECfUDF6aIICbMDL23kDLStBn1MWk3YvcZ4xWF9CsSf6XEgvRLkXy4xof/56vVw=="; }; }; "optimist-0.2.8" = { @@ -29290,13 +29373,13 @@ let sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; }; }; - "p-limit-2.2.0" = { + "p-limit-2.2.1" = { name = "p-limit"; packageName = "p-limit"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz"; - sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ=="; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz"; + sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg=="; }; }; "p-locate-2.0.0" = { @@ -29362,6 +29445,15 @@ let sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg=="; }; }; + "p-queue-6.1.1" = { + name = "p-queue"; + packageName = "p-queue"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.1.1.tgz"; + sha512 = "R9gq36Th88xZ+rWAptN5IXLwqkwA1gagCQhT6ZXQ6RxEfmjb9ZW+UBzRVqv9sm5TQmbbI/TsKgGLbOaA61xR5w=="; + }; + }; "p-reduce-1.0.0" = { name = "p-reduce"; packageName = "p-reduce"; @@ -29398,6 +29490,15 @@ let sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA=="; }; }; + "p-timeout-3.1.0" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.1.0.tgz"; + sha512 = "C27DYI+tCroT8J8cTEyySGydl2B7FlxrGNF5/wmMbl1V+jeehUCzEE/BVgzRebdm2K3ZitKOKx8YbdFumDyYmw=="; + }; + }; "p-try-1.0.0" = { name = "p-try"; packageName = "p-try"; @@ -29461,15 +29562,6 @@ let sha512 = "EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg=="; }; }; - "package-json-6.4.0" = { - name = "package-json"; - packageName = "package-json"; - version = "6.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-6.4.0.tgz"; - sha512 = "bd1T8OBG7hcvMd9c/udgv6u5v9wISP3Oyl9Cm7Weop8EFwrtcQDnS2sb6zhwqus2WslSr5wSTIPiTTpxxmPm7Q=="; - }; - }; "package-json-6.5.0" = { name = "package-json"; packageName = "package-json"; @@ -29506,13 +29598,22 @@ let sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; }; }; - "pacote-9.5.4" = { + "pacote-9.5.5" = { name = "pacote"; packageName = "pacote"; - version = "9.5.4"; + version = "9.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-9.5.4.tgz"; - sha512 = "nWr0ari6E+apbdoN0hToTKZElO5h4y8DGFa2pyNA5GQIdcP0imC96bA0bbPw1gpeguVIiUgHHaAlq/6xfPp8Qw=="; + url = "https://registry.npmjs.org/pacote/-/pacote-9.5.5.tgz"; + sha512 = "jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA=="; + }; + }; + "pacote-9.5.8" = { + name = "pacote"; + packageName = "pacote"; + version = "9.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/pacote/-/pacote-9.5.8.tgz"; + sha512 = "0Tl8Oi/K0Lo4MZmH0/6IsT3gpGf9eEAznLXEQPKgPq7FscnbUOyopnVpwXlnQdIbCUaojWy1Wd7VMyqfVsRrIw=="; }; }; "pad-0.0.5" = { @@ -29551,13 +29652,13 @@ let sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="; }; }; - "parallel-transform-1.1.0" = { + "parallel-transform-1.2.0" = { name = "parallel-transform"; packageName = "parallel-transform"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz"; - sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz"; + sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg=="; }; }; "param-case-2.1.1" = { @@ -29776,13 +29877,13 @@ let sha512 = "yy7UTSmliOT/7Yl+P4hwwW2W7PbCTAMcD0lasaVG+k4/2laj42YWzLm468bLFGDoFPIb29g3BuwBcA3gLopKww=="; }; }; - "parse-torrent-7.0.0" = { + "parse-torrent-7.0.1" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-7.0.0.tgz"; - sha512 = "i/Y9CNp2xn+moDrNWApBZ5rW9xRY6x6z4A71Lw886UKx7E/DkVAzuvA7efVtcPgdY3iI9ea0thaoqeMN3GZBOA=="; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-7.0.1.tgz"; + sha512 = "FdF1kBImRLt+ICV4NTz8L+sI2hFlPXAq1tXuw21gKz8EuThyVUFJ/wPfBEyYQrvnBpmGf7cM/LVSOhMRe8MrKw=="; }; }; "parse-torrent-file-2.1.4" = { @@ -29848,15 +29949,6 @@ let sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; }; }; - "parsejson-0.0.3" = { - name = "parsejson"; - packageName = "parsejson"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; - sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; - }; - }; "parseqs-0.0.2" = { name = "parseqs"; packageName = "parseqs"; @@ -30253,15 +30345,6 @@ let sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; }; }; - "pause-0.1.0" = { - name = "pause"; - packageName = "pause"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz"; - sha1 = "ebc8a4a8619ff0b8a81ac1513c3434ff469fdb74"; - }; - }; "pause-stream-0.0.11" = { name = "pause-stream"; packageName = "pause-stream"; @@ -30316,13 +30399,13 @@ let sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; }; }; - "pem-1.13.2" = { + "pem-1.14.2" = { name = "pem"; packageName = "pem"; - version = "1.13.2"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/pem/-/pem-1.13.2.tgz"; - sha512 = "MPJWuEb/r6AG+GpZi2JnfNtGAZDeL/8+ERKwXEWRuST5i+4lq/Uy36B352OWIUSPQGH+HR1HEDcIDi+8cKxXNg=="; + url = "https://registry.npmjs.org/pem/-/pem-1.14.2.tgz"; + sha512 = "TOnPtq3ZFnCniOZ+rka4pk8UIze9xG1qI+wNE7EmkiR/cg+53uVvk5QbkWZ7M6RsuOxzz62FW1hlAobJr/lTOA=="; }; }; "pend-1.2.0" = { @@ -30397,13 +30480,13 @@ let sha512 = "OlE82n3yMOE5dY9RMOwxhoWefeMlxwk5IVxoj0sSzSFIlmvhN4obzTvO3s/d/b5JhcgXikjaspsy/HuUDTqbBg=="; }; }; - "piece-length-1.0.0" = { + "piece-length-2.0.1" = { name = "piece-length"; packageName = "piece-length"; - version = "1.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/piece-length/-/piece-length-1.0.0.tgz"; - sha1 = "4db7167157fd69fef14caf7262cd39f189b24508"; + url = "https://registry.npmjs.org/piece-length/-/piece-length-2.0.1.tgz"; + sha512 = "dBILiDmm43y0JPISWEmVGKBETQjwJe6mSU9GND+P9KW0SJGUwoU/odyH1nbalOP9i8WSYuqf1lQnaj92Bhw+Ug=="; }; }; "pify-2.3.0" = { @@ -30586,13 +30669,13 @@ let sha1 = "9a99433f3789d1e2757c04e3803395b6fa55a348"; }; }; - "please-upgrade-node-3.1.1" = { + "please-upgrade-node-3.2.0" = { name = "please-upgrade-node"; packageName = "please-upgrade-node"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz"; - sha512 = "KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ=="; + url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"; + sha512 = "gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg=="; }; }; "plist-1.2.0" = { @@ -30676,6 +30759,15 @@ let sha512 = "ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="; }; }; + "pluralize-8.0.0" = { + name = "pluralize"; + packageName = "pluralize"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz"; + sha512 = "Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA=="; + }; + }; "pn-1.1.0" = { name = "pn"; packageName = "pn"; @@ -30721,13 +30813,13 @@ let sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc"; }; }; - "portfinder-1.0.21" = { + "portfinder-1.0.24" = { name = "portfinder"; packageName = "portfinder"; - version = "1.0.21"; + version = "1.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.21.tgz"; - sha512 = "ESabpDCzmBS3ekHbmpAIiESq3udRsCBGiBZLsC+HgBKv2ezb0R4oG+7RnYEVZ/ZCfhel5Tx3UzdNWA0Lox2QCA=="; + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz"; + sha512 = "ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg=="; }; }; "posix-character-classes-0.1.1" = { @@ -30776,13 +30868,13 @@ let sha512 = "MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA=="; }; }; - "postcss-7.0.17" = { + "postcss-7.0.18" = { name = "postcss"; packageName = "postcss"; - version = "7.0.17"; + version = "7.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz"; - sha512 = "546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.18.tgz"; + sha512 = "/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g=="; }; }; "postcss-calc-7.0.1" = { @@ -31100,13 +31192,13 @@ let sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; }; - "posthtml-0.11.4" = { + "posthtml-0.11.6" = { name = "posthtml"; packageName = "posthtml"; - version = "0.11.4"; + version = "0.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml/-/posthtml-0.11.4.tgz"; - sha512 = "ezlzBkoPoRgh0jkmT1dsM8eT+lr2azyZ546kbda8oHnVnzvyaB3Ywo6UxUz8wPSOkFAAflCxZJhvvpQH1F6qcA=="; + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.11.6.tgz"; + sha512 = "C2hrAPzmRdpuL3iH0TDdQ6XCc9M7Dcc3zEW5BLerY65G4tWWszwv6nG/ksi6ul5i2mx22ubdljgktXCtNkydkw=="; }; }; "posthtml-parser-0.4.1" = { @@ -31127,13 +31219,13 @@ let sha512 = "yvt54j0zCBHQVEFAuR+yHld8CZrCa/E1Z/OcFNCV1IEWTLVxT8O7nYnM4IIw1CD4r8kaRd3lc42+0lgCKgm87w=="; }; }; - "prebuild-install-5.3.0" = { + "prebuild-install-5.3.2" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "5.3.0"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.0.tgz"; - sha512 = "aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.2.tgz"; + sha512 = "INDfXzTPnhT+WYQemqnAXlP7SvfiFMopMozSgXCZ+RDLb279gKfIuLk4o7PgEawLp3WrMgIYGBpkxpraROHsSA=="; }; }; "precond-0.2.3" = { @@ -31217,6 +31309,15 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; + "prettier-tslint-0.4.2" = { + name = "prettier-tslint"; + packageName = "prettier-tslint"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-tslint/-/prettier-tslint-0.4.2.tgz"; + sha512 = "urhX7U/F+fu8sztEs/Z7CxNS8PdEytEwGKhQaH5fxxCdRmHGT45FoClyDlcZrMk9cK/8JpX/asFmTOHtSGJfLg=="; + }; + }; "pretty-format-23.6.0" = { name = "pretty-format"; packageName = "pretty-format"; @@ -31253,6 +31354,15 @@ let sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289"; }; }; + "prettyoutput-1.2.0" = { + name = "prettyoutput"; + packageName = "prettyoutput"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettyoutput/-/prettyoutput-1.2.0.tgz"; + sha512 = "G2gJwLzLcYS+2m6bTAe+CcDpwak9YpcvpScI0tE4WYb2O3lEZD/YywkMNpGqsSx5wttGvh2UXaKROTKKCyM2dw=="; + }; + }; "printf-0.2.5" = { name = "printf"; packageName = "printf"; @@ -31334,6 +31444,15 @@ let sha512 = "nm7RvWUxps+2+jZKNLkd04mNapXNariS6G5WIEVzvAqjx7EUuKcY1Dp3e6oUK7GLwzJ+3gbSbPLFAASHFQrPcQ=="; }; }; + "process-0.10.1" = { + name = "process"; + packageName = "process"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.10.1.tgz"; + sha1 = "842457cc51cfed72dc775afeeafb8c6034372725"; + }; + }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -31442,6 +31561,15 @@ let sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; }; }; + "promise-queue-2.2.5" = { + name = "promise-queue"; + packageName = "promise-queue"; + version = "2.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-queue/-/promise-queue-2.2.5.tgz"; + sha1 = "2f6f5f7c0f6d08109e967659c79b88a9ed5e93b4"; + }; + }; "promise-retry-1.1.1" = { name = "promise-retry"; packageName = "promise-retry"; @@ -31712,13 +31840,13 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.3.0" = { + "psl-1.4.0" = { name = "psl"; packageName = "psl"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz"; - sha512 = "avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag=="; + url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; + sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; }; }; "pstree.remy-1.1.7" = { @@ -32270,13 +32398,13 @@ let sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7"; }; }; - "pull-stream-3.6.13" = { + "pull-stream-3.6.14" = { name = "pull-stream"; packageName = "pull-stream"; - version = "3.6.13"; + version = "3.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.13.tgz"; - sha512 = "enbnbnO+czsPuCq9s9HTTzDzzVQD5TSe60aO3nBioeJ9mevh8RzE4Hxbujo9TReg1fJlmNEL8uyQTUgn8+rSHg=="; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.14.tgz"; + sha512 = "KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew=="; }; }; "pull-through-1.0.18" = { @@ -32594,6 +32722,15 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; + "qs-6.8.0" = { + name = "qs"; + packageName = "qs"; + version = "6.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.8.0.tgz"; + sha512 = "tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w=="; + }; + }; "query-string-1.0.1" = { name = "query-string"; packageName = "query-string"; @@ -32657,6 +32794,15 @@ let sha512 = "AMD7w5hRXcFSb8s9u38acBZ+309u6GsiibP4/0YacJeaurRshogB7v/ZcVPxP5gD5+zIw6ixRHdutiYUJfwKHw=="; }; }; + "queue-microtask-1.1.2" = { + name = "queue-microtask"; + packageName = "queue-microtask"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.1.2.tgz"; + sha512 = "F9wwNePtXrzZenAB3ax0Y8TSKGvuB7Qw16J30hspEUTbfUM+H827XyN3rlpwhVmtm5wuZtbKIHjOnwDn7MUxWQ=="; + }; + }; "quick-format-unescaped-3.0.2" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; @@ -32675,6 +32821,15 @@ let sha1 = "4360b17c61136ad38078397ff11416e186dcfbb8"; }; }; + "quick-lru-4.0.1" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"; + sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; + }; + }; "quicktask-1.1.0" = { name = "quicktask"; packageName = "quicktask"; @@ -32729,6 +32884,15 @@ let sha512 = "GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ=="; }; }; + "ramda-0.26.1" = { + name = "ramda"; + packageName = "ramda"; + version = "0.26.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz"; + sha512 = "hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ=="; + }; + }; "randexp-0.4.6" = { name = "randexp"; packageName = "randexp"; @@ -32864,6 +33028,15 @@ let sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q=="; }; }; + "raven-1.2.1" = { + name = "raven"; + packageName = "raven"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz"; + sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd"; + }; + }; "raven-js-3.27.2" = { name = "raven-js"; packageName = "raven-js"; @@ -32891,15 +33064,6 @@ let sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca"; }; }; - "raw-body-2.1.7" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"; - sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; - }; - }; "raw-body-2.3.3" = { name = "raw-body"; packageName = "raw-body"; @@ -32963,13 +33127,13 @@ let sha512 = "C0SIXdXDSus2yqqvV7qifnb4NoWP7mEBXJq3axci301mXHCZb8Djwm4hrEZo4UeXRaEnfjH98uQ8EBppk2oNWA=="; }; }; - "react-is-16.8.6" = { + "react-is-16.9.0" = { name = "react-is"; packageName = "react-is"; - version = "16.8.6"; + version = "16.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz"; - sha512 = "aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="; + url = "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz"; + sha512 = "tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw=="; }; }; "read-1.0.7" = { @@ -32999,13 +33163,13 @@ let sha512 = "CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ=="; }; }; - "read-cmd-shim-1.0.1" = { + "read-cmd-shim-1.0.4" = { name = "read-cmd-shim"; packageName = "read-cmd-shim"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"; - sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; + url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.4.tgz"; + sha512 = "Pqpl3qJ/QdOIjRYA0q5DND/gLvGOfpIz/fYVDGYpOXfW/lFrIttmLsBnd6IkyK10+JHU9zhsaudfvrQTBB9YFQ=="; }; }; "read-metadata-1.0.0" = { @@ -33026,13 +33190,13 @@ let sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; }; }; - "read-package-json-2.0.13" = { + "read-package-json-2.1.0" = { name = "read-package-json"; packageName = "read-package-json"; - version = "2.0.13"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz"; - sha512 = "/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg=="; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz"; + sha512 = "KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A=="; }; }; "read-package-tree-5.3.1" = { @@ -33197,13 +33361,13 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; - "readdirp-3.1.1" = { + "readdirp-3.1.2" = { name = "readdirp"; packageName = "readdirp"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.1.tgz"; - sha512 = "XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.2.tgz"; + sha512 = "8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw=="; }; }; "readline2-0.1.1" = { @@ -33440,13 +33604,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp-tree-0.1.11" = { + "regexp-tree-0.1.13" = { name = "regexp-tree"; packageName = "regexp-tree"; - version = "0.1.11"; + version = "0.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.11.tgz"; - sha512 = "7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg=="; + url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.13.tgz"; + sha512 = "hwdV/GQY5F8ReLZWO+W1SRoN5YfpOKY6852+tBFcma72DKBIcHjPRIlIvQN35bCOljuAfP2G2iB0FC/w236mUw=="; }; }; "regexp.prototype.flags-1.2.0" = { @@ -33485,13 +33649,13 @@ let sha1 = "86a763f58ee4d7c2f6b102e4764050de7ed90c6b"; }; }; - "regexpu-core-4.5.4" = { + "regexpu-core-4.6.0" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "4.5.4"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz"; - sha512 = "BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz"; + sha512 = "YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg=="; }; }; "registry-auth-token-3.3.2" = { @@ -33755,13 +33919,13 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "render-media-3.3.0" = { + "render-media-3.4.0" = { name = "render-media"; packageName = "render-media"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/render-media/-/render-media-3.3.0.tgz"; - sha512 = "IWz+3KbUxFaxke8v/TJE0nZlhoNTTqSYS3hh284R+6rgqwahR4hA+5dAAyb0A1t4M4oLwePaGlHllfQiS2ItWQ=="; + url = "https://registry.npmjs.org/render-media/-/render-media-3.4.0.tgz"; + sha512 = "0BTIvIBS4xdC/qPpoj8ZsdZ/YoQhn+DutUqBkur1yUs5SnDoruiAtaHFJhxle8pREnNN/kT8E8fkftgMkJ8Tvg=="; }; }; "repeat-element-1.1.3" = { @@ -34160,15 +34324,6 @@ let sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; }; }; - "response-time-2.3.2" = { - name = "response-time"; - packageName = "response-time"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"; - sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a"; - }; - }; "responselike-1.0.2" = { name = "responselike"; packageName = "responselike"; @@ -34232,6 +34387,15 @@ let sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; }; }; + "restore-cursor-3.1.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; + }; + }; "resumer-0.0.0" = { name = "resumer"; packageName = "resumer"; @@ -34448,6 +34612,24 @@ let sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; }; }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; + "rimraf-3.0.0" = { + name = "rimraf"; + packageName = "rimraf"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz"; + sha512 = "NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg=="; + }; + }; "ripemd160-2.0.2" = { name = "ripemd160"; packageName = "ripemd160"; @@ -34475,13 +34657,13 @@ let sha1 = "df43e80d9bc82ad4430bcfef03f49c717e8b2e8c"; }; }; - "roarr-2.13.3" = { + "roarr-2.14.1" = { name = "roarr"; packageName = "roarr"; - version = "2.13.3"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/roarr/-/roarr-2.13.3.tgz"; - sha512 = "f75w2kr46yWvV7tdnAFRzXiggNBaPrPAwai0Disa5NovRP5DtACrMrhr72Vot1ZNCDmMJ1hF7ix2Q5F+NJZwoA=="; + url = "https://registry.npmjs.org/roarr/-/roarr-2.14.1.tgz"; + sha512 = "Fhm9shQ8JhpjFnOT7bgxKR7Xcg1Tq+0/Tdy+bloB4sUxxAib4MZDMJ6AjUBRE+798l2MnhhF2JTqbqx1+/kRyQ=="; }; }; "rollup-0.67.0" = { @@ -34538,13 +34720,13 @@ let sha512 = "SxrAIgpH/B5/W4SeULgreOemxcpEgKs2gcD42zXw50bhqGWmcnlXneVInQpAqzA/cIly4bJrOpeelmB9p4YXSQ=="; }; }; - "rollup-pluginutils-2.8.1" = { + "rollup-pluginutils-2.8.2" = { name = "rollup-pluginutils"; packageName = "rollup-pluginutils"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz"; - sha512 = "J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg=="; + url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz"; + sha512 = "EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ=="; }; }; "root-check-1.0.0" = { @@ -34745,13 +34927,13 @@ let sha512 = "Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw=="; }; }; - "rxjs-6.5.2" = { + "rxjs-6.5.3" = { name = "rxjs"; packageName = "rxjs"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz"; - sha512 = "HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz"; + sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA=="; }; }; "s3-stream-upload-2.0.2" = { @@ -34871,13 +35053,13 @@ let sha512 = "jLYV0DORrzY3xaz/S9ydJL6Iz7essZeAfnAavsJ+zsJGZ1MOnsS52yRjU3uF3pJa/lla7+wisp//fxOwOH8SKQ=="; }; }; - "sanitize-filename-1.6.2" = { + "sanitize-filename-1.6.3" = { name = "sanitize-filename"; packageName = "sanitize-filename"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.2.tgz"; - sha512 = "cmTzND7RMxUB+f7gI+4+KAVHWEg0lfXvQJdko+FXDP5bNbGIdx4KMP5pX6lv5jfT9jSf6OBbjyxjFtZQwYA/ig=="; + url = "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; + sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; "sax-0.5.8" = { @@ -35114,13 +35296,13 @@ let sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="; }; }; - "semver-5.7.0" = { + "semver-5.7.1" = { name = "semver"; packageName = "semver"; - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; - sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; "semver-6.0.0" = { @@ -35258,24 +35440,6 @@ let sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; }; }; - "send-0.13.0" = { - name = "send"; - packageName = "send"; - version = "0.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.13.0.tgz"; - sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de"; - }; - }; - "send-0.13.2" = { - name = "send"; - packageName = "send"; - version = "0.13.2"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz"; - sha1 = "765e7607c8055452bba6f0b052595350986036de"; - }; - }; "send-0.16.2" = { name = "send"; packageName = "send"; @@ -35357,13 +35521,13 @@ let sha512 = "5j9GgyGsP9vV9Uj1S0lDCvlsd+gc2LEPVK7HHHte7IyPwOD4lVQFeaX143gx3U5AnoCi+wbcb3mvaxVysjpxEw=="; }; }; - "serialize-javascript-1.7.0" = { + "serialize-javascript-1.9.1" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "1.7.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz"; - sha512 = "ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA=="; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz"; + sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A=="; }; }; "serialize-to-js-1.2.2" = { @@ -35384,15 +35548,6 @@ let sha1 = "12d4c5aa1c3ffb8f6d1dc5f395aa9455569c3f91"; }; }; - "serve-favicon-2.3.2" = { - name = "serve-favicon"; - packageName = "serve-favicon"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz"; - sha1 = "dd419e268de012ab72b319d337f2105013f9381f"; - }; - }; "serve-favicon-2.5.0" = { name = "serve-favicon"; packageName = "serve-favicon"; @@ -35411,15 +35566,6 @@ let sha512 = "63N075Tn3PsFYcu0NVV7tb367UbiW3gnC+/50ohL4oqOhAG6bmbaWqiRcXQgbzqc0ALBjSAzg7VTfa0Qw4E3hA=="; }; }; - "serve-index-1.7.3" = { - name = "serve-index"; - packageName = "serve-index"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz"; - sha1 = "7a057fc6ee28dc63f64566e5fa57b111a86aecd2"; - }; - }; "serve-index-1.9.1" = { name = "serve-index"; packageName = "serve-index"; @@ -35429,15 +35575,6 @@ let sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; }; }; - "serve-static-1.10.3" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz"; - sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535"; - }; - }; "serve-static-1.13.2" = { name = "serve-static"; packageName = "serve-static"; @@ -35537,13 +35674,13 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; - "seventh-0.7.27" = { + "seventh-0.7.28" = { name = "seventh"; packageName = "seventh"; - version = "0.7.27"; + version = "0.7.28"; src = fetchurl { - url = "https://registry.npmjs.org/seventh/-/seventh-0.7.27.tgz"; - sha512 = "vId7EbEQ7xr+wjBBFQBChtLzbqIQWe0cNtZMGtOVBig5p1XrsjVXvkBhdVcJRJdDh6pnn/5h5ai+208fDldXXA=="; + url = "https://registry.npmjs.org/seventh/-/seventh-0.7.28.tgz"; + sha512 = "WitJqSwsjLWbCP9cciaozByx4csddLQyNoaPBqOpYFMNE6iD6FK/pM8J2yqtpauSxJUUo7Wfv5KF5w1jbVov7A=="; }; }; "sha.js-2.4.11" = { @@ -35627,6 +35764,15 @@ let sha1 = "f4781949cce402697127430ea3b3c5476f481767"; }; }; + "shell-quote-1.7.2" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz"; + sha512 = "mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="; + }; + }; "shelljs-0.3.0" = { name = "shelljs"; packageName = "shelljs"; @@ -35672,13 +35818,13 @@ let sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="; }; }; - "shortid-2.2.14" = { + "shortid-2.2.15" = { name = "shortid"; packageName = "shortid"; - version = "2.2.14"; + version = "2.2.15"; src = fetchurl { - url = "https://registry.npmjs.org/shortid/-/shortid-2.2.14.tgz"; - sha512 = "4UnZgr9gDdA1kaKj/38IiudfC3KHKhDc1zi/HSxd9FQDR0VLwH3/y79tZJLsVYPsJgIjeHjqIWaWVRJUj9qZOQ=="; + url = "https://registry.npmjs.org/shortid/-/shortid-2.2.15.tgz"; + sha512 = "5EaCy2mx2Jgc/Fdn9uuDuNIIfWBpzY4XIlhoqtXF6qsf+/+SGZ+FxDdX/ZsMZiWupIWNqAEmiNY4RC+LSmCeOw=="; }; }; "shush-1.0.0" = { @@ -35771,13 +35917,13 @@ let sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw=="; }; }; - "simple-git-1.124.0" = { + "simple-git-1.126.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.124.0"; + version = "1.126.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.124.0.tgz"; - sha512 = "ks9mBoO4ODQy/xGLC8Cc+YDvj/hho/IKgPhi6h5LI/sA+YUdHc3v0DEoHzM29VmulubpGCxMJUSFmyXNsjNMEA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.126.0.tgz"; + sha512 = "47mqHxgZnN8XRa9HbpWprzUv3Ooqz9RY/LSZgvA7jCkW8jcwLahMz7LKugY91KZehfG0sCVPtgXiU72hd6b1Bw=="; }; }; "simple-markdown-0.4.4" = { @@ -35816,6 +35962,15 @@ let sha512 = "TQl9rm4rdKAVmhO++sXAb8TNN0D6JAD5iyI1mqEPNpxUzTRrtm4aOG1pDf/5W/qCFihiaoK6uuL9rvQz1x1VKw=="; }; }; + "simple-sha1-3.0.1" = { + name = "simple-sha1"; + packageName = "simple-sha1"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.0.1.tgz"; + sha512 = "q7ehqWfHc1VhOm7sW099YDZ4I0yYX7rqyhqqhHV1IYeUTjPOhHyD3mXvv8k2P+rO7+7c8R4/D+8ffzC9BE7Cqg=="; + }; + }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -35834,13 +35989,13 @@ let sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; }; }; - "simple-websocket-8.0.0" = { + "simple-websocket-8.0.1" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.0.0.tgz"; - sha512 = "DwBEoqOq8gvnblarMPkhZD6AWituWbVfTil/UflowYm/Bu5SK23BDKGxrVwgQXGKydzxlSiYva7LC3/hXSRLIw=="; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.0.1.tgz"; + sha512 = "2QKSRjf+tqFXLVmOQjf95gHeKhuyx2k1ouDjtnE0uKCYw84HfN85HsXo+GmPH+2PIh5BQql++g2AIbHgGAZU4w=="; }; }; "single-line-log-0.4.1" = { @@ -36086,13 +36241,13 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-1.210.0" = { + "snyk-1.227.0" = { name = "snyk"; packageName = "snyk"; - version = "1.210.0"; + version = "1.227.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.210.0.tgz"; - sha512 = "k6/EIX1Dc4Qk8omcKQDm13RRywkKqXoQ0IMz5Nyk1y8sdmg1S78QSWnfTaEPe+OQE1olrtjInrDX3Yu20CnMzg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz"; + sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw=="; }; }; "snyk-config-2.2.3" = { @@ -36104,13 +36259,13 @@ let sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw=="; }; }; - "snyk-docker-plugin-1.25.1" = { + "snyk-docker-plugin-1.29.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "1.25.1"; + version = "1.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.25.1.tgz"; - sha512 = "n/LfA7VXjPEcSz2ZfZonT/DPSC89Zs1/HD0inPFN4RLQT3WiQnjqJUXct+D0nWwEVfhLWNc+Y7PLcTjpnZ9R3Q=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.29.1.tgz"; + sha512 = "Mucc1rZ7l0U8Dykr5m6HPjau8b2H8JVtVaXGbKSZD6e/47JDJhudkgrWjsS5Yt/Zdp1weE3+4SguftFiVR971A=="; }; }; "snyk-go-parser-1.3.1" = { @@ -36131,13 +36286,13 @@ let sha512 = "9hsGgloioGuey5hbZfv+MkFEslxXHyzUlaAazcR0NsY7VLyG/b2g3f88f/ZwCwlWaKL9LMv/ERIiey3oWAB/qg=="; }; }; - "snyk-gradle-plugin-2.12.5" = { + "snyk-gradle-plugin-3.0.2" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "2.12.5"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.12.5.tgz"; - sha512 = "AmiQQUL0nlY3SjWUSMSmmbp273ETJzsqvk1E8jf+G/Q3mRl9xZ6BkPMebweD/y5d/smoQmr6rKL57OG+OXoi3w=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.0.2.tgz"; + sha512 = "9nyR03kHmePqBGaQiUeo3RD1YJ4qE5/V4tOmDQ8LNjHTQ54Xr8OXFC5xlJMV8FCtXrRXY0/WX8RMUPEUAm4c9g=="; }; }; "snyk-module-1.9.1" = { @@ -36149,13 +36304,13 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.3.3" = { + "snyk-mvn-plugin-2.4.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.3.3"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.3.3.tgz"; - sha512 = "NYFL+jtHfAJk+Jdyme4I8pTvg/wfoHgkOs1g1nFUEPTcpBb5mfqy7Q9hDJWvnfXY8M6P9aEqvO+bmCVgTQvySg=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.4.0.tgz"; + sha512 = "Fmt6Mjx6zZz+4q6PnBkhuNGhEX++q/pKMI26ls4p3JPkx4KxBz89oncpkmf7P8YCkoaka8oHhtDEv/R4Z9LleQ=="; }; }; "snyk-nodejs-lockfile-parser-1.16.0" = { @@ -36167,13 +36322,13 @@ let sha512 = "cf3uozRXEG88nsjOQlo+SfOJPpcLs45qpnuk2vhBBZ577IMnV+fTOJQsP2YRiikLUbdgkVlduviwUO6OVn1PhA=="; }; }; - "snyk-nuget-plugin-1.11.3" = { + "snyk-nuget-plugin-1.12.1" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.11.3"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.11.3.tgz"; - sha512 = "UgLTMr7Vz0qZoL15SkFAUfMb4Vw/qFxf6lBoL2v8xA+Mqdvn2Yu9x/yW659ElFVSUjniqKTFyloKq9/XSv+c+A=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.12.1.tgz"; + sha512 = "QuANQxBjTGj3hEf2YpEQ0WuI4Yq/93boqWUs4eoSTfDyBRFgIkUP6fLkzNldrkL8fQbcagqQ2Xz8M9IEKRQtMg=="; }; }; "snyk-paket-parser-1.5.0" = { @@ -36203,13 +36358,13 @@ let sha512 = "KI6GHt+Oj4fYKiCp7duhseUj5YhyL/zJOrrJg0u6r59Ux9w8gmkUYT92FHW27ihwuT6IPzdGNEuy06Yv2C9WaQ=="; }; }; - "snyk-python-plugin-1.10.2" = { + "snyk-python-plugin-1.13.2" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.10.2"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.10.2.tgz"; - sha512 = "dLswHfVI9Ax8+Ia/onhv1p9S5y+Ie/oELOfpfNApbb0BPTJ5k1c2CQ7WcgQ5/nDRMUOgoKn4VTObaAGmD5or9A=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.13.2.tgz"; + sha512 = "G9R1cYHw0E/VSx9tFa5nZp+653FIMXheteidrF3hjUe71jRdJELEUV/z5jxqYEWEFemcwGhMfW87De91GChVIQ=="; }; }; "snyk-resolve-1.0.1" = { @@ -36221,22 +36376,22 @@ let sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw=="; }; }; - "snyk-resolve-deps-4.0.3" = { + "snyk-resolve-deps-4.4.0" = { name = "snyk-resolve-deps"; packageName = "snyk-resolve-deps"; - version = "4.0.3"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.3.tgz"; - sha512 = "GP3VBrkz1iDDw2q8ftTqppHqzIAxmsUIoXR+FRWDKcipkKHXHJyUmtEo11QVT5fNRV0D0RCsssk2S5CTxTCu6A=="; + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.4.0.tgz"; + sha512 = "aFPtN8WLqIk4E1ulMyzvV5reY1Iksz+3oPnUVib1jKdyTHymmOIYF7z8QZ4UUr52UsgmrD9EA/dq7jpytwFoOQ=="; }; }; - "snyk-sbt-plugin-2.6.1" = { + "snyk-sbt-plugin-2.8.0" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "2.6.1"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.6.1.tgz"; - sha512 = "zWU14cm+cpamJ0CJdekTfgmv6ifdgVcapO6d27KTJThqRuR0arCqGPPyZa/Zl+jzhcK0dtRS4Ihk7g+d36SWIg=="; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.8.0.tgz"; + sha512 = "ZzyBdND5CsaO0xkv05geZXu8Dd6Llvr/5oTj811U7h7UmrvljrAiABW4RGjRJPrPVuuJaDej2p633sgGtK9UsA=="; }; }; "snyk-tree-1.0.0" = { @@ -36266,15 +36421,6 @@ let sha1 = "b566532888dae3ac9058a12f294015ebdfa8084a"; }; }; - "socket.io-1.7.4" = { - name = "socket.io"; - packageName = "socket.io"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.4.tgz"; - sha1 = "2f7ecedc3391bf2d5c73e291fe233e6e34d4dd00"; - }; - }; "socket.io-2.1.1" = { name = "socket.io"; packageName = "socket.io"; @@ -36302,15 +36448,6 @@ let sha1 = "bd39329b8961371787e24f345b074ec9cf000e33"; }; }; - "socket.io-adapter-0.5.0" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; - sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; - }; - }; "socket.io-adapter-1.1.1" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; @@ -36329,15 +36466,6 @@ let sha1 = "c86cb3e507ab2f96da4500bd34fcf46a1e9dfe5e"; }; }; - "socket.io-client-1.7.4" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.4.tgz"; - sha1 = "ec9f820356ed99ef6d357f0756d648717bdd4281"; - }; - }; "socket.io-client-2.1.1" = { name = "socket.io-client"; packageName = "socket.io-client"; @@ -36374,15 +36502,6 @@ let sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a"; }; }; - "socket.io-parser-2.3.1" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; - sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; - }; - }; "socket.io-parser-3.2.0" = { name = "socket.io-parser"; packageName = "socket.io-parser"; @@ -36491,13 +36610,13 @@ let sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA=="; }; }; - "sodium-native-2.4.5" = { + "sodium-native-2.4.6" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.4.5.tgz"; - sha512 = "G1uhd4l1OexzUC/6eHIbAvoivCs9T7ncDlEWodZglPZVUOXi6jtSe7tCi25aYB06zRoOjVfE4SL+hZ4EfkyZgw=="; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.4.6.tgz"; + sha512 = "Ro9lhTjot8M01nwKLXiqLSmjR7B8o+Wg4HmJUjEShw/q6XPlNMzjPkA1VJKaMH8SO8fJ/sggAKVwreTaFszS2Q=="; }; }; "sodium-universal-2.0.0" = { @@ -36509,13 +36628,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-0.7.5" = { + "sonic-boom-0.7.6" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "0.7.5"; + version = "0.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.5.tgz"; - sha512 = "1pKrnAV6RfvntPnarY71tpthFTM3pWZWWQdghZY8ARjtDPGzG/inxqSuRwQY/7V1woUjfyxPb437zn4p5phgnQ=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.6.tgz"; + sha512 = "k9E2QQ4zxuVRLDW+ZW6ISzJs3wlEorVdmM7ApDgor7wsGKSDG5YGHsGmgLY4XYh4DMlr/2ap2BWAE7yTFJtWnQ=="; }; }; "sorcery-0.10.0" = { @@ -36842,6 +36961,15 @@ let sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb"; }; }; + "speech-rule-engine-3.0.0-beta.6" = { + name = "speech-rule-engine"; + packageName = "speech-rule-engine"; + version = "3.0.0-beta.6"; + src = fetchurl { + url = "https://registry.npmjs.org/speech-rule-engine/-/speech-rule-engine-3.0.0-beta.6.tgz"; + sha512 = "B7gcT53jAsKpx7WvFYQcyUlFmgS3Wa9KlDy0FY8SOTa+Wz5EqmI0MpCD5/fYm8/2qiCPp8HwZg+H3cBgM+sNVw=="; + }; + }; "speedometer-0.1.4" = { name = "speedometer"; packageName = "speedometer"; @@ -37004,6 +37132,15 @@ let sha512 = "IkvzjmsWQl9BuBiM4xKpl5X8WCR4w0AeJHRdobCdXZ8dT/lNc1XS6WqvY35N6+YzIIgzSBeY5prdFObID9F9tA=="; }; }; + "sqlite3-4.1.0" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.0.tgz"; + sha512 = "RvqoKxq+8pDHsJo7aXxsFR18i+dU2Wp5o12qAJOV5LNcDt+fgJsc2QKKg3sIRfXrN9ZjzY1T7SNe/DFVqAXjaw=="; + }; + }; "srt2vtt-1.3.1" = { name = "srt2vtt"; packageName = "srt2vtt"; @@ -37436,6 +37573,15 @@ 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"; + }; + }; "stampit-1.2.0" = { name = "stampit"; packageName = "stampit"; @@ -37508,15 +37654,6 @@ let sha1 = "cbd243953cc42effd548b5d22388ed689ec639bd"; }; }; - "statuses-1.2.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; - sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; - }; - }; "statuses-1.4.0" = { name = "statuses"; packageName = "statuses"; @@ -37697,6 +37834,15 @@ let sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; }; }; + "stream-http-3.1.0" = { + name = "stream-http"; + packageName = "stream-http"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-http/-/stream-http-3.1.0.tgz"; + sha512 = "cuB6RgO7BqC4FBYzmnvhob5Do3wIdIsXAgGycHJnW+981gHqoYcYz9lqjJrk8WXRddbwPuqPYRl+bag6mYv4lw=="; + }; + }; "stream-parser-0.3.1" = { name = "stream-parser"; packageName = "stream-parser"; @@ -37742,15 +37888,6 @@ let sha1 = "bbf6b39f5f43ec30bc71babcb37557acecf34353"; }; }; - "stream-to-blob-1.0.2" = { - name = "stream-to-blob"; - packageName = "stream-to-blob"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-1.0.2.tgz"; - sha512 = "ryeEu3DGMt/095uTShIYGzLbbhZ+tHQtgp5HWEhXALSoc4U1iLSvpReZUdysahnJ3tki80wBBgryqqBzFZ0KaA=="; - }; - }; "stream-to-blob-2.0.0" = { name = "stream-to-blob"; packageName = "stream-to-blob"; @@ -37760,13 +37897,13 @@ let sha512 = "E+YitTtIHo7RQ4Cmgl+EzlMpqvLroTynRgt4t0pI4y5oz/piqlBQB8NFXLIWcjGOsKw+THnImrdpWcOCVxK25Q=="; }; }; - "stream-to-blob-url-2.1.2" = { + "stream-to-blob-url-3.0.0" = { name = "stream-to-blob-url"; packageName = "stream-to-blob-url"; - version = "2.1.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-2.1.2.tgz"; - sha512 = "dpfeYUYNodazv7rU+B9DOBj8u+dueXKOWqCy1lzPBxqeVIqq93jVTn68DZoBPLiYXSdsY9AW8D1l1BuxvghqEA=="; + url = "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-3.0.0.tgz"; + sha512 = "Mu1iPvbBkzdUPCZ+J+XBr/oagjOBfj4vpErHRIe08QzWeILSDtF5LXo6v44HeQFpx7dfqcBKjGUbSNCJ+38zqQ=="; }; }; "stream-to-promise-2.2.0" = { @@ -37904,13 +38041,13 @@ let sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; }; }; - "string-kit-0.9.10" = { + "string-kit-0.9.12" = { name = "string-kit"; packageName = "string-kit"; - version = "0.9.10"; + version = "0.9.12"; src = fetchurl { - url = "https://registry.npmjs.org/string-kit/-/string-kit-0.9.10.tgz"; - sha512 = "hcJem/u3/ddt3lSY2Xlx953XCHe3C8BX2XEWbPrByjyJ0CSR36X7kzsGFsI5lLaG94dLCQYpt8ffVwRjKpRT6g=="; + url = "https://registry.npmjs.org/string-kit/-/string-kit-0.9.12.tgz"; + sha512 = "l6BRL9uO4uV1o6/r/mJthahp8qatqGv4l6Z2o2mX+y2VYc7gFb2YD0k3zThvw3BATj/nDvLTB1s167vc2JdeDg=="; }; }; "string-length-2.0.0" = { @@ -38021,6 +38158,24 @@ let sha512 = "9EIjYD/WdlvLpn987+ctkLf0FfvBefOCuiEr2henD8X+7jfwPnyvTdmW8OJhj5p+M0/96mBdynLWkxUr+rHlpg=="; }; }; + "string.prototype.trimleft-2.1.0" = { + name = "string.prototype.trimleft"; + packageName = "string.prototype.trimleft"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz"; + sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw=="; + }; + }; + "string.prototype.trimright-2.1.0" = { + name = "string.prototype.trimright"; + packageName = "string.prototype.trimright"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz"; + sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg=="; + }; + }; "string2compact-1.3.0" = { name = "string2compact"; packageName = "string2compact"; @@ -38048,13 +38203,13 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; - "string_decoder-1.2.0" = { + "string_decoder-1.3.0" = { name = "string_decoder"; packageName = "string_decoder"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz"; - sha512 = "6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w=="; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; "stringify-entities-1.3.2" = { @@ -38345,13 +38500,13 @@ let sha1 = "29f4dc129fa1ca22150cd867223cee2bed5ff6a2"; }; }; - "stylus-0.54.5" = { + "stylus-0.54.7" = { name = "stylus"; packageName = "stylus"; - version = "0.54.5"; + version = "0.54.7"; src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz"; - sha1 = "42b9560931ca7090ce8515a798ba9e6aa3d6dc79"; + url = "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz"; + sha512 = "Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug=="; }; }; "stylus-supremacy-2.12.7" = { @@ -38453,15 +38608,6 @@ let sha512 = "TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw=="; }; }; - "supervisor-0.12.0" = { - name = "supervisor"; - packageName = "supervisor"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supervisor/-/supervisor-0.12.0.tgz"; - sha1 = "de7e6337015b291851c10f3538c4a7f04917ecc1"; - }; - }; "supports-color-0.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -38741,13 +38887,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.14.4" = { + "systeminformation-4.14.8" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.14.4"; + version = "4.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.14.4.tgz"; - sha512 = "ib2dodksiiaGOW4rcKvFr5naHkODI9GwQPugLb6FLKppkIsE7rj2dfY2UdMBr7oX0/iZP981hoxmbk2e6zl99Q=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.14.8.tgz"; + sha512 = "05wW1YaMBI6LlVtvw2wXQGr0thpX8E0IImYcpbqUiNanfmq8e+V89pDW2L5V/mN8kU37W0VtVySftQ0PwMIXKw=="; }; }; "syswide-cas-5.3.0" = { @@ -38777,13 +38923,13 @@ let sha512 = "UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA=="; }; }; - "table-5.4.5" = { + "table-5.4.6" = { name = "table"; packageName = "table"; - version = "5.4.5"; + version = "5.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-5.4.5.tgz"; - sha512 = "oGa2Hl7CQjfoaogtrOHEJroOcYILTx7BZWLGsJIlzoWmB2zmguhNfPJZsWPKYek/MgCxfco54gEi31d1uN2hFA=="; + url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz"; + sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; "table-layout-0.4.5" = { @@ -38804,6 +38950,15 @@ let sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7"; }; }; + "tabtab-2.2.2" = { + name = "tabtab"; + packageName = "tabtab"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tabtab/-/tabtab-2.2.2.tgz"; + sha1 = "7a047f143b010b4cbd31f857e82961512cbf4e14"; + }; + }; "tabtab-git+https://github.com/mixu/node-tabtab.git" = { name = "tabtab"; packageName = "tabtab"; @@ -38832,13 +38987,13 @@ let sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; }; }; - "tail-2.0.2" = { + "tail-2.0.3" = { name = "tail"; packageName = "tail"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/tail/-/tail-2.0.2.tgz"; - sha512 = "raFipiKWdGKEzxbvZwnhUGqjvsv0gpa/1A479rL//NOxnNwYZDN4MPk6xJJdUFs8P2Xrff3nbH5fcyYRLU4UHQ=="; + url = "https://registry.npmjs.org/tail/-/tail-2.0.3.tgz"; + sha512 = "s9NOGkLqqiDEtBttQZI7acLS8ycYK5sTlDwNjGnpXG9c8AWj0cfAtwEIzo/hVRMMiC5EYz+bXaJWC1u1u0GPpQ=="; }; }; "taketalk-1.0.0" = { @@ -38913,13 +39068,13 @@ let sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; }; }; - "tar-fs-1.16.3" = { + "tar-fs-2.0.0" = { name = "tar-fs"; packageName = "tar-fs"; - version = "1.16.3"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz"; - sha512 = "NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw=="; + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz"; + sha512 = "vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA=="; }; }; "tar-pack-3.4.1" = { @@ -39084,13 +39239,13 @@ let sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; - "terminal-kit-1.29.3" = { + "terminal-kit-1.31.3" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.29.3"; + version = "1.31.3"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.29.3.tgz"; - sha512 = "RngmihiCinQ0CT3Q7l2R4aiV50czaB0gmGZ2rOZXhX5vWAkUAsnRVcv4JG068KQP1FbQNhm88CU/nBCZQmMPUQ=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.31.3.tgz"; + sha512 = "nFNMB70bnvvlCazD2GLhJNmL8uaYxtCd5NarsNFI98oDtn7VJr2TCkfKGX2NxIK42wFWE9ieCUEA93kDvPcBWw=="; }; }; "terser-3.17.0" = { @@ -39102,13 +39257,13 @@ let sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; - "terser-4.1.3" = { + "terser-4.3.1" = { name = "terser"; packageName = "terser"; - version = "4.1.3"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.1.3.tgz"; - sha512 = "on13d+cnpn5bMouZu+J8tPYQecsdRJCJuxFJ+FVoPBoLJgk5bCBkp+Uen2hWyi0KIUm6eDarnlAlH+KgIx/PuQ=="; + url = "https://registry.npmjs.org/terser/-/terser-4.3.1.tgz"; + sha512 = "pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg=="; }; }; "terser-webpack-plugin-1.4.1" = { @@ -39444,13 +39599,13 @@ let sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d"; }; }; - "timers-browserify-2.0.10" = { + "timers-browserify-2.0.11" = { name = "timers-browserify"; packageName = "timers-browserify"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz"; - sha512 = "YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg=="; + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz"; + sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ=="; }; }; "timers-ext-0.1.7" = { @@ -39858,13 +40013,13 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-9.1.2" = { + "torrent-discovery-9.2.1" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.1.2"; + version = "9.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.1.2.tgz"; - sha512 = "LW5CZEWwmlnK0iDwiV8glDI9jWQ1OhL1hGnyn5/ystOSa2+cZO1d2xcKemghf1tlG0C3ytmLE4rnM5yXR5eN3A=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.2.1.tgz"; + sha512 = "bjKkbTEkcoZTXF8nhcRu6UWqbkpUsehd/6umoZqjgj/dM8nD3O7wNkPZrmls+vVf+2LT9ejZMlNUvZCqSe8cqg=="; }; }; "torrent-piece-1.1.2" = { @@ -40191,13 +40346,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-node-8.3.0" = { + "ts-node-8.4.1" = { name = "ts-node"; packageName = "ts-node"; - version = "8.3.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.3.0.tgz"; - sha512 = "dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.4.1.tgz"; + sha512 = "5LpRN+mTiCs7lI5EtbXmF/HfMeCjzt7DH9CZwtkr6SywStrNQC723wG+aOWFiLNn7zT3kD/RnFqi3ZUfr4l5Qw=="; }; }; "tslib-1.10.0" = { @@ -40218,13 +40373,13 @@ let sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="; }; }; - "tsscmp-1.0.5" = { - name = "tsscmp"; - packageName = "tsscmp"; - version = "1.0.5"; + "tslint-5.20.0" = { + name = "tslint"; + packageName = "tslint"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz"; - sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; + url = "https://registry.npmjs.org/tslint/-/tslint-5.20.0.tgz"; + sha512 = "2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g=="; }; }; "tsscmp-1.0.6" = { @@ -40236,6 +40391,15 @@ let sha512 = "LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA=="; }; }; + "tsutils-2.29.0" = { + name = "tsutils"; + packageName = "tsutils"; + version = "2.29.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz"; + sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; + }; + }; "ttl-1.3.1" = { name = "ttl"; packageName = "ttl"; @@ -40488,6 +40652,15 @@ let sha512 = "ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g=="; }; }; + "typescript-3.6.3" = { + name = "typescript"; + packageName = "typescript"; + version = "3.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz"; + sha512 = "N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -40623,24 +40796,6 @@ let sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; }; }; - "uid-safe-2.0.0" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz"; - sha1 = "a7f3c6ca64a1f6a5d04ec0ef3e4c3d5367317137"; - }; - }; - "uid-safe-2.1.4" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz"; - sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81"; - }; - }; "uid-safe-2.1.5" = { name = "uid-safe"; packageName = "uid-safe"; @@ -40731,13 +40886,13 @@ let sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; }; }; - "uncss-0.17.0" = { + "uncss-0.17.2" = { name = "uncss"; packageName = "uncss"; - version = "0.17.0"; + version = "0.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/uncss/-/uncss-0.17.0.tgz"; - sha512 = "ZFFHCpAUEC0kJkuJelLYjrr0/bHBlgrN8XRDQN+wt9VVqap8Avj4fxt2WDJJZi0aSzYVaWCQoX19ZM+JZ5lqnw=="; + url = "https://registry.npmjs.org/uncss/-/uncss-0.17.2.tgz"; + sha512 = "hu2HquwDItuGDem4YsJROdAD8SknmWtM24zwhQax6J1se8tPjV1cnwPKhtjodzBaUhaL8Zb3hlGdZ2WAUpbAOg=="; }; }; "undeclared-identifiers-1.1.3" = { @@ -41199,13 +41354,13 @@ let sha512 = "gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw=="; }; }; - "universal-user-agent-3.0.0" = { + "universal-user-agent-4.0.0" = { name = "universal-user-agent"; packageName = "universal-user-agent"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-3.0.0.tgz"; - sha512 = "T3siHThqoj5X0benA5H0qcDnrKGXzU8TKoX15x/tQHw1hQBvIEBHjxQ2klizYsqBOO/Q+WuxoQUihadeeqDnoA=="; + url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.0.tgz"; + sha512 = "eM8knLpev67iBDizr/YtqkJsF3GK8gzDc6st/WKzrTuPtcsOKW/0IdL4cnMBsU69pOx0otavLWBDGTwg+dB0aA=="; }; }; "universalify-0.1.2" = { @@ -41361,6 +41516,15 @@ let sha512 = "kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q=="; }; }; + "upath-1.2.0" = { + name = "upath"; + packageName = "upath"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"; + sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; + }; + }; "update-check-1.5.2" = { name = "update-check"; packageName = "update-check"; @@ -41523,15 +41687,6 @@ let sha512 = "jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="; }; }; - "url-parse-1.4.3" = { - name = "url-parse"; - packageName = "url-parse"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz"; - sha512 = "rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw=="; - }; - }; "url-parse-1.4.7" = { name = "url-parse"; packageName = "url-parse"; @@ -41568,15 +41723,6 @@ let sha1 = "dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"; }; }; - "url-template-2.0.8" = { - name = "url-template"; - packageName = "url-template"; - version = "2.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz"; - sha1 = "fc565a3cccbff7730c775f5641f9555791439f21"; - }; - }; "url-to-options-1.0.1" = { name = "url-to-options"; packageName = "url-to-options"; @@ -41631,22 +41777,22 @@ let sha512 = "4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw=="; }; }; - "ut_metadata-3.4.0" = { + "ut_metadata-3.5.0" = { name = "ut_metadata"; packageName = "ut_metadata"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.4.0.tgz"; - sha512 = "/Igrr2rPD0NH/dNx493alpHxGBF/XREu68bZU4zigrYiQMQpYL68sKbNo9ND5DcmbMp0lNppw4mOhSSONgUYKw=="; + url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.5.0.tgz"; + sha512 = "eqiRaDYiDl94uVB9oR8Yor+xl0rSKUovsqDxMt+hXzJt1yLYAo0HksVLlSiPPwkXBGFpERQADPanCi0EGhixnw=="; }; }; - "ut_pex-1.2.1" = { + "ut_pex-2.0.0" = { name = "ut_pex"; packageName = "ut_pex"; - version = "1.2.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ut_pex/-/ut_pex-1.2.1.tgz"; - sha512 = "ZrxMCbffYtxQDqvREN9kBXK2CB9tPnd5PylHoqQX9ai+3HV9/S39FnA5JnhLOC82dxIQQg0nTN2wmhtAdGNtOA=="; + url = "https://registry.npmjs.org/ut_pex/-/ut_pex-2.0.0.tgz"; + sha512 = "Uc0IxXGlES1DfeG+ITUISAvCF4Uldj7tt/n7s3TBt0KyXqDViOO26X5WfwXtUpEwn8fyZyerzf/YOK4rIZ2S3Q=="; }; }; "utf-8-validate-1.2.2" = { @@ -41847,6 +41993,24 @@ let sha512 = "FYjr3bHBnJpw8yD0CmFCh5USyDgr6VtuncEIun100GqCUdgqnkAx9irSY3tA4UrzRH56qmiocP2fs1QjQ7ZDZA=="; }; }; + "uuid-2.0.3" = { + name = "uuid"; + packageName = "uuid"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; + }; + }; + "uuid-3.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; + sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; + }; + }; "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; @@ -41856,6 +42020,15 @@ let sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; + "uuid-3.3.3" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz"; + sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="; + }; + }; "v8-compile-cache-2.0.3" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; @@ -41955,15 +42128,6 @@ let sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="; }; }; - "validator-10.8.0" = { - name = "validator"; - packageName = "validator"; - version = "10.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-10.8.0.tgz"; - sha512 = "mXqMxfCh5NLsVgYVKl9WvnHNDPCcbNppHSPPowu0VjtSsGWVY+z8hJF44edLR1nbLNzi3jYoYsIl8KZpioIk6g=="; - }; - }; "validator-5.2.0" = { name = "validator"; packageName = "validator"; @@ -42297,15 +42461,6 @@ let sha512 = "CstaK/ebTz1W3Qp41Bt9Lj/2DmumFsCwC2sKahDNSPh0mPh7/UyMLCoU8ZBX34CRU0d61B4W41yIFsV0NKMZeA=="; }; }; - "vhost-3.0.2" = { - name = "vhost"; - packageName = "vhost"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz"; - sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; - }; - }; "videostream-3.2.1" = { name = "videostream"; packageName = "videostream"; @@ -42396,13 +42551,13 @@ let sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705"; }; }; - "vlc-command-1.1.2" = { + "vlc-command-1.2.0" = { name = "vlc-command"; packageName = "vlc-command"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.1.2.tgz"; - sha512 = "KZ15RTHz96OEiQDA8oNFn1edYDWyKJIWI4gF74Am9woZo5XmVYryk5RYXSwOMvsaAgL5ejICEGCl0suQyDBu+Q=="; + url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.2.0.tgz"; + sha512 = "YTr1w5KmxRN5CBCvplKOD6g/OjwCl5iz+SIjDbq8gWTkByYZun5duHm+OLUkBlbJrCGvMyFyNhTMQxV4Ny0v8g=="; }; }; "vlq-0.2.3" = { @@ -42495,13 +42650,13 @@ let sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="; }; }; - "vscode-jsonrpc-4.1.0-next.2" = { + "vscode-jsonrpc-4.1.0-next.3" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "4.1.0-next.2"; + version = "4.1.0-next.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.2.tgz"; - sha512 = "GsBLjP9DxQ42yl1mW9GEIlnSc0+R8mfzhaebwmmTPEJjezD5SPoAo3DFrIAFZha9yvQ1nzZfZlhtVpGQmgxtXg=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.3.tgz"; + sha512 = "Z6oxBiMks2+UADV1QHXVooSakjyhI+eHTnXzDyVvVMmegvSfkXk2w6mPEdSkaNHFBdtWW7n20H1yw2nA3A17mg=="; }; }; "vscode-languageclient-4.0.1" = { @@ -42540,13 +42695,13 @@ let sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A=="; }; }; - "vscode-languageserver-5.3.0-next.8" = { + "vscode-languageserver-5.3.0-next.10" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "5.3.0-next.8"; + version = "5.3.0-next.10"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.3.0-next.8.tgz"; - sha512 = "6vUb96wsRfrFqndril3gct/FBCSc24OxFZ2iz7kuEuXvLaIcEVOcSZIqQK8oFN7PdbAIaa9nnIpKSy4Yd15cIw=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.3.0-next.10.tgz"; + sha512 = "QL7Fe1FT6PdLtVzwJeZ78pTic4eZbzLRy7yAQgPb9xalqqgZESR0+yDZPwJrM3E7PzOmwHBceYcJR54eQZ7Kng=="; }; }; "vscode-languageserver-protocol-3.14.1" = { @@ -42558,13 +42713,13 @@ let sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g=="; }; }; - "vscode-languageserver-protocol-3.15.0-next.6" = { + "vscode-languageserver-protocol-3.15.0-next.8" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.15.0-next.6"; + version = "3.15.0-next.8"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.6.tgz"; - sha512 = "/yDpYlWyNs26mM23mT73xmOFsh1iRfgZfBdHmfAxwDKwpQKLoOSqVidtYfxlK/pD3IEKGcAVnT4WXTsguxxAMQ=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.8.tgz"; + sha512 = "9FigDhuYTUqX73IGKgJeyLmfXQJv9p3t22RF3peT+HM33uFiTZE3MUgHj4I9m/dKCDvuJt0yvbI27ut4hDoGRQ=="; }; }; "vscode-languageserver-protocol-3.6.0" = { @@ -42594,13 +42749,13 @@ let sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="; }; }; - "vscode-languageserver-types-3.15.0-next.2" = { + "vscode-languageserver-types-3.15.0-next.4" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.15.0-next.2"; + version = "3.15.0-next.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.2.tgz"; - sha512 = "2JkrMWWUi2rlVLSo9OFR2PIGUzdiowEM8NgNYiwLKnXTjpwpjjIrJbNNxDik7Rv4oo9KtikcFQZKXbrKilL/MQ=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.4.tgz"; + sha512 = "IKIWTdUPBnOtwznIrhxKnjVZ7hYxEzwZ3M2xmDi7OjjexuOM6LnGtoo1Dv4wYSik4epK4STEib6e8da2GxUsJA=="; }; }; "vscode-nls-3.2.5" = { @@ -42729,15 +42884,6 @@ let sha512 = "jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg=="; }; }; - "vuetify-helper-json-1.0.0" = { - name = "vuetify-helper-json"; - packageName = "vuetify-helper-json"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vuetify-helper-json/-/vuetify-helper-json-1.0.0.tgz"; - sha512 = "JNjc77FJbWEOk+Y9uzPr8u3cogRivjUE1Ha9DhPruBJutRO1Lf4ZVff44/N37vwC9e9JJGjj7y4JtT2kY7exrw=="; - }; - }; "w3c-hr-time-1.0.1" = { name = "w3c-hr-time"; packageName = "w3c-hr-time"; @@ -42774,6 +42920,15 @@ let sha512 = "ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig=="; }; }; + "walkdir-0.0.11" = { + name = "walkdir"; + packageName = "walkdir"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz"; + sha1 = "a16d025eb931bd03b52f308caed0f40fcebe9532"; + }; + }; "ware-1.3.0" = { name = "ware"; packageName = "ware"; @@ -42855,22 +43010,22 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.39.1" = { + "webpack-4.40.2" = { name = "webpack"; packageName = "webpack"; - version = "4.39.1"; + version = "4.40.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz"; - sha512 = "/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.40.2.tgz"; + sha512 = "5nIvteTDCUws2DVvP9Qe+JPla7kWPPIDFZv55To7IycHWZ+Z5qBdaBYPyuXWdhggTufZkQwfIK+5rKQTVovm2A=="; }; }; - "webpack-cli-3.3.6" = { + "webpack-cli-3.3.8" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.6"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.6.tgz"; - sha512 = "0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz"; + sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw=="; }; }; "webpack-core-0.6.9" = { @@ -42918,13 +43073,13 @@ let sha512 = "EXy/zXb9kNHI07TIMz1oIUIrPZxQRA8aeJ5XYg5ihV8K4kD1DuA+FY6R96HfdIHzlSzS8HiISAfrm+vVQkZBug=="; }; }; - "webtorrent-0.106.0" = { + "webtorrent-0.107.16" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.106.0"; + version = "0.107.16"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.106.0.tgz"; - sha512 = "CTj4J6yj6TuNTfrjRL84tunlCwIM+4hBu/6BfZslgi+iHdiJklUmFra/1WXBsx1madUB6/Ujx1eh4w+FO0on7g=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.107.16.tgz"; + sha512 = "5fdPZFiZPxwbigAHtMVQ7ZCXbZSQlxgB6JPD77itpc9DdKYPpliFwCLsNiQpj1jmpo91HlHUJk+Xp3ks1fLUQg=="; }; }; "whatwg-encoding-1.0.5" = { @@ -43062,6 +43217,15 @@ let sha1 = "20b721df05b35b706176ffa10b0909aba4603035"; }; }; + "wicked-good-xpath-1.3.0" = { + name = "wicked-good-xpath"; + packageName = "wicked-good-xpath"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wicked-good-xpath/-/wicked-good-xpath-1.3.0.tgz"; + sha1 = "81b0e95e8650e49c94b22298fff8686b5553cf6c"; + }; + }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; @@ -43476,15 +43640,6 @@ let sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; }; }; - "ws-5.2.0" = { - name = "ws"; - packageName = "ws"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz"; - sha512 = "c18dMeW+PEQdDFzkhDsnBAlS4Z8KGStBQQUcQ5mf7Nf689jyGk0594L+i9RaQuf4gog6SvWLJorz2NfSaqxZ7w=="; - }; - }; "ws-5.2.2" = { name = "ws"; packageName = "ws"; @@ -43521,13 +43676,13 @@ let sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; }; }; - "wtf-8-1.0.0" = { - name = "wtf-8"; - packageName = "wtf-8"; - version = "1.0.0"; + "ws-7.1.2" = { + name = "ws"; + packageName = "ws"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; - sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; + url = "https://registry.npmjs.org/ws/-/ws-7.1.2.tgz"; + sha512 = "gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg=="; }; }; "x-default-browser-0.3.1" = { @@ -43692,6 +43847,15 @@ let sha512 = "esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q=="; }; }; + "xml2js-0.4.22" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.4.22"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.22.tgz"; + sha512 = "MWTbxAQqclRSTnehWWe5nMKzI3VmJ8ltiJEco8akcC6j3miOhjjfzKum5sId+CWhfxdOs/1xauYr8/ZDBtQiRw=="; + }; + }; "xml2tss-0.0.5" = { name = "xml2tss"; packageName = "xml2tss"; @@ -43719,6 +43883,15 @@ let sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"; }; }; + "xmlbuilder-11.0.1" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "11.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz"; + sha512 = "fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="; + }; + }; "xmlbuilder-2.5.2" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -43746,13 +43919,13 @@ let sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; }; }; - "xmlchars-2.1.1" = { + "xmlchars-2.2.0" = { name = "xmlchars"; packageName = "xmlchars"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz"; - sha512 = "7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w=="; + url = "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz"; + sha512 = "JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="; }; }; "xmlcreate-2.0.1" = { @@ -43782,6 +43955,15 @@ let sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; }; }; + "xmldom-sre-0.1.31" = { + name = "xmldom-sre"; + packageName = "xmldom-sre"; + version = "0.1.31"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom-sre/-/xmldom-sre-0.1.31.tgz"; + sha512 = "f9s+fUkX04BxQf+7mMWAp5zk61pciie+fFLC9hX9UVvCeJQfNHRHXpeo5MPcR0EUf57PYLdt+ZO4f3Ipk2oZUw=="; + }; + }; "xmlhttprequest-1.8.0" = { name = "xmlhttprequest"; packageName = "xmlhttprequest"; @@ -43801,15 +43983,6 @@ let sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; }; }; - "xmlhttprequest-ssl-1.5.3" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; - sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; - }; - }; "xmlhttprequest-ssl-1.5.5" = { name = "xmlhttprequest-ssl"; packageName = "xmlhttprequest-ssl"; @@ -43963,6 +44136,15 @@ let sha1 = "08536d4e73d322b1c9ce207ab8dd70e04d20ae6e"; }; }; + "yaml-ast-parser-0.0.43" = { + name = "yaml-ast-parser"; + packageName = "yaml-ast-parser"; + version = "0.0.43"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz"; + sha512 = "2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A=="; + }; + }; "yaml-front-matter-3.4.1" = { name = "yaml-front-matter"; packageName = "yaml-front-matter"; @@ -44008,6 +44190,15 @@ let sha512 = "ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig=="; }; }; + "yargs-11.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz"; + sha512 = "NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A=="; + }; + }; "yargs-12.0.4" = { name = "yargs"; packageName = "yargs"; @@ -44053,6 +44244,15 @@ let sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; }; }; + "yargs-14.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "14.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-14.1.0.tgz"; + sha512 = "IdkQq1NiiV1fPwN5I2o4B0PKVjKh1EP71egpWO8dlovT8LG8JrXRmbH23v6I3CtjeEMnNC/IF3lq6XepPoELdg=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -44116,15 +44316,6 @@ let sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="; }; }; - "yargs-parser-11.0.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.0.0.tgz"; - sha512 = "dvsafRjM45h79WOTvS/dP35Sb31SlGAKz6tFjI97kGC4MJFBuzTZY6TTYHrz0QSMQdkyd8Y+RsOMLr+JY0nPFQ=="; - }; - }; "yargs-parser-11.1.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -44152,6 +44343,15 @@ let sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; }; }; + "yargs-parser-14.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "14.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-14.0.0.tgz"; + sha512 = "zn/Mnx+tbFjkCFUodEpjXckNS65NfpB5oyqOkDDEG/8uxlfLZJu2IoBLQFjukUkn9rBbGkVYNzrDh6qy4NUd3g=="; + }; + }; "yargs-parser-2.4.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -44197,6 +44397,15 @@ let sha512 = "yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ=="; }; }; + "yargs-parser-9.0.2" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz"; + sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; + }; + }; "yargs-unparser-1.5.0" = { name = "yargs-unparser"; packageName = "yargs-unparser"; @@ -44206,13 +44415,13 @@ let sha512 = "HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw=="; }; }; - "yarn-1.16.0" = { + "yarn-1.17.3" = { name = "yarn"; packageName = "yarn"; - version = "1.16.0"; + version = "1.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.16.0.tgz"; - sha512 = "cfemyGlnWKA1zopUUgebTPf8C4WkPIZ+TJmklwcEAJ4u6oWPtJeAzrsamaGGh/+b1XWe8W51yzAImC4AWbWR1g=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.17.3.tgz"; + sha512 = "CgA8o7nRZaQvmeF/WBx2FC7f9W/0X59T2IaLYqgMo6637wfp5mMEsM3YXoJtKUspnpmDJKl/gGFhnqS+sON7hA=="; }; }; "yauzl-2.10.0" = { @@ -44323,13 +44532,13 @@ let sha512 = "kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g=="; }; }; - "zen-observable-ts-0.8.19" = { + "zen-observable-ts-0.8.20" = { name = "zen-observable-ts"; packageName = "zen-observable-ts"; - version = "0.8.19"; + version = "0.8.20"; src = fetchurl { - url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.19.tgz"; - sha512 = "u1a2rpE13G+jSzrg3aiCqXU5tN2kw41b+cBZGmnc+30YimdkKiDj9bTowcB41eL77/17RF/h+393AuVgShyheQ=="; + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.20.tgz"; + sha512 = "2rkjiPALhOtRaDX6pWyNqK1fnP5KkJJybYebopNSn6wDG1lxBoFs2+nwwXKoA6glHIrtwrfBBy6da0stkKtTAA=="; }; }; "zerr-1.0.4" = { @@ -44383,25 +44592,25 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "8.2.0"; + version = "8.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-8.2.0.tgz"; - sha512 = "KtjC5Mge93YjPQXxEKnXzQ7pmryizfVunrcKHSwhnzfNdwqSjcfL2evl4oBT07b6RfT0nF8HWn0ATWpiLWwrXQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.4.tgz"; + sha512 = "5Jp7a1/Yepm2JkrMHY2Q7nO1FxlNvGp1Zc3m9dp4ydH08qO6/Z8WO0HF+/BxAsHZzB+XV91E1ZzbLR0RdsM8ag=="; }; dependencies = [ - sources."@angular-devkit/architect-0.802.0" - sources."@angular-devkit/core-8.2.0" - sources."@angular-devkit/schematics-8.2.0" - sources."@schematics/angular-8.2.0" - sources."@schematics/update-0.802.0" + sources."@angular-devkit/architect-0.803.4" + sources."@angular-devkit/core-8.3.4" + sources."@angular-devkit/schematics-8.3.4" + sources."@schematics/angular-8.3.4" + sources."@schematics/update-0.803.4" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" sources."ajv-6.10.2" sources."ansi-colors-4.1.1" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-escapes-4.2.1" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."aproba-1.2.0" sources."asap-2.0.6" @@ -44416,12 +44625,12 @@ in sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."builtins-1.0.3" - sources."cacache-12.0.2" + sources."cacache-12.0.3" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-0.7.0" sources."chownr-1.1.2" - sources."cli-cursor-2.1.0" + sources."cli-cursor-3.1.0" sources."cli-width-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -44430,7 +44639,7 @@ in sources."concat-stream-1.6.2" sources."copy-concurrently-1.0.5" sources."core-util-is-1.0.2" - sources."cyclist-0.2.2" + sources."cyclist-1.0.1" sources."dashdash-1.14.1" sources."debug-4.1.1" sources."debuglog-1.0.1" @@ -44439,10 +44648,11 @@ in sources."dezalgo-1.0.3" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" + sources."emoji-regex-8.0.0" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" sources."err-code-1.1.2" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -44453,12 +44663,12 @@ in sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."figgy-pudding-3.5.1" - sources."figures-2.0.0" + sources."figures-3.0.0" sources."flush-write-stream-1.1.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."from2-2.3.0" - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -44466,13 +44676,13 @@ in sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.0" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."http-cache-semantics-3.8.1" (sources."http-proxy-agent-2.1.0" // { dependencies = [ @@ -44489,17 +44699,17 @@ in sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."iferr-0.1.5" - sources."ignore-walk-3.0.1" + sources."ignore-walk-3.0.2" sources."imurmurhash-0.1.4" sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-6.5.0" + sources."inquirer-6.5.1" sources."ip-1.1.5" sources."is-callable-1.1.4" sources."is-date-object-1.0.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-promise-2.1.0" sources."is-regex-1.0.4" sources."is-symbol-1.0.2" @@ -44521,50 +44731,51 @@ in sources."make-fetch-happen-5.0.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.3.5" - sources."minizlib-1.2.1" + sources."minipass-2.6.2" + sources."minizlib-1.2.2" sources."mississippi-3.0.0" sources."mkdirp-0.5.1" sources."move-concurrently-1.0.1" sources."ms-2.1.2" - sources."mute-stream-0.0.7" + sources."mute-stream-0.0.8" sources."node-fetch-npm-2.0.2" (sources."normalize-package-data-2.5.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."npm-bundled-1.0.6" (sources."npm-package-arg-6.1.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."npm-packlist-1.4.4" (sources."npm-pick-manifest-2.2.3" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) - sources."npm-registry-fetch-4.0.0" + sources."npm-registry-fetch-4.0.1" sources."oauth-sign-0.9.0" + sources."object-inspect-1.6.0" sources."object-keys-1.1.1" sources."object.getownpropertydescriptors-2.0.3" sources."once-1.4.0" - sources."onetime-2.0.1" + sources."onetime-5.1.0" sources."open-6.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - (sources."pacote-9.5.4" // { + (sources."pacote-9.5.5" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) - sources."parallel-transform-1.1.0" + sources."parallel-transform-1.2.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."performance-now-2.1.0" @@ -44572,7 +44783,7 @@ in sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" sources."protoduck-5.0.1" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -44581,7 +44792,7 @@ in }) sources."punycode-2.1.1" sources."qs-6.5.2" - sources."read-package-json-2.0.13" + sources."read-package-json-2.1.0" sources."read-package-tree-5.3.1" (sources."readable-stream-2.3.6" // { dependencies = [ @@ -44591,9 +44802,9 @@ in sources."readdir-scoped-modules-1.1.0" sources."request-2.88.0" sources."resolve-1.12.0" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."retry-0.10.1" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."run-async-2.3.0" sources."run-queue-1.0.3" sources."rxjs-6.4.0" @@ -44602,7 +44813,7 @@ in sources."semver-6.3.0" (sources."semver-intersect-1.4.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."signal-exit-3.0.2" @@ -44624,21 +44835,15 @@ in sources."ssri-6.0.1" sources."stream-each-1.2.3" sources."stream-shift-1.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-4.1.0" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) + sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" sources."symbol-observable-1.2.0" sources."tar-4.4.10" @@ -44653,6 +44858,7 @@ in sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."type-fest-0.5.2" sources."typedarray-0.0.6" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -44664,7 +44870,7 @@ in sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."util-promisify-2.1.0" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -44682,41 +44888,37 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/cli/-/cli-2.0.0.tgz"; - sha512 = "vgoGTRRFkPtKeMgGoBevYzK97DwT75rxUeE6yAtm50i7e/aIGoXFyCglaXdsyP4FAfENVqN+DWy3ZuKxhPfc7g=="; + url = "https://registry.npmjs.org/@antora/cli/-/cli-2.1.1.tgz"; + sha512 = "U0xrC4/k2ci04u9Y1Qme6DcZNo1vcJfX8GC8JueMbe+58V6mxewE6yoIuYYCsuy+SI1D0Kbod+M8DrDnxubMSA=="; }; dependencies = [ - sources."@antora/playbook-builder-2.0.0" + sources."@antora/playbook-builder-2.1.1" sources."@iarna/toml-2.2.3" sources."argparse-1.0.10" sources."camelcase-5.3.1" - sources."camelcase-keys-5.2.0" - sources."commander-2.20.0" - (sources."convict-4.4.1" // { - dependencies = [ - sources."json5-1.0.1" - ]; - }) + sources."camelcase-keys-6.0.1" + sources."commander-3.0.1" + sources."convict-5.1.0" sources."decamelize-1.2.0" - sources."deep-freeze-0.0.1" - sources."depd-1.1.2" + sources."deep-freeze-node-1.1.3" sources."esprima-4.0.1" sources."js-yaml-3.13.1" sources."json5-2.1.0" sources."lodash.clonedeep-4.5.0" - sources."map-obj-3.1.0" + sources."map-obj-4.1.0" sources."minimist-1.2.0" - sources."moment-2.22.2" - sources."quick-lru-1.1.0" + sources."moment-2.24.0" + sources."quick-lru-4.0.1" sources."sprintf-js-1.0.3" - sources."validator-10.8.0" - sources."yargs-parser-11.0.0" + sources."validator-10.11.0" + sources."yargs-parser-13.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -44726,29 +44928,30 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@antora/site-generator-default" = nodeEnv.buildNodePackage { name = "_at_antora_slash_site-generator-default"; packageName = "@antora/site-generator-default"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.0.0.tgz"; - sha512 = "YMor7dPAef4Pqyxbz7/ZqS0k5haxtcIkmEAfTJpGthCtRhrYfOu2iH+ZntnKRCubNdSgs77CRYjpSjm43rQ7FQ=="; + url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.1.1.tgz"; + sha512 = "lXE4+gW29OM20t8z1aYyr51KQuEow7kxu4sN8TDCr+2yU0Oqx/6Nxm9zUN33hT6XkNH0oMccdcWr0Aay22Lg2w=="; }; dependencies = [ - sources."@antora/asciidoc-loader-2.0.0" - sources."@antora/content-aggregator-2.0.0" - sources."@antora/content-classifier-2.0.0" - sources."@antora/document-converter-2.0.0" + sources."@antora/asciidoc-loader-2.1.1" + sources."@antora/content-aggregator-2.1.1" + sources."@antora/content-classifier-2.1.1" + sources."@antora/document-converter-2.1.1" sources."@antora/expand-path-helper-1.0.0" - sources."@antora/navigation-builder-2.0.0" - sources."@antora/page-composer-2.0.0" - sources."@antora/playbook-builder-2.0.0" - sources."@antora/redirect-producer-2.0.0" - sources."@antora/site-mapper-2.0.0" - sources."@antora/site-publisher-2.0.0" - sources."@antora/ui-loader-2.0.0" - sources."@babel/runtime-7.5.5" + sources."@antora/navigation-builder-2.1.1" + sources."@antora/page-composer-2.1.1" + sources."@antora/playbook-builder-2.1.1" + sources."@antora/redirect-producer-2.1.1" + sources."@antora/site-mapper-2.1.1" + sources."@antora/site-publisher-2.1.1" + sources."@antora/ui-loader-2.1.1" + sources."@babel/runtime-7.6.0" sources."@iarna/toml-2.2.3" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -44759,12 +44962,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.2" sources."benchmark-1.0.0" - (sources."bl-2.2.0" // { - dependencies = [ - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."bl-3.0.0" sources."bops-0.0.7" sources."brace-expansion-1.1.11" sources."buffer-crc32-0.2.13" @@ -44778,7 +44976,7 @@ in ]; }) sources."camelcase-5.3.1" - sources."camelcase-keys-5.2.0" + sources."camelcase-keys-6.0.1" sources."clean-git-ref-1.0.3" sources."clone-2.1.2" sources."clone-buffer-1.0.0" @@ -44787,25 +44985,25 @@ in (sources."cloneable-readable-1.1.3" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."commander-2.20.0" sources."concat-map-0.0.1" - sources."convert-source-map-1.6.0" - (sources."convict-4.4.1" // { + (sources."convert-source-map-1.6.0" // { dependencies = [ - sources."json5-1.0.1" + sources."safe-buffer-5.1.2" ]; }) + sources."convict-5.1.0" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" - sources."deep-freeze-0.0.1" + sources."deep-freeze-node-1.1.3" sources."defer-to-connect-1.0.2" sources."define-properties-1.1.3" - sources."depd-1.1.2" sources."diff-3.5.0" sources."diff-lines-1.1.1" sources."duplexer-0.1.1" @@ -44813,11 +45011,12 @@ in (sources."duplexify-3.7.1" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."end-of-stream-1.4.1" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-2.0.0" sources."esprima-4.0.1" sources."event-stream-3.3.4" sources."exit-on-epipe-1.0.1" @@ -44826,14 +45025,16 @@ in (sources."flush-write-stream-1.1.1" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."from-0.1.7" - sources."fs-extra-7.0.1" + sources."fs-extra-8.1.0" (sources."fs-mkdirp-stream-1.0.0" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" sources."through2-2.0.5" ]; @@ -44852,24 +45053,26 @@ in dependencies = [ sources."glob-7.1.4" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."globalyzer-0.1.4" sources."globrex-0.1.2" sources."got-9.6.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" (sources."gulp-vinyl-zip-2.1.2" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" sources."through2-2.0.5" ]; }) - sources."handlebars-4.1.2" + sources."handlebars-4.2.0" sources."has-symbols-1.0.0" sources."http-cache-semantics-4.0.3" - sources."ignore-5.1.2" + sources."ignore-5.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-absolute-1.0.0" @@ -44893,6 +45096,7 @@ in (sources."lazystream-1.0.0" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -44900,10 +45104,10 @@ in sources."lodash-4.17.15" sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-1.0.1" - sources."map-obj-3.1.0" + sources."map-obj-4.1.0" sources."map-stream-0.1.0" sources."marky-1.2.1" - sources."matcher-1.1.1" + sources."matcher-2.0.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-response-1.0.1" @@ -44911,7 +45115,7 @@ in sources."minimatch-all-1.1.0" sources."minimist-1.2.0" sources."minimisted-2.0.0" - sources."moment-2.22.2" + sources."moment-2.24.0" sources."multi-progress-2.0.0" sources."neo-async-2.6.1" sources."nick-0.1.3" @@ -44930,6 +45134,7 @@ in (sources."ordered-read-streams-1.0.1" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -44947,14 +45152,22 @@ in sources."pump-2.0.1" sources."pumpify-1.5.1" sources."queue-4.5.1" - sources."quick-lru-1.1.0" + sources."quick-lru-4.0.1" sources."readable-stream-3.4.0" sources."regenerator-runtime-0.13.3" sources."remove-bom-buffer-3.0.0" (sources."remove-bom-stream-1.2.0" // { dependencies = [ - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."through2-2.0.5" ]; }) @@ -44963,7 +45176,7 @@ in sources."require-from-string-2.0.2" sources."resolve-options-1.1.0" sources."responselike-1.0.2" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."sha.js-2.4.11" sources."simple-concat-1.0.0" sources."simple-get-3.0.3" @@ -44974,12 +45187,13 @@ in sources."stream-combiner-0.0.4" sources."stream-shift-1.0.0" sources."stream-source-0.3.5" - sources."string_decoder-1.2.0" + sources."string_decoder-1.3.0" sources."through-2.3.8" sources."through2-3.0.1" (sources."through2-filter-3.0.0" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" sources."through2-2.0.5" ]; @@ -44989,6 +45203,7 @@ in (sources."to-through-2.0.0" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" sources."through2-2.0.5" ]; @@ -45000,13 +45215,14 @@ in sources."universalify-0.1.2" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" - sources."validator-10.8.0" + sources."validator-10.11.0" sources."value-or-function-3.0.0" sources."varint-0.0.3" sources."vinyl-2.2.0" (sources."vinyl-fs-3.0.3" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" sources."through2-2.0.5" ]; @@ -45017,7 +45233,7 @@ in sources."xdg-basedir-3.0.0" sources."xmlhttprequest-1.8.0" sources."xtend-4.0.2" - sources."yargs-parser-11.0.0" + sources."yargs-parser-13.0.0" sources."yauzl-2.10.0" sources."yazl-2.5.1" ]; @@ -45029,30 +45245,31 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.10.0.tgz"; - sha512 = "0A2wsUPAoiiqr4B/EAlz1SPUNbq0pbyt4I8V6fiwie5oJXaxfJ8Vl8rpSUsZ2PzwpowgdiutjFkOxvFmhHAkQQ=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.11.0.tgz"; + sha512 = "dhnkqsg1TRyaauKl7j8b0n5N8vB1Vm6cBqU4n2Re0LeYzO4UUE6KlOAt1zTVn+5Nx45V1NAoPWff1iefPDTT8g=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" sources."@apollographql/apollo-tools-0.4.0" sources."@apollographql/graphql-playground-html-1.6.24" sources."@babel/code-frame-7.5.5" - (sources."@babel/core-7.5.5" // { + (sources."@babel/core-7.6.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.5.5" + sources."@babel/generator-7.6.0" sources."@babel/helper-annotate-as-pure-7.0.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" sources."@babel/helper-call-delegate-7.4.4" - sources."@babel/helper-create-class-features-plugin-7.5.5" + sources."@babel/helper-create-class-features-plugin-7.6.0" sources."@babel/helper-define-map-7.5.5" sources."@babel/helper-explode-assignable-expression-7.1.0" sources."@babel/helper-function-name-7.1.0" @@ -45069,9 +45286,9 @@ in sources."@babel/helper-simple-access-7.1.0" sources."@babel/helper-split-export-declaration-7.4.4" sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.5.5" + sources."@babel/helpers-7.6.0" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.5.5" + sources."@babel/parser-7.6.0" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" sources."@babel/plugin-proposal-class-properties-7.5.5" sources."@babel/plugin-proposal-dynamic-import-7.5.0" @@ -45089,10 +45306,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.2.0" sources."@babel/plugin-transform-async-to-generator-7.5.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.5.5" + sources."@babel/plugin-transform-block-scoping-7.6.0" sources."@babel/plugin-transform-classes-7.5.5" sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.5.0" + sources."@babel/plugin-transform-destructuring-7.6.0" sources."@babel/plugin-transform-dotall-regex-7.4.4" sources."@babel/plugin-transform-duplicate-keys-7.5.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" @@ -45102,10 +45319,10 @@ in sources."@babel/plugin-transform-literals-7.2.0" sources."@babel/plugin-transform-member-expression-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.5.0" - sources."@babel/plugin-transform-modules-commonjs-7.5.0" + sources."@babel/plugin-transform-modules-commonjs-7.6.0" sources."@babel/plugin-transform-modules-systemjs-7.5.0" sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.6.0" sources."@babel/plugin-transform-new-target-7.4.4" sources."@babel/plugin-transform-object-super-7.5.5" sources."@babel/plugin-transform-parameters-7.4.4" @@ -45117,28 +45334,24 @@ in sources."@babel/plugin-transform-sticky-regex-7.2.0" sources."@babel/plugin-transform-template-literals-7.4.4" sources."@babel/plugin-transform-typeof-symbol-7.2.0" - sources."@babel/plugin-transform-typescript-7.5.5" + sources."@babel/plugin-transform-typescript-7.6.0" sources."@babel/plugin-transform-unicode-regex-7.4.4" - (sources."@babel/preset-env-7.5.5" // { + (sources."@babel/preset-env-7.6.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."@babel/preset-flow-7.0.0" - sources."@babel/preset-typescript-7.3.3" - sources."@babel/register-7.5.5" - sources."@babel/template-7.4.4" - sources."@babel/traverse-7.5.5" - sources."@babel/types-7.5.5" - sources."@hapi/address-2.0.0" - sources."@hapi/hoek-6.2.4" - sources."@hapi/joi-15.1.0" - sources."@hapi/marker-1.0.0" - (sources."@hapi/topo-3.1.2" // { - dependencies = [ - sources."@hapi/hoek-8.1.0" - ]; - }) + sources."@babel/preset-typescript-7.6.0" + sources."@babel/register-7.6.0" + sources."@babel/template-7.6.0" + sources."@babel/traverse-7.6.0" + sources."@babel/types-7.6.1" + sources."@hapi/address-2.1.1" + sources."@hapi/bourne-1.3.2" + sources."@hapi/hoek-8.2.4" + sources."@hapi/joi-15.1.1" + sources."@hapi/topo-3.1.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@protobufjs/aspromise-1.1.2" @@ -45152,36 +45365,36 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/accepts-1.3.5" - sources."@types/body-parser-1.17.0" + sources."@types/body-parser-1.17.1" sources."@types/connect-3.4.32" - sources."@types/cookies-0.7.2" - sources."@types/cors-2.8.5" + sources."@types/cookies-0.7.3" + sources."@types/cors-2.8.6" sources."@types/events-3.0.0" - sources."@types/express-4.17.0" - sources."@types/express-serve-static-core-4.16.7" + sources."@types/express-4.17.1" + sources."@types/express-serve-static-core-4.16.9" + sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.1" - sources."@types/graphql-14.2.3" - sources."@types/graphql-upload-8.0.0" - sources."@types/http-assert-1.5.0" + sources."@types/graphql-upload-8.0.3" + sources."@types/http-assert-1.5.1" sources."@types/keygrip-1.0.1" sources."@types/koa-2.0.49" sources."@types/koa-compose-3.2.4" sources."@types/long-4.0.0" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.6.9" + sources."@types/node-12.7.5" sources."@types/range-parser-1.2.3" - sources."@types/serve-static-1.13.2" - sources."@types/ws-6.0.2" + sources."@types/serve-static-1.13.3" + sources."@types/ws-6.0.3" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-3.10.0" - (sources."@vue/cli-ui-3.10.0" // { + sources."@vue/cli-shared-utils-3.11.0" + (sources."@vue/cli-ui-3.11.0" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.10.0" - sources."@vue/cli-ui-addon-widgets-3.10.0" + sources."@vue/cli-ui-addon-webpack-3.11.0" + sources."@vue/cli-ui-addon-widgets-3.11.0" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.9" sources."abbrev-1.1.1" @@ -45198,36 +45411,28 @@ in ]; }) sources."apollo-cache-1.3.2" - (sources."apollo-cache-control-0.8.1" // { - dependencies = [ - sources."graphql-extensions-0.8.1" - ]; - }) - sources."apollo-cache-inmemory-1.6.2" - sources."apollo-client-2.6.3" - sources."apollo-datasource-0.6.1" - sources."apollo-engine-reporting-1.4.3" + sources."apollo-cache-control-0.8.4" + sources."apollo-cache-inmemory-1.6.3" + sources."apollo-client-2.6.4" + sources."apollo-datasource-0.6.3" + sources."apollo-engine-reporting-1.4.6" sources."apollo-engine-reporting-protobuf-0.4.0" sources."apollo-env-0.5.1" sources."apollo-graphql-0.3.3" - sources."apollo-link-1.2.12" - sources."apollo-link-context-1.0.18" - sources."apollo-link-http-common-0.2.14" + sources."apollo-link-1.2.13" + sources."apollo-link-context-1.0.19" + sources."apollo-link-http-common-0.2.15" sources."apollo-link-persisted-queries-0.2.2" sources."apollo-link-state-0.4.2" - sources."apollo-link-ws-1.0.18" + sources."apollo-link-ws-1.0.19" sources."apollo-server-caching-0.5.0" - sources."apollo-server-core-2.8.1" - sources."apollo-server-env-2.4.1" - sources."apollo-server-errors-2.3.1" - sources."apollo-server-express-2.8.1" - sources."apollo-server-plugin-base-0.6.1" - sources."apollo-server-types-0.2.1" - (sources."apollo-tracing-0.8.1" // { - dependencies = [ - sources."graphql-extensions-0.8.1" - ]; - }) + sources."apollo-server-core-2.9.3" + sources."apollo-server-env-2.4.3" + sources."apollo-server-errors-2.3.3" + sources."apollo-server-express-2.9.3" + sources."apollo-server-plugin-base-0.6.4" + sources."apollo-server-types-0.2.4" + sources."apollo-tracing-0.8.4" sources."apollo-upload-client-10.0.1" sources."apollo-utilities-1.3.2" sources."arg-4.1.1" @@ -45235,10 +45440,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-filter-0.0.1" sources."array-flatten-1.1.1" - sources."array-map-0.0.0" - sources."array-reduce-0.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" @@ -45279,8 +45481,8 @@ in sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.6.6" - sources."buffer-5.2.1" + sources."browserslist-4.7.0" + sources."buffer-5.4.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -45299,7 +45501,7 @@ in sources."chalk-2.4.2" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.3" - sources."chokidar-2.1.6" + sources."chokidar-2.1.8" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -45325,7 +45527,7 @@ in sources."cli-width-2.2.0" sources."clipboard-2.0.4" sources."clone-1.0.4" - sources."cmd-shim-2.0.2" + sources."cmd-shim-2.1.0" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -45343,9 +45545,8 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.1.4" - sources."core-js-compat-3.1.4" - sources."core-js-pure-3.1.4" + sources."core-js-3.2.1" + sources."core-js-compat-3.2.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."create-error-class-3.0.2" @@ -45416,13 +45617,13 @@ in sources."easy-stack-1.0.0" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."ejs-2.6.2" - sources."electron-to-chromium-1.3.215" + sources."ejs-2.7.1" + sources."electron-to-chromium-1.3.260" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."entities-1.1.2" sources."envinfo-7.3.1" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -45437,7 +45638,7 @@ in dependencies = [ sources."cross-spawn-6.0.5" sources."get-stream-4.1.0" - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) (sources."expand-brackets-2.1.4" // { @@ -45493,12 +45694,12 @@ in dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.104.0" + sources."flow-parser-0.107.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -45538,15 +45739,15 @@ in }) sources."good-listener-1.2.2" sources."got-6.7.1" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."graceful-readlink-1.0.1" - sources."graphql-14.4.2" + sources."graphql-14.5.6" (sources."graphql-anywhere-4.2.4" // { dependencies = [ sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.9.1" + sources."graphql-extensions-0.10.3" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.1" sources."graphql-tools-4.0.5" @@ -45587,7 +45788,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-6.5.0" + sources."inquirer-6.5.2" sources."into-stream-2.0.1" sources."invariant-2.2.4" sources."ipaddr.js-1.9.0" @@ -45619,7 +45820,7 @@ in sources."is-property-1.0.2" sources."is-redirect-1.0.0" sources."is-regex-1.0.4" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" @@ -45651,7 +45852,6 @@ in sources."json-stringify-safe-5.0.1" sources."json5-2.1.0" sources."jsonfile-4.0.0" - sources."jsonify-0.0.0" sources."jsprim-1.4.1" sources."kind-of-6.0.2" sources."latest-version-3.1.0" @@ -45674,7 +45874,7 @@ in sources."media-typer-0.3.0" sources."merge-1.2.1" sources."merge-descriptors-1.0.1" - sources."merge2-1.2.4" + sources."merge2-1.3.0" sources."methods-1.1.2" (sources."micromatch-3.1.10" // { dependencies = [ @@ -45702,7 +45902,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nan-2.14.0" - sources."nanoid-2.0.3" + sources."nanoid-2.1.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -45722,21 +45922,21 @@ in sources."node-fetch-2.6.0" sources."node-ipc-9.1.1" sources."node-modules-regexp-1.0.0" - (sources."node-notifier-5.4.2" // { + (sources."node-notifier-5.4.3" // { dependencies = [ - sources."is-wsl-2.1.0" + sources."semver-5.7.1" ]; }) - (sources."node-releases-1.1.26" // { + (sources."node-releases-1.1.32" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) - (sources."nodemon-1.19.1" // { + (sources."nodemon-1.19.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."nopt-1.0.10" @@ -45759,6 +45959,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.6.0" sources."object-keys-1.1.1" sources."object-path-0.11.4" sources."object-visit-1.0.1" @@ -45769,16 +45970,16 @@ in sources."once-1.4.0" sources."onetime-2.0.1" sources."open-6.4.0" - sources."optimism-0.9.6" + sources."optimism-0.10.3" sources."ora-3.4.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" (sources."package-json-4.0.1" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."parse-git-config-2.0.3" @@ -45806,7 +46007,7 @@ in sources."pinkie-promise-2.0.1" sources."pirates-4.0.1" sources."pkg-dir-3.0.0" - (sources."portfinder-1.0.21" // { + (sources."portfinder-1.0.24" // { dependencies = [ sources."debug-2.6.9" ]; @@ -45820,13 +46021,13 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.8.8" // { dependencies = [ - sources."@types/node-10.14.14" + sources."@types/node-10.14.18" ]; }) sources."proxy-addr-2.0.5" sources."ps-list-4.1.0" sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pstree.remy-1.1.7" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -45856,8 +46057,8 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexp-tree-0.1.11" - sources."regexpu-core-4.5.4" + sources."regexp-tree-0.1.13" + sources."regexpu-core-4.6.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."regjsgen-0.5.0" @@ -45881,10 +46082,10 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."retry-0.12.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."rss-parser-3.7.2" sources."run-async-2.3.0" - sources."rxjs-6.5.2" + sources."rxjs-6.5.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -45899,7 +46100,7 @@ in sources."semver-6.3.0" (sources."semver-diff-2.1.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) (sources."send-0.17.1" // { @@ -45918,9 +46119,9 @@ in sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.6.1" + sources."shell-quote-1.7.2" sources."shellwords-0.1.1" - sources."shortid-2.2.14" + sources."shortid-2.2.15" sources."signal-exit-3.0.2" sources."slash-2.0.0" (sources."snapdragon-0.8.2" // { @@ -45996,6 +46197,8 @@ in ]; }) sources."string.prototype.padstart-3.0.0" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."string_decoder-1.1.1" sources."strip-ansi-5.2.0" sources."strip-dirs-2.1.0" @@ -46055,12 +46258,12 @@ in sources."trim-repeated-1.0.0" sources."trim-right-1.0.1" sources."ts-invariant-0.4.4" - sources."ts-node-8.3.0" + sources."ts-node-8.4.1" sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."typescript-3.5.3" + sources."typescript-3.6.3" sources."unbzip2-stream-1.3.3" (sources."undefsafe-2.0.2" // { dependencies = [ @@ -46086,7 +46289,7 @@ in ]; }) sources."unzip-response-2.0.1" - sources."upath-1.1.2" + sources."upath-1.2.0" sources."update-notifier-2.5.0" sources."uri-js-4.2.2" sources."urix-0.1.0" @@ -46096,7 +46299,7 @@ in sources."util-deprecate-1.0.2" sources."util.promisify-1.0.0" sources."utils-merge-1.0.1" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" @@ -46116,8 +46319,8 @@ in sources."write-file-atomic-2.4.3" sources."ws-6.2.1" sources."xdg-basedir-3.0.0" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" + sources."xml2js-0.4.22" + sources."xmlbuilder-11.0.1" sources."xtend-4.0.2" sources."yallist-3.0.3" (sources."yaml-front-matter-3.4.1" // { @@ -46128,7 +46331,7 @@ in sources."yauzl-2.10.0" sources."yn-3.1.1" sources."zen-observable-0.8.14" - sources."zen-observable-ts-0.8.19" + sources."zen-observable-ts-0.8.20" ]; buildInputs = globalBuildInputs; meta = { @@ -46138,6 +46341,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@webassemblyjs/cli" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_cli"; @@ -46176,6 +46380,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@webassemblyjs/repl" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_repl"; @@ -46214,6 +46419,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@webassemblyjs/wasm-strip" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wasm-strip"; @@ -46250,6 +46456,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@webassemblyjs/wasm-text-gen" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wasm-text-gen"; @@ -46261,11 +46468,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.5.5" - sources."@babel/generator-7.5.5" + sources."@babel/generator-7.6.0" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.5.5" - sources."@babel/template-7.4.4" - sources."@babel/types-7.5.5" + sources."@babel/parser-7.6.0" + sources."@babel/template-7.6.0" + sources."@babel/types-7.6.1" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -46305,6 +46512,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "@webassemblyjs/wast-refmt" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wast-refmt"; @@ -46334,23 +46542,24 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.14.0.tgz"; - sha512 = "42iwEb64YKWuX7E73Q6zIz7/eP6p3SvacSR02LVoTfveitVXTXw5lzW9JFmBQRqua1kdN+YeaPgx8ocz8Ea3wQ=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.14.1.tgz"; + sha512 = "AbKwsUIrmy4jj6QbQr9QZcDRtmEw1vp+cx9BoX+0KHi+pDu9ZoFFYN1hIkojlnGWzd1R2xZshB/p8LsMyZ1ndw=="; }; dependencies = [ sources."@babel/code-frame-7.5.5" - (sources."@babel/core-7.5.5" // { + (sources."@babel/core-7.6.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.5.5" // { + (sources."@babel/generator-7.6.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -46358,12 +46567,12 @@ in sources."@babel/helper-function-name-7.1.0" sources."@babel/helper-get-function-arity-7.0.0" sources."@babel/helper-split-export-declaration-7.4.4" - sources."@babel/helpers-7.5.5" + sources."@babel/helpers-7.6.0" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.5.5" - sources."@babel/template-7.4.4" - sources."@babel/traverse-7.5.5" - sources."@babel/types-7.5.5" + sources."@babel/parser-7.6.0" + sources."@babel/template-7.6.0" + sources."@babel/traverse-7.6.0" + sources."@babel/types-7.6.1" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -46396,7 +46605,7 @@ in ]; }) sources."globals-11.12.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-color-0.1.7" sources."has-flag-3.0.0" sources."homedir-polyfill-1.0.3" @@ -46428,7 +46637,7 @@ in sources."resolve-1.12.0" sources."safe-buffer-5.1.2" sources."sax-0.5.8" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."source-map-0.6.1" sources."strip-ansi-0.1.1" sources."supports-color-5.5.0" @@ -46450,6 +46659,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; asar = nodeEnv.buildNodePackage { name = "asar"; @@ -46476,7 +46686,7 @@ in sources."mkdirp-0.5.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."tmp-0.1.0" sources."tmp-promise-1.1.0" sources."wrappy-1.0.2" @@ -46489,6 +46699,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; @@ -46499,7 +46710,7 @@ in sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ=="; }; dependencies = [ - sources."@types/node-8.10.51" + sources."@types/node-8.10.54" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-6.10.2" @@ -46589,16 +46800,16 @@ in (sources."azure-common-0.9.22" // { dependencies = [ sources."validator-9.4.1" - (sources."xml2js-0.4.19" // { + (sources."xml2js-0.4.22" // { dependencies = [ - sources."xmlbuilder-9.0.7" + sources."xmlbuilder-11.0.1" ]; }) ]; }) sources."azure-gallery-2.0.0-pre.18" sources."azure-graph-2.2.0" - sources."azure-keyvault-3.0.4" + sources."azure-keyvault-3.0.5" (sources."azure-monitoring-0.10.6" // { dependencies = [ sources."underscore-1.9.1" @@ -46654,14 +46865,17 @@ in }) sources."date-utils-1.2.21" sources."dateformat-1.0.2-1.2.3" - sources."deep-equal-1.0.1" + sources."deep-equal-1.1.0" sources."defaults-1.0.3" + sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."duplexer-0.1.1" sources."easy-table-1.1.0" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."envconf-0.0.4" + sources."es-abstract-1.14.2" + sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" sources."event-stream-3.1.5" sources."extend-3.0.2" @@ -46679,6 +46893,7 @@ in }) sources."from-0.1.7" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."galaxy-0.1.12" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" @@ -46695,8 +46910,10 @@ in sources."commander-2.20.0" ]; }) + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-color-0.1.7" + sources."has-symbols-1.0.0" sources."hash-base-3.0.4" sources."hawk-3.1.3" sources."hoek-2.16.3" @@ -46706,11 +46923,16 @@ in sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."is-arguments-1.0.4" sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.0" sources."is-property-1.0.2" + sources."is-regex-1.0.4" sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -46773,6 +46995,10 @@ in ]; }) sources."oauth-sign-0.8.2" + sources."object-inspect-1.6.0" + sources."object-is-1.0.1" + sources."object-keys-1.1.1" + sources."object.getownpropertydescriptors-2.0.3" sources."omelette-0.3.2" sources."once-1.4.0" sources."openssl-wrapper-0.3.4" @@ -46797,7 +47023,7 @@ in }) ]; }) - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-1.4.1" sources."qs-6.2.3" sources."read-1.0.7" @@ -46806,6 +47032,7 @@ in sources."isarray-0.0.1" ]; }) + sources."regexp.prototype.flags-1.2.0" (sources."request-2.88.0" // { dependencies = [ sources."assert-plus-1.0.0" @@ -46821,7 +47048,7 @@ in ]; }) sources."revalidator-0.1.8" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -46842,6 +47069,8 @@ in sources."stream-combiner-0.0.4" sources."streamline-0.10.17" sources."streamline-streams-0.1.5" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."string_decoder-0.10.31" sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" @@ -46862,12 +47091,13 @@ in }) sources."user-home-2.0.0" sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.0" (sources."utile-0.2.1" // { dependencies = [ sources."async-0.2.10" ]; }) - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."validator-5.2.0" (sources."verror-1.10.0" // { dependencies = [ @@ -46898,14 +47128,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; azure-functions-core-tools = nodeEnv.buildNodePackage { name = "azure-functions-core-tools"; packageName = "azure-functions-core-tools"; - version = "2.7.1505"; + version = "2.7.1585"; src = fetchurl { - url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.7.1505.tgz"; - sha512 = "3v1lDv6zwhGi2Qb8rNFA3tR+8h/vlufuanRgbw2ofPCPBCC29yiyQs2+IiCTBHVAxcBPN0h5rsELstoZ3S2Odw=="; + url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.7.1585.tgz"; + sha512 = "jxtiDsa1M5eMmXyjrkX8b2jl+7QKsjWifF8ralXI9DJYh1jJATUKGAPw56n5SJFbsxZlxxdxDoboOkgFP4aeog=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -46932,7 +47163,7 @@ in sources."fs.realpath-1.0.0" sources."fstream-1.0.12" sources."glob-7.1.3" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-flag-3.0.0" sources."https-proxy-agent-2.2.1" sources."inflight-1.0.6" @@ -46968,6 +47199,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; @@ -46978,11 +47210,11 @@ in sha512 = "GqW24myNihrUroXdL40AemizC3lBvr2wOiF0GzxYWqsBsJvi6CQor0Y9t10jOGn11evMhncmR2f2LoQdjsNpqw=="; }; dependencies = [ - sources."abab-2.0.0" + sources."abab-2.0.1" sources."acorn-5.7.3" - (sources."acorn-globals-4.3.3" // { + (sources."acorn-globals-4.3.4" // { dependencies = [ - sources."acorn-6.2.1" + sources."acorn-6.3.0" ]; }) sources."acorn-walk-6.2.0" @@ -46999,12 +47231,13 @@ in sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bl-1.2.2" + (sources."bl-3.0.0" // { + dependencies = [ + sources."readable-stream-3.4.0" + ]; + }) sources."brace-expansion-1.1.11" sources."browser-process-hrtime-0.1.3" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-fill-1.0.0" sources."caseless-0.12.0" sources."chownr-1.1.2" sources."code-point-at-1.1.0" @@ -47029,9 +47262,9 @@ in sources."domexception-1.0.1" sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.1" - sources."escodegen-1.11.1" + sources."escodegen-1.12.0" sources."esprima-3.1.3" - sources."estraverse-4.2.0" + sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."expand-template-2.0.3" sources."extend-3.0.2" @@ -47082,7 +47315,7 @@ in }) sources."nan-2.14.0" sources."napi-build-utils-1.0.1" - sources."node-abi-2.10.0" + sources."node-abi-2.11.0" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -47091,16 +47324,15 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."optionator-0.8.2" - sources."os-homedir-1.0.2" sources."parse5-4.0.0" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."pn-1.1.0" - sources."prebuild-install-5.3.0" + sources."prebuild-install-5.3.2" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" - sources."psl-1.3.0" - sources."pump-2.0.1" + sources."psl-1.4.0" + sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."rc-1.2.8" @@ -47115,11 +47347,11 @@ in sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" - sources."simple-get-2.8.1" + sources."simple-get-3.0.3" sources."source-map-0.6.1" sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" @@ -47132,13 +47364,12 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."symbol-tree-3.2.4" - (sources."tar-fs-1.16.3" // { + sources."tar-fs-2.0.0" + (sources."tar-stream-2.1.0" // { dependencies = [ - sources."pump-1.0.3" + sources."readable-stream-3.4.0" ]; }) - sources."tar-stream-1.6.2" - sources."to-buffer-1.1.1" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -47154,7 +47385,7 @@ in sources."uri-js-4.2.2" sources."urijs-1.19.1" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."verror-1.10.0" sources."vscode-jsonrpc-4.0.0" sources."vscode-languageserver-4.4.2" @@ -47172,7 +47403,6 @@ in sources."wrappy-1.0.2" sources."ws-5.2.2" sources."xml-name-validator-3.0.0" - sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -47182,6 +47412,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; bower = nodeEnv.buildNodePackage { name = "bower"; @@ -47199,6 +47430,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; @@ -47231,14 +47463,14 @@ in sources."find-up-1.1.2" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" ]; }) sources."fs.realpath-1.0.0" sources."get-stdin-4.0.1" sources."glob-6.0.4" - sources."graceful-fs-3.0.11" - sources."hosted-git-info-2.8.2" + sources."graceful-fs-3.0.12" + sources."hosted-git-info-2.8.4" sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -47249,25 +47481,24 @@ in sources."is-utf8-0.2.1" (sources."jsonfile-2.4.0" // { dependencies = [ - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" ]; }) (sources."klaw-1.3.1" // { dependencies = [ - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" ]; }) (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" ]; }) sources."lodash-4.2.1" sources."loud-rejection-1.6.0" - sources."lru-cache-5.1.1" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.40.0" + sources."mime-db-1.41.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -47288,7 +47519,7 @@ in sources."path-parse-1.0.6" (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" ]; }) sources."pify-2.3.0" @@ -47301,12 +47532,12 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."resolve-1.12.0" - (sources."rimraf-2.6.3" // { + (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.1.4" ]; }) - sources."semver-5.7.0" + sources."semver-5.7.1" sources."signal-exit-3.0.2" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" @@ -47325,7 +47556,6 @@ in sources."trim-newlines-1.0.0" sources."validate-npm-package-license-3.0.4" sources."wrappy-1.0.2" - sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -47335,24 +47565,21 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "16.3.0"; + version = "16.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.3.0.tgz"; - sha512 = "BWaaD7alyGZVEBBwSTYx4iJF5DswIGzK17o8ai9w4iKRbYpk3EOiprRHMRRA8DCZFmFeOdx7A385w2XdFvxWmg=="; + url = "https://registry.npmjs.org/browserify/-/browserify-16.5.0.tgz"; + sha512 = "6bfI3cl76YLAnCZ75AGu/XPOsqUhRyc0F/olGIJeCxtfxF2HvPKEcmjU9M8oAPxl4uBY1U7Nry33Q6koV3f2iw=="; }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-6.2.1" - sources."acorn-dynamic-import-4.0.0" - sources."acorn-node-1.7.0" - sources."acorn-walk-6.2.0" - sources."array-filter-0.0.1" - sources."array-map-0.0.0" - sources."array-reduce-0.0.0" + sources."acorn-7.0.0" + sources."acorn-node-1.8.2" + sources."acorn-walk-7.0.0" sources."asn1.js-4.10.1" (sources."assert-1.5.0" // { dependencies = [ @@ -47377,7 +47604,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-5.2.1" + sources."buffer-5.4.3" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" @@ -47407,7 +47634,7 @@ in sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - sources."elliptic-6.5.0" + sources."elliptic-6.5.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" sources."fs.realpath-1.0.0" @@ -47471,18 +47698,18 @@ in sources."safe-buffer-5.2.0" sources."sha.js-2.4.11" sources."shasum-1.0.2" - sources."shell-quote-1.6.1" + sources."shell-quote-1.7.2" sources."simple-concat-1.0.0" sources."source-map-0.5.7" sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.3" - sources."stream-splicer-2.0.1" - (sources."string_decoder-1.2.0" // { + (sources."stream-http-3.1.0" // { dependencies = [ - sources."safe-buffer-5.1.2" + sources."readable-stream-3.4.0" ]; }) + sources."stream-splicer-2.0.1" + sources."string_decoder-1.3.0" (sources."subarg-1.0.0" // { dependencies = [ sources."minimist-1.2.0" @@ -47492,7 +47719,6 @@ in sources."through-2.3.8" sources."through2-2.0.5" sources."timers-browserify-1.4.2" - sources."to-arraybuffer-1.0.1" sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" sources."umd-3.0.3" @@ -47520,6 +47746,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; castnow = nodeEnv.buildNodePackage { name = "castnow"; @@ -47530,6 +47757,18 @@ in sha512 = "VybZ8QYuJyJHt88TIi12nxsIO/89vmcM1Trna0bTq5O2uzz5SDBE2piU+x87B85V4woosyw9T45f39CZzYjxAw=="; }; dependencies = [ + sources."@protobufjs/aspromise-1.1.2" + sources."@protobufjs/base64-1.1.2" + sources."@protobufjs/codegen-2.0.4" + sources."@protobufjs/eventemitter-1.1.0" + sources."@protobufjs/fetch-1.1.0" + sources."@protobufjs/float-1.0.2" + sources."@protobufjs/inquire-1.1.0" + sources."@protobufjs/path-1.1.2" + sources."@protobufjs/pool-1.1.0" + sources."@protobufjs/utf8-1.1.0" + sources."@types/long-4.0.0" + sources."@types/node-10.14.18" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.10.2" @@ -47540,7 +47779,6 @@ in sources."array-find-index-1.0.2" sources."array-loop-1.0.0" sources."array-shuffle-1.0.1" - sources."ascli-0.3.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -47571,30 +47809,33 @@ in sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" - sources."bufferview-1.0.1" - sources."bytebuffer-3.5.5" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."caseless-0.12.0" - sources."castv2-0.1.9" + (sources."castv2-0.1.10" // { + dependencies = [ + sources."debug-4.1.1" + ]; + }) sources."castv2-client-1.2.0" sources."chalk-1.0.0" + sources."chrome-dgram-3.0.3" + sources."chrome-dns-1.0.1" + sources."chrome-net-3.3.3" sources."chromecast-player-0.2.3" sources."chromecast-scanner-0.5.0" sources."cli-width-1.1.1" sources."clivas-0.1.4" sources."co-3.1.0" sources."codepage-1.4.0" - sources."colour-0.7.1" sources."combined-stream-1.0.8" - sources."commander-2.20.0" + sources."commander-3.0.1" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ sources."readable-stream-3.4.0" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.2.0" + sources."string_decoder-1.3.0" ]; }) sources."core-util-is-1.0.2" @@ -47602,10 +47843,15 @@ in sources."cyclist-0.1.1" sources."dashdash-1.14.1" sources."debounced-seeker-1.0.0" - sources."debug-2.6.9" + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.2.11" + sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."diveSync-0.3.0" sources."dns-js-0.2.1" @@ -47616,6 +47862,8 @@ in ]; }) sources."error-ex-1.3.2" + sources."es-abstract-1.14.2" + sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" sources."exit-on-epipe-1.0.1" sources."extend-3.0.2" @@ -47640,17 +47888,20 @@ in ]; }) sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."get-browser-rtc-1.0.2" sources."get-stdin-4.0.1" sources."getpass-0.1.7" sources."glob-7.1.4" sources."got-1.2.2" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" + sources."has-1.0.3" sources."has-ansi-1.0.3" + sources."has-symbols-1.0.0" sources."hat-0.0.3" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."http-signature-1.2.0" sources."immediate-chunk-store-1.0.8" sources."indent-string-2.1.0" @@ -47663,7 +47914,11 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" sources."is-finite-1.0.2" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-0.0.1" @@ -47679,19 +47934,19 @@ in sources."k-bucket-2.0.1" ]; }) - sources."k-rpc-socket-1.8.0" + sources."k-rpc-socket-1.11.1" sources."keypress-0.2.1" sources."load-json-file-1.1.0" sources."lodash-3.10.1" - sources."long-2.4.0" + sources."long-4.0.0" sources."loud-rejection-1.6.0" sources."lru-2.0.1" - sources."lru-cache-5.1.1" sources."magnet-uri-5.2.4" sources."map-obj-1.0.1" (sources."mdns-js-1.0.3" // { dependencies = [ sources."debug-3.1.0" + sources."ms-2.0.0" sources."semver-5.4.1" ]; }) @@ -47707,7 +47962,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.3.5" - sources."ms-2.0.0" + sources."ms-2.1.2" sources."multicast-dns-4.0.1" sources."mutate.js-0.2.0" sources."mute-stream-0.0.4" @@ -47717,6 +47972,9 @@ in sources."numeral-1.5.6" sources."oauth-sign-0.9.0" sources."object-assign-1.0.0" + sources."object-inspect-1.6.0" + sources."object-keys-1.1.1" + sources."object.getownpropertydescriptors-2.0.3" sources."once-1.4.0" sources."open-0.0.5" (sources."optimist-0.6.1" // { @@ -47725,7 +47983,6 @@ in ]; }) sources."options-0.0.6" - sources."optjs-3.2.2" sources."pad-0.0.5" sources."parse-json-2.2.0" (sources."parse-torrent-5.9.1" // { @@ -47766,8 +48023,8 @@ in sources."plist-3.0.1" sources."process-nextick-args-2.0.1" sources."promiscuous-0.6.0" - sources."protobufjs-3.8.2" - sources."psl-1.3.0" + sources."protobufjs-6.8.8" + sources."psl-1.4.0" (sources."pump-0.3.5" // { dependencies = [ sources."once-1.2.0" @@ -47812,7 +48069,7 @@ in sources."repeating-2.0.1" sources."request-2.88.0" sources."resolve-1.12.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."router-0.6.2" sources."run-parallel-1.1.9" sources."run-series-1.1.8" @@ -47821,7 +48078,7 @@ in sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" @@ -47856,6 +48113,8 @@ in sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" sources."stream-transcoder-0.0.5" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."string2compact-1.3.0" sources."string_decoder-0.10.31" sources."strip-ansi-2.0.1" @@ -47893,8 +48152,9 @@ in sources."uri-js-4.2.2" sources."utfx-1.0.1" sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.0" sources."utp-0.0.7" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" sources."voc-1.1.0" @@ -47908,12 +48168,15 @@ in sources."ultron-1.0.2" ]; }) - sources."xml2js-0.4.19" + (sources."xml2js-0.4.22" // { + dependencies = [ + sources."xmlbuilder-11.0.1" + ]; + }) sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" sources."xspfr-0.3.1" sources."xtend-4.0.2" - sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -47923,6 +48186,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; clean-css = nodeEnv.buildNodePackage { name = "clean-css"; @@ -47943,6 +48207,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; @@ -47960,6 +48225,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; coinmon = nodeEnv.buildNodePackage { name = "coinmon"; @@ -47984,7 +48250,7 @@ in sources."commander-2.20.0" sources."debug-3.2.6" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.7.0" + sources."follow-redirects-1.9.0" sources."has-flag-3.0.0" sources."humanize-plus-1.8.2" sources."is-buffer-1.1.6" @@ -48010,6 +48276,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; configurable-http-proxy = nodeEnv.buildNodePackage { name = "configurable-http-proxy"; @@ -48035,9 +48302,9 @@ in sources."enabled-1.0.2" sources."env-variable-0.0.5" sources."eventemitter3-3.1.2" - sources."fast-safe-stringify-2.0.6" + sources."fast-safe-stringify-2.0.7" sources."fecha-2.3.3" - sources."follow-redirects-1.7.0" + sources."follow-redirects-1.9.0" sources."http-proxy-1.17.0" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -48053,12 +48320,12 @@ in sources."process-nextick-args-2.0.1" sources."readable-stream-3.4.0" sources."requires-port-1.0.0" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."statsd-parser-0.0.4" sources."strftime-0.10.0" - sources."string_decoder-1.2.0" + sources."string_decoder-1.3.0" sources."text-hex-1.0.0" sources."triple-beam-1.3.0" sources."util-deprecate-1.0.2" @@ -48066,6 +48333,7 @@ in (sources."winston-transport-4.3.0" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -48078,6 +48346,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; cordova = nodeEnv.buildNodePackage { name = "cordova"; @@ -48093,7 +48362,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.6.9" + sources."@types/node-12.7.5" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.10.2" @@ -48239,7 +48508,7 @@ in sources."end-of-stream-1.4.1" sources."endent-1.3.0" sources."env-paths-1.0.0" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -48321,7 +48590,7 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-1.0.3" @@ -48333,7 +48602,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -48350,7 +48619,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.5" sources."init-package-json-1.10.3" - (sources."inquirer-6.5.0" // { + (sources."inquirer-6.5.2" // { dependencies = [ sources."mute-stream-0.0.7" ]; @@ -48382,7 +48651,7 @@ in sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-regex-1.0.4" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" @@ -48407,7 +48676,7 @@ in sources."lodash.debounce-4.0.8" sources."loud-rejection-2.1.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-5.1.1" + sources."lru-cache-4.1.5" sources."macos-release-2.3.0" sources."make-dir-1.3.0" sources."map-cache-0.2.2" @@ -48415,7 +48684,7 @@ in sources."md5-file-4.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" - sources."merge2-1.2.4" + sources."merge2-1.3.0" sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" @@ -48436,7 +48705,7 @@ in sources."nice-try-1.0.5" sources."nopt-4.0.1" sources."normalize-package-data-2.5.0" - sources."npm-package-arg-6.1.0" + sources."npm-package-arg-6.1.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" (sources."object-copy-0.1.0" // { @@ -48495,7 +48764,7 @@ in sources."promzard-0.3.0" sources."proxy-addr-2.0.5" sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."q-1.5.1" @@ -48513,7 +48782,7 @@ in sources."pify-4.0.1" ]; }) - (sources."read-package-json-2.0.13" // { + (sources."read-package-json-2.1.0" // { dependencies = [ sources."slash-1.0.0" ]; @@ -48537,12 +48806,12 @@ in sources."resumer-0.0.0" sources."ret-0.1.15" sources."run-async-2.3.0" - sources."rxjs-6.5.2" + sources."rxjs-6.5.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.1.4" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."semver-diff-2.1.0" (sources."send-0.17.1" // { dependencies = [ @@ -48621,6 +48890,8 @@ in ]; }) sources."string.prototype.trim-1.1.2" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" (sources."strip-ansi-5.2.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -48636,8 +48907,6 @@ in sources."cross-spawn-5.1.0" sources."execa-0.7.0" sources."get-stream-3.0.0" - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" ]; }) sources."through-2.3.8" @@ -48682,7 +48951,7 @@ in sources."url-parse-lax-1.0.0" sources."use-3.1.1" sources."utils-merge-1.0.1" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."valid-identifier-0.0.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" @@ -48701,7 +48970,7 @@ in sources."xdg-basedir-3.0.0" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" - sources."yallist-3.0.3" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -48711,6 +48980,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; @@ -48726,7 +48996,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.6.9" + sources."@types/node-12.7.5" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -48836,14 +49106,14 @@ in }) sources."glob-to-regexp-0.3.0" sources."globby-9.2.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."ignore-4.0.6" sources."indent-string-3.2.0" sources."inflight-1.0.6" @@ -48875,13 +49145,12 @@ in }) sources."locate-path-2.0.0" sources."loud-rejection-1.6.0" - sources."lru-cache-5.1.1" sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-obj-2.0.0" sources."map-visit-1.0.0" sources."meow-5.0.0" - sources."merge2-1.2.4" + sources."merge2-1.3.0" sources."micromatch-3.1.10" sources."minimatch-3.0.4" sources."minimist-options-3.0.2" @@ -48938,7 +49207,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" - sources."semver-5.7.0" + sources."semver-5.7.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -49024,7 +49293,6 @@ in sources."use-3.1.1" sources."validate-npm-package-license-3.0.4" sources."wrappy-1.0.2" - sources."yallist-3.0.3" sources."yargs-parser-10.1.0" ]; buildInputs = globalBuildInputs; @@ -49035,6 +49303,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; create-cycle-app = nodeEnv.buildNodePackage { name = "create-cycle-app"; @@ -49055,7 +49324,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-12.6.9" + sources."@types/node-12.7.5" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -49084,17 +49353,21 @@ in sources."d-1.0.1" sources."debug-3.2.6" sources."delayed-stream-1.0.0" - sources."es5-ext-0.10.50" + sources."es5-ext-0.10.51" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" - sources."es6-set-0.1.5" - sources."es6-symbol-3.1.1" + (sources."es6-set-0.1.5" // { + dependencies = [ + sources."es6-symbol-3.1.1" + ]; + }) + sources."es6-symbol-3.1.2" sources."escape-string-regexp-1.0.5" sources."event-emitter-0.3.5" sources."extend-3.0.2" sources."external-editor-2.2.0" sources."figures-2.0.0" - sources."form-data-2.5.0" + sources."form-data-2.5.1" sources."formidable-1.2.1" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" @@ -49134,7 +49407,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.7.0" + sources."qs-6.8.0" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.6" @@ -49183,14 +49456,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.0.1.tgz"; - sha512 = "uOLGMyegGQbm7/kWbHUzsqM16MiehRItBq3WXamzYsKLXdXXAHxEEX57WqcFwd/XybeD/1/KSYkroJdEyk7swA=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.1.1.tgz"; + sha512 = "EaK59gIwEsSZjjIN4MyG0DkXcatF3cEXYODIH7rDrlUremb7iwi5RzZGGISmPIrfywLC82Qom/8CXiT8hwixPQ=="; }; dependencies = [ sources."ansi-escapes-3.2.0" @@ -49207,17 +49481,17 @@ in sources."cli-width-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."debug-2.6.9" sources."duplexer2-0.0.2" - sources."envinfo-7.1.0" + sources."envinfo-7.3.1" sources."escape-string-regexp-1.0.5" sources."external-editor-3.1.0" sources."figures-2.0.0" @@ -49226,13 +49500,13 @@ in sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" sources."glob-7.1.4" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-flag-3.0.0" sources."hyperquest-2.1.3" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-6.2.2" + sources."inquirer-6.5.0" sources."is-fullwidth-code-point-2.0.0" sources."is-promise-2.1.0" sources."isarray-0.0.1" @@ -49254,12 +49528,12 @@ in sources."process-nextick-args-2.0.1" sources."readable-stream-1.1.14" sources."restore-cursor-2.0.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."run-async-2.3.0" - sources."rxjs-6.5.2" + sources."rxjs-6.5.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-6.0.0" + sources."semver-6.3.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -49307,6 +49581,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; @@ -49326,7 +49601,7 @@ in sources."cross-spawn-5.1.0" sources."escape-string-regexp-1.0.5" sources."fs-extra-4.0.3" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-flag-3.0.0" sources."isexe-2.0.0" sources."jsonfile-4.0.0" @@ -49335,7 +49610,7 @@ in sources."path-exists-3.0.0" sources."pseudomap-1.0.2" sources."regenerator-runtime-0.11.1" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."source-map-0.5.7" @@ -49353,6 +49628,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; csslint = nodeEnv.buildNodePackage { name = "csslint"; @@ -49374,6 +49650,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; dat = nodeEnv.buildNodePackage { name = "dat"; @@ -49454,6 +49731,9 @@ in sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.2" + sources."chrome-dgram-3.0.3" + sources."chrome-dns-1.0.1" + sources."chrome-net-3.3.3" sources."ci-info-1.6.0" sources."circular-append-file-1.0.1" (sources."class-utils-0.3.6" // { @@ -49551,7 +49831,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.1" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" @@ -49616,7 +49896,7 @@ in sources."global-4.3.2" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-1.0.3" @@ -49630,14 +49910,14 @@ in }) sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-7.5.1" // { + (sources."hypercore-7.7.1" // { dependencies = [ sources."codecs-2.0.0" sources."unordered-set-2.0.1" ]; }) sources."hypercore-crypto-1.0.0" - (sources."hypercore-protocol-6.11.1" // { + (sources."hypercore-protocol-6.12.0" // { dependencies = [ sources."varint-5.0.0" ]; @@ -49680,7 +49960,7 @@ in sources."is-plain-object-2.0.4" sources."is-redirect-1.0.0" sources."is-regex-1.0.4" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-string-1.0.4" sources."is-symbol-1.0.2" @@ -49702,7 +49982,7 @@ in sources."k-bucket-4.0.1" ]; }) - (sources."k-rpc-socket-1.8.0" // { + (sources."k-rpc-socket-1.11.1" // { dependencies = [ sources."bencode-2.0.1" ]; @@ -49711,7 +49991,7 @@ in sources."kind-of-6.0.2" sources."last-one-wins-1.0.4" sources."latest-version-3.1.0" - sources."length-prefixed-message-3.0.3" + sources."length-prefixed-message-3.0.4" sources."lodash.throttle-4.1.1" sources."lowercase-keys-1.0.1" sources."lru-3.1.0" @@ -49750,6 +50030,7 @@ in sources."nan-2.14.0" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" + sources."nanoguard-1.2.1" sources."nanomatch-1.2.13" sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" @@ -49778,6 +50059,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.6.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.pick-1.3.0" @@ -49807,7 +50089,7 @@ in ]; }) sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -49835,12 +50117,13 @@ in sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."revalidator-0.1.8" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" + sources."run-series-1.1.8" sources."rusha-0.8.13" sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."semver-diff-2.1.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -49891,9 +50174,9 @@ in ]; }) sources."sodium-javascript-0.5.5" - (sources."sodium-native-2.4.5" // { + (sources."sodium-native-2.4.6" // { dependencies = [ - sources."node-gyp-build-4.1.0" + sources."node-gyp-build-4.1.1" ]; }) sources."sodium-universal-2.0.0" @@ -49935,6 +50218,8 @@ in sources."stream-shift-1.0.0" sources."string-width-2.1.1" sources."string.prototype.trim-1.2.0" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -50010,7 +50295,7 @@ in sources."unordered-set-2.0.1" ]; }) - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."varint-3.0.1" sources."verror-1.10.0" sources."which-1.3.1" @@ -50038,6 +50323,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; dhcp = nodeEnv.buildNodePackage { name = "dhcp"; @@ -50058,6 +50344,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; dnschain = nodeEnv.buildNodePackage { name = "dnschain"; @@ -50202,14 +50489,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.3.3"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.3.3.tgz"; - sha512 = "Ie0l2UPxw5owgBMT5zhYSZCS4cEXmIqcFiyLoPgArYgb2MNPPYLGFFBq7v8mvKzYAnl8zZcpGoXD4yzNM+lGxA=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.9.1.tgz"; + sha512 = "5nnktnPlrlJIMDlkgWrS64LUdT7VpPo5WgC1o2CMYSV7Bb0lxga6HotsEAMsiddwVT2wJg7tmAZQd6/Lz+N5Hg=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -50218,7 +50506,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.504.0" + sources."aws-sdk-2.529.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.1" @@ -50231,8 +50519,10 @@ in sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."decimal.js-10.2.0" + sources."delay-4.3.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" + sources."eventemitter3-4.0.0" sources."events-1.1.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -50269,9 +50559,12 @@ in sources."minimist-0.0.10" sources."oauth-sign-0.9.0" sources."optimist-0.6.1" + sources."p-finally-1.0.0" + sources."p-queue-6.1.1" + sources."p-timeout-3.1.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-1.3.2" sources."qs-6.5.2" sources."querystring-0.2.0" @@ -50332,61 +50625,51 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; elm-live = nodeEnv.buildNodePackage { name = "elm-live"; packageName = "elm-live"; - version = "3.4.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-live/-/elm-live-3.4.1.tgz"; - sha512 = "7J4MCV0uyzfnGznSdVzz9o2vgHQwHSVKgEW/NG7dG7nsDWWxqPudQ/FkHYJFWjkylnRtBZUAtB27ZwnLIsgRUw=="; + url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.0.tgz"; + sha512 = "Yf6afXvBnghRZkefxgXCf/KjCm3DlwT6lfTrjLSc5v0I0VXE2Rc5T9iqXihjg3alh9t8NwDVLL+/py8PkkdC9Q=="; }; dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."anymatch-3.0.3" - sources."async-each-1.0.3" + sources."anymatch-3.1.0" sources."async-limiter-1.0.1" sources."binary-extensions-2.0.0" sources."braces-3.0.2" sources."chalk-1.1.3" sources."charenc-0.0.2" - sources."chokidar-3.0.0" - sources."cli-color-1.2.0" + sources."chokidar-3.0.2" sources."commander-2.17.1" - sources."connect-pushstate-1.1.0" + sources."crocks-0.12.1" sources."cross-spawn-5.0.1" sources."crypt-0.0.2" - sources."d-1.0.1" sources."debug-2.6.9" - sources."default-gateway-2.7.2" + sources."default-gateway-4.2.0" sources."depd-1.1.2" sources."destroy-1.0.4" sources."ee-first-1.1.1" - (sources."elm-serve-0.4.0" // { - dependencies = [ - sources."commander-2.9.0" - ]; - }) + sources."elm-hot-1.1.1" sources."encodeurl-1.0.2" - sources."es5-ext-0.10.50" - sources."es6-iterator-2.0.3" - sources."es6-promisify-6.0.1" - sources."es6-symbol-3.1.1" - sources."es6-weak-map-2.0.3" + sources."end-of-stream-1.4.1" + sources."es6-promisify-6.0.2" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."event-emitter-0.3.5" sources."eventemitter3-3.1.2" - (sources."execa-0.10.0" // { + (sources."execa-1.0.0" // { dependencies = [ sources."cross-spawn-6.0.5" ]; }) sources."fill-range-7.0.1" - sources."finalhandler-1.1.1" - (sources."follow-redirects-1.7.0" // { + sources."finalhandler-1.1.2" + (sources."follow-redirects-1.9.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -50394,14 +50677,13 @@ in }) sources."fresh-0.5.2" sources."fsevents-2.0.7" - sources."get-stream-3.0.0" + sources."get-stream-4.1.0" sources."glob-parent-5.0.0" - sources."graceful-readlink-1.0.1" sources."has-ansi-2.0.0" - sources."http-errors-1.6.3" + sources."http-errors-1.7.3" sources."http-proxy-1.17.0" - sources."inherits-2.0.3" - sources."internal-ip-3.0.1" + sources."inherits-2.0.4" + sources."internal-ip-4.3.0" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" @@ -50409,53 +50691,52 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."is-promise-2.1.0" sources."is-stream-1.1.0" sources."is-wsl-1.1.0" sources."isexe-2.0.0" sources."lru-cache-4.1.5" - sources."lru-queue-0.1.0" sources."md5-2.2.1" - sources."memoizee-0.4.14" - sources."mime-1.4.1" - sources."minimist-1.2.0" + sources."mime-2.4.3" sources."ms-2.0.0" - sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" sources."on-finished-2.3.0" - sources."opn-5.3.0" + sources."once-1.4.0" + sources."open-6.4.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."parseurl-1.3.3" sources."path-key-2.0.1" - sources."pem-1.13.2" + sources."pem-1.14.2" sources."picomatch-2.0.7" sources."pseudomap-1.0.2" - sources."querystringify-2.1.1" + sources."pump-3.0.0" sources."range-parser-1.2.1" - sources."readdirp-3.1.1" + sources."readdirp-3.1.2" sources."requires-port-1.0.0" - sources."semver-5.7.0" - sources."send-0.16.2" - sources."serve-static-1.13.2" - sources."setprototypeof-1.1.0" + sources."semver-5.7.1" + (sources."send-0.17.1" // { + dependencies = [ + sources."mime-1.6.0" + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" - sources."supervisor-0.12.0" sources."supports-color-2.0.0" - sources."timers-ext-0.1.7" sources."to-regex-range-5.0.1" - sources."type-1.0.3" + sources."toidentifier-1.0.0" sources."unpipe-1.0.0" - sources."url-parse-1.4.3" sources."which-1.3.1" - sources."ws-5.2.0" + sources."wrappy-1.0.2" + sources."ws-7.1.1" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -50466,6 +50747,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; elm-oracle = nodeEnv.buildNodePackage { name = "elm-oracle"; @@ -50483,6 +50765,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; emoj = nodeEnv.buildNodePackage { name = "emoj"; @@ -50560,18 +50843,13 @@ in sources."get-stream-3.0.0" sources."globals-9.18.0" sources."got-7.1.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-ansi-3.0.0" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."home-or-tmp-2.0.0" - (sources."hosted-git-info-2.8.2" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.0.3" - ]; - }) + sources."hosted-git-info-2.8.4" sources."import-jsx-1.3.2" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" @@ -50590,7 +50868,7 @@ in sources."is-obj-1.0.1" sources."is-object-1.0.1" sources."is-plain-obj-1.1.0" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."isexe-2.0.0" @@ -50658,7 +50936,7 @@ in sources."private-0.1.8" sources."prop-types-15.7.2" sources."pseudomap-1.0.2" - sources."react-is-16.8.6" + sources."react-is-16.9.0" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -50678,7 +50956,7 @@ in sources."resolve-from-3.0.0" sources."restore-cursor-2.0.0" sources."safe-buffer-5.2.0" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -50729,6 +51007,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; emojione = nodeEnv.buildNodePackage { name = "emojione"; @@ -50745,20 +51024,21 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "6.1.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-6.1.0.tgz"; - sha512 = "QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-6.4.0.tgz"; + sha512 = "WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA=="; }; dependencies = [ sources."@babel/code-frame-7.5.5" sources."@babel/highlight-7.5.0" - sources."acorn-6.2.1" - sources."acorn-jsx-5.0.1" + sources."acorn-7.0.0" + sources."acorn-jsx-5.0.2" sources."ajv-6.10.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -50777,7 +51057,7 @@ in sources."concat-map-0.0.1" (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."debug-4.1.1" @@ -50786,13 +51066,13 @@ in sources."emoji-regex-7.0.3" sources."escape-string-regexp-1.0.5" sources."eslint-scope-5.0.0" - sources."eslint-utils-1.4.0" - sources."eslint-visitor-keys-1.0.0" - sources."espree-6.0.0" + sources."eslint-utils-1.4.2" + sources."eslint-visitor-keys-1.1.0" + sources."espree-6.1.1" sources."esprima-4.0.1" sources."esquery-1.0.1" sources."esrecurse-4.2.1" - sources."estraverse-4.2.0" + sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."external-editor-3.1.0" sources."fast-deep-equal-2.0.1" @@ -50814,7 +51094,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-6.5.0" + sources."inquirer-6.5.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -50849,7 +51129,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" sources."run-async-2.3.0" - sources."rxjs-6.5.2" + sources."rxjs-6.5.3" sources."safer-buffer-2.1.2" sources."semver-6.3.0" sources."shebang-command-1.2.0" @@ -50869,7 +51149,7 @@ in }) sources."strip-json-comments-3.0.1" sources."supports-color-5.5.0" - (sources."table-5.4.5" // { + (sources."table-5.4.6" // { dependencies = [ sources."string-width-3.1.0" ]; @@ -50894,6 +51174,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; @@ -50906,8 +51187,8 @@ in dependencies = [ sources."@babel/code-frame-7.5.5" sources."@babel/highlight-7.5.0" - sources."acorn-6.2.1" - sources."acorn-jsx-5.0.1" + sources."acorn-7.0.0" + sources."acorn-jsx-5.0.2" sources."ajv-6.10.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -50927,7 +51208,7 @@ in sources."core_d-1.0.1" (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."debug-4.1.1" @@ -50935,15 +51216,15 @@ in sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-6.1.0" + sources."eslint-6.4.0" sources."eslint-scope-5.0.0" - sources."eslint-utils-1.4.0" - sources."eslint-visitor-keys-1.0.0" - sources."espree-6.0.0" + sources."eslint-utils-1.4.2" + sources."eslint-visitor-keys-1.1.0" + sources."espree-6.1.1" sources."esprima-4.0.1" sources."esquery-1.0.1" sources."esrecurse-4.2.1" - sources."estraverse-4.2.0" + sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."external-editor-3.1.0" sources."fast-deep-equal-2.0.1" @@ -50965,7 +51246,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-6.5.0" + sources."inquirer-6.5.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -51003,7 +51284,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" sources."run-async-2.3.0" - sources."rxjs-6.5.2" + sources."rxjs-6.5.3" sources."safer-buffer-2.1.2" sources."semver-6.3.0" sources."shebang-command-1.2.0" @@ -51023,7 +51304,7 @@ in }) sources."strip-json-comments-3.0.1" sources."supports-color-5.5.0" - (sources."table-5.4.5" // { + (sources."table-5.4.6" // { dependencies = [ sources."string-width-3.1.0" ]; @@ -51048,6 +51329,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "fast-cli-1.x" = nodeEnv.buildNodePackage { name = "fast-cli"; @@ -51104,13 +51386,13 @@ in sources."fs-extra-1.0.0" sources."get-stdin-4.0.1" sources."getpass-0.1.7" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."hasha-2.2.0" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."http-signature-1.2.0" sources."indent-string-2.1.0" sources."inherits-2.0.4" @@ -51140,7 +51422,6 @@ in }) sources."log-update-1.0.2" sources."loud-rejection-1.6.0" - sources."lru-cache-5.1.1" sources."map-obj-1.0.1" sources."meow-3.7.0" sources."mime-db-1.40.0" @@ -51184,7 +51465,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-1.1.8" sources."promise-phantom-3.1.6" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-pkg-1.1.0" @@ -51198,7 +51479,7 @@ in sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."signal-exit-3.0.2" sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" @@ -51223,11 +51504,10 @@ in sources."typedarray-0.0.6" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" sources."which-1.3.1" - sources."yallist-3.0.3" sources."yauzl-2.4.1" sources."zen-observable-0.5.2" ]; @@ -51239,6 +51519,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; @@ -51292,18 +51573,13 @@ in sources."generate-function-1.1.0" sources."generate-object-property-1.2.0" sources."get-stream-3.0.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-flag-3.0.0" - (sources."hosted-git-info-2.8.2" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.0.3" - ]; - }) + sources."hosted-git-info-2.8.4" sources."iconv-lite-0.4.24" sources."indent-string-3.2.0" sources."inherits-2.0.4" - (sources."inquirer-6.5.0" // { + (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-regex-4.1.0" sources."strip-ansi-5.2.0" @@ -51380,11 +51656,11 @@ in sources."resolve-1.12.0" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" - sources."rxjs-6.5.2" + sources."rxjs-6.5.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sec-1.0.0" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -51431,6 +51707,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; forever = nodeEnv.buildNodePackage { name = "forever"; @@ -51507,7 +51784,8 @@ in sources."cycle-1.0.3" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" - sources."deep-equal-1.0.1" + sources."deep-equal-1.1.0" + sources."define-properties-1.1.3" (sources."define-property-2.0.2" // { dependencies = [ sources."isobject-3.0.1" @@ -51547,11 +51825,13 @@ in sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" sources."fsevents-1.2.9" + sources."function-bind-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.4" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" + sources."has-1.0.3" (sources."has-value-1.0.0" // { dependencies = [ sources."isobject-3.0.1" @@ -51576,6 +51856,7 @@ in sources."kind-of-6.0.2" ]; }) + sources."is-arguments-1.0.4" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" (sources."is-data-descriptor-1.0.0" // { @@ -51583,6 +51864,7 @@ in sources."kind-of-6.0.2" ]; }) + sources."is-date-object-1.0.1" (sources."is-descriptor-1.0.2" // { dependencies = [ sources."kind-of-6.0.2" @@ -51601,6 +51883,7 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" + sources."is-regex-1.0.4" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isobject-2.1.0" @@ -51656,6 +51939,8 @@ in }) ]; }) + sources."object-is-1.0.1" + sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -51749,6 +52034,7 @@ in }) sources."regex-cache-0.4.4" sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.2.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -51756,7 +52042,7 @@ in sources."resumer-0.0.0" sources."ret-0.1.15" sources."revalidator-0.1.8" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" (sources."set-value-2.0.1" // { @@ -51861,6 +52147,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; git-run = nodeEnv.buildNodePackage { name = "git-run"; @@ -51878,7 +52165,7 @@ in sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.1.2" - sources."simple-git-1.124.0" + sources."simple-git-1.126.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -51889,6 +52176,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; git-ssb = nodeEnv.buildNodePackage { name = "git-ssb"; @@ -51916,7 +52204,7 @@ in sources."git-remote-ssb-2.0.4" sources."git-ssb-web-2.8.0" sources."hashlru-2.3.0" - sources."highlight.js-9.15.9" + sources."highlight.js-9.15.10" sources."increment-buffer-1.0.1" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -51953,8 +52241,8 @@ in sources."multiserver-scopes-1.0.0" sources."muxrpc-6.4.2" sources."nan-2.14.0" - sources."nearley-2.18.0" - sources."node-gyp-build-4.1.0" + sources."nearley-2.19.0" + sources."node-gyp-build-4.1.1" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" sources."options-0.0.6" @@ -52001,7 +52289,7 @@ in sources."pull-pushable-2.2.0" sources."pull-reader-1.3.1" sources."pull-skip-footer-0.1.0" - sources."pull-stream-3.6.13" + sources."pull-stream-3.6.14" (sources."pull-through-1.0.18" // { dependencies = [ sources."looper-3.0.0" @@ -52016,7 +52304,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.2.0" sources."secret-handshake-1.1.20" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."separator-escape-0.0.0" sources."sha.js-2.4.5" sources."smart-buffer-4.0.2" @@ -52029,7 +52317,7 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.4.5" + sources."sodium-native-2.4.6" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-caps-1.1.0" @@ -52078,6 +52366,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; git-standup = nodeEnv.buildNodePackage { name = "git-standup"; @@ -52095,14 +52384,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; graphql-cli = nodeEnv.buildNodePackage { name = "graphql-cli"; packageName = "graphql-cli"; - version = "3.0.12"; + version = "3.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-3.0.12.tgz"; - sha512 = "+6MxnbXHaAcpF574KTmpkXJmwXQmtP8YVaTY3IKBgqHzL5PMmTrrFgbLUbwDVJDZ5sSr/kMZgZFMiAczMYtykw=="; + url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-3.0.14.tgz"; + sha512 = "YNLHnZsePE2rJycM4E79sE4dx9G1S3rRbKdSbQEFEjOr1wHMEVzvZ3mL4Er6yqIYNWNC95HpQjxfCbjBBxRyng=="; }; dependencies = [ sources."@babel/generator-7.0.0-beta.38" @@ -52293,7 +52583,7 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-extra-5.0.0" - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" @@ -52303,7 +52593,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."got-6.7.1" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."graphcool-json-schema-1.2.1" (sources."graphcool-yml-0.4.15" // { dependencies = [ @@ -52316,7 +52606,7 @@ in sources."ms-2.1.2" ]; }) - sources."graphql-14.4.2" + sources."graphql-14.5.6" (sources."graphql-cli-prepare-1.4.19" // { dependencies = [ sources."chalk-2.3.1" @@ -52341,12 +52631,7 @@ in sources."has-flag-3.0.0" sources."header-case-1.0.1" sources."homedir-polyfill-1.0.3" - (sources."hosted-git-info-2.8.2" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.0.3" - ]; - }) + sources."hosted-git-info-2.8.4" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -52391,7 +52676,7 @@ in sources."is-path-inside-1.0.1" sources."is-promise-2.1.0" sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-upper-case-1.1.2" @@ -52471,12 +52756,12 @@ in sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - (sources."minipass-2.3.5" // { + (sources."minipass-2.6.2" // { dependencies = [ sources."yallist-3.0.3" ]; }) - sources."minizlib-1.2.1" + sources."minizlib-1.2.2" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" @@ -52553,7 +52838,7 @@ in sources."proxy-addr-2.0.5" sources."prr-1.0.1" sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -52585,13 +52870,13 @@ in sources."resolve-dir-1.0.1" sources."resolve-from-4.0.0" sources."restore-cursor-2.0.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."run-async-2.3.0" - sources."rxjs-6.5.2" + sources."rxjs-6.5.3" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."scuid-1.1.0" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."semver-diff-2.1.0" (sources."send-0.17.1" // { dependencies = [ @@ -52677,7 +52962,7 @@ in sources."url-regex-3.2.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" sources."validator-10.11.0" sources."vary-1.1.2" @@ -52713,7 +52998,7 @@ in sources."mem-4.3.0" sources."mimic-fn-2.1.0" sources."os-locale-3.1.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."yargs-parser-11.1.1" @@ -52730,6 +53015,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; @@ -52995,6 +53281,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; gtop = nodeEnv.buildNodePackage { name = "gtop"; @@ -53020,8 +53307,11 @@ in sources."cli-table-0.3.1" sources."colors-1.0.3" sources."core-util-is-1.0.2" + sources."define-properties-1.1.3" sources."drawille-blessed-contrib-1.0.0" sources."drawille-canvas-blessed-contrib-0.1.3" + sources."es-abstract-1.14.2" + sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" sources."esprima-3.0.0" (sources."event-stream-0.9.8" // { @@ -53029,10 +53319,17 @@ in sources."optimist-0.2.8" ]; }) + sources."function-bind-1.1.1" sources."gl-matrix-2.8.1" + sources."has-1.0.3" sources."has-ansi-2.0.0" + sources."has-symbols-1.0.0" sources."here-0.0.2" sources."inherits-2.0.4" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.2" sources."isarray-0.0.1" sources."lodash-4.17.15" sources."lodash.assign-4.2.0" @@ -53044,6 +53341,9 @@ in sources."memorystream-0.3.1" sources."node-emoji-1.10.0" sources."nopt-2.1.2" + sources."object-inspect-1.6.0" + sources."object-keys-1.1.1" + sources."object.getownpropertydescriptors-2.0.3" sources."optimist-0.3.7" sources."picture-tuber-1.0.2" sources."png-js-0.1.1" @@ -53051,15 +53351,18 @@ in sources."redeyed-1.0.1" sources."sax-1.2.4" sources."sparkline-0.1.2" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."systeminformation-4.14.4" + sources."systeminformation-4.14.8" sources."term-canvas-0.0.5" + sources."util.promisify-1.0.0" sources."wordwrap-0.0.3" sources."x256-0.0.2" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" + sources."xml2js-0.4.22" + sources."xmlbuilder-11.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -53069,6 +53372,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; gulp = nodeEnv.buildNodePackage { name = "gulp"; @@ -53132,7 +53436,7 @@ in sources."buffer-from-1.1.1" sources."cache-base-1.0.1" sources."camelcase-3.0.0" - (sources."chokidar-2.1.6" // { + (sources."chokidar-2.1.8" // { dependencies = [ sources."normalize-path-3.0.0" ]; @@ -53187,9 +53491,9 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.1" sources."error-ex-1.3.2" - sources."es5-ext-0.10.50" + sources."es5-ext-0.10.51" sources."es6-iterator-2.0.3" - sources."es6-symbol-3.1.1" + sources."es6-symbol-3.1.2" sources."es6-weak-map-2.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -53253,7 +53557,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."gulp-cli-2.2.0" sources."gulplog-1.0.0" sources."has-symbols-1.0.0" @@ -53264,7 +53568,7 @@ in ]; }) sources."homedir-polyfill-1.0.3" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -53305,7 +53609,6 @@ in sources."lead-1.0.0" sources."liftoff-3.1.0" sources."load-json-file-1.1.0" - sources."lru-cache-5.1.1" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -53396,7 +53699,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."semver-greatest-satisfied-range-1.1.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { @@ -53495,7 +53798,7 @@ in sources."has-values-0.1.4" ]; }) - sources."upath-1.1.2" + sources."upath-1.2.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -53511,7 +53814,6 @@ in sources."wrappy-1.0.2" sources."xtend-4.0.2" sources."y18n-3.2.1" - sources."yallist-3.0.3" sources."yargs-7.1.0" sources."yargs-parser-5.0.0" ]; @@ -53523,6 +53825,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; gulp-cli = nodeEnv.buildNodePackage { name = "gulp-cli"; @@ -53587,9 +53890,9 @@ in sources."detect-file-1.0.0" sources."each-props-1.3.2" sources."error-ex-1.3.2" - sources."es5-ext-0.10.50" + sources."es5-ext-0.10.51" sources."es6-iterator-2.0.3" - sources."es6-symbol-3.1.1" + sources."es6-symbol-3.1.2" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -53631,7 +53934,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."gulplog-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -53640,7 +53943,7 @@ in ]; }) sources."homedir-polyfill-1.0.3" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."inherits-2.0.4" sources."ini-1.3.5" sources."interpret-1.2.0" @@ -53684,7 +53987,6 @@ in sources."lcid-1.0.0" sources."liftoff-3.1.0" sources."load-json-file-1.1.0" - sources."lru-cache-5.1.1" (sources."make-iterator-1.0.1" // { dependencies = [ sources."kind-of-6.0.2" @@ -53769,7 +54071,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."semver-greatest-satisfied-range-1.1.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { @@ -53852,7 +54154,6 @@ in sources."which-module-1.0.0" sources."wrap-ansi-2.1.0" sources."y18n-3.2.1" - sources."yallist-3.0.3" sources."yargs-7.1.0" sources."yargs-parser-5.0.0" ]; @@ -53864,6 +54165,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; @@ -53894,6 +54196,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; @@ -53983,7 +54286,7 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."performance-now-2.1.0" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-1.1.14" @@ -54002,7 +54305,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uri-js-4.2.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."verror-1.10.0" sources."wrappy-1.0.2" sources."xml-1.0.1" @@ -54015,6 +54318,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; http-server = nodeEnv.buildNodePackage { name = "http-server"; @@ -54031,7 +54335,7 @@ in sources."debug-3.2.6" sources."ecstatic-3.3.2" sources."eventemitter3-3.1.2" - sources."follow-redirects-1.7.0" + sources."follow-redirects-1.9.0" sources."he-1.2.0" sources."http-proxy-1.17.0" sources."mime-1.6.0" @@ -54048,7 +54352,7 @@ in sources."minimist-0.0.10" ]; }) - (sources."portfinder-1.0.21" // { + (sources."portfinder-1.0.24" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -54068,6 +54372,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; hueadm = nodeEnv.buildNodePackage { name = "hueadm"; @@ -54084,7 +54389,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."cmdln-4.4.0" - sources."color-convert-2.0.0" + sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -54106,9 +54411,9 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."readable-stream-3.4.0" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."sprintf-js-1.0.3" - sources."string_decoder-1.2.0" + sources."string_decoder-1.3.0" sources."tabula-1.10.0" sources."util-deprecate-1.0.2" sources."verror-1.10.0" @@ -54123,6 +54428,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; imapnotify = nodeEnv.buildNodePackage { name = "imapnotify"; @@ -54141,7 +54447,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.7" + sources."dtrace-provider-0.8.8" sources."eyes-0.1.8" sources."glob-6.0.4" sources."imap-0.8.19" @@ -54185,6 +54491,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; indium = nodeEnv.buildNodePackage { name = "indium"; @@ -54200,7 +54507,7 @@ in sources."commander-2.11.0" sources."node-fetch-2.6.0" sources."safe-buffer-5.1.2" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."source-map-0.7.3" sources."ultron-1.1.1" sources."ws-3.3.3" @@ -54213,27 +54520,28 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "5.2.3"; + version = "5.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-5.2.3.tgz"; - sha512 = "4TX29yrOhlcSFX8LRoB3ss2PaSyV6DBVnnCC7S/hBhmN0jS6/bQS7nO7gafvX8he08MF9DEfz5GVqXvME9a4og=="; + url = "https://registry.npmjs.org/ionic/-/ionic-5.2.8.tgz"; + sha512 = "BeUquVJKI5CEqfyt1YlibDyvf/CyiXwg2957/vm6xkxp4At8D9tKJ3Ldb5e74SEgon5u1+mbcGNjDYB/OtTHgQ=="; }; dependencies = [ - sources."@ionic/cli-framework-2.1.2" - sources."@ionic/discover-2.0.2" - sources."@ionic/utils-array-1.0.1" - sources."@ionic/utils-fs-2.0.3" - sources."@ionic/utils-network-1.0.1" - sources."@ionic/utils-object-1.0.1" - sources."@ionic/utils-process-1.0.1" - sources."@ionic/utils-stream-2.0.0" - sources."@ionic/utils-subprocess-1.0.3" - sources."@ionic/utils-terminal-1.0.1" - sources."@types/node-8.10.51" + sources."@ionic/cli-framework-2.1.6" + sources."@ionic/discover-2.0.5" + sources."@ionic/utils-array-1.2.0" + sources."@ionic/utils-fs-2.0.6" + sources."@ionic/utils-network-1.0.4" + sources."@ionic/utils-object-1.0.4" + sources."@ionic/utils-process-1.0.4" + sources."@ionic/utils-stream-2.0.3" + sources."@ionic/utils-subprocess-1.0.7" + sources."@ionic/utils-terminal-1.0.4" + sources."@types/node-8.10.54" sources."agent-base-4.3.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -54260,7 +54568,7 @@ in sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."data-uri-to-buffer-2.0.1" @@ -54273,6 +54581,7 @@ in (sources."duplexer2-0.1.4" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -54282,9 +54591,9 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.1" + sources."escodegen-1.12.0" sources."esprima-3.1.3" - sources."estraverse-4.2.0" + sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."execa-1.0.0" sources."extend-3.0.2" @@ -54292,10 +54601,10 @@ in sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" - sources."form-data-2.5.0" + sources."form-data-2.5.1" sources."formidable-1.2.1" sources."fs-extra-8.1.0" - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" (sources."ftp-0.3.10" // { dependencies = [ @@ -54307,7 +54616,7 @@ in sources."get-stream-4.1.0" sources."get-uri-2.0.3" sources."glob-7.1.4" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-flag-3.0.0" sources."http-errors-1.7.3" (sources."http-proxy-agent-2.1.0" // { @@ -54325,7 +54634,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-6.5.0" // { + (sources."inquirer-6.5.2" // { dependencies = [ (sources."string-width-2.1.1" // { dependencies = [ @@ -54362,7 +54671,7 @@ in sources."lodash.isarray-3.0.4" sources."lodash.keys-3.1.2" sources."lodash.restparam-3.6.1" - (sources."log-update-3.2.0" // { + (sources."log-update-3.3.0" // { dependencies = [ sources."string-width-3.1.0" sources."wrap-ansi-5.1.0" @@ -54377,12 +54686,12 @@ in sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.3.5" // { + (sources."minipass-2.6.2" // { dependencies = [ sources."yallist-3.0.3" ]; }) - sources."minizlib-1.2.1" + sources."minizlib-1.2.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -54418,15 +54727,15 @@ in sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."qs-6.7.0" + sources."qs-6.8.0" sources."raw-body-2.4.1" sources."readable-stream-3.4.0" sources."restore-cursor-2.0.0" - sources."rimraf-2.6.3" + sources."rimraf-3.0.0" sources."rsvp-3.6.2" sources."run-async-2.3.0" - sources."rxjs-6.5.2" - sources."safe-buffer-5.1.2" + sources."rxjs-6.5.3" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.1.4" sources."semver-6.3.0" @@ -54449,6 +54758,7 @@ in (sources."stream-combiner2-1.1.1" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -54458,7 +54768,7 @@ in sources."is-fullwidth-code-point-3.0.0" ]; }) - sources."string_decoder-1.2.0" + sources."string_decoder-1.3.0" (sources."strip-ansi-5.2.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -54490,20 +54800,20 @@ in sources."unpipe-1.0.0" sources."untildify-4.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."which-1.3.1" sources."windows-release-3.2.0" sources."wordwrap-1.0.0" (sources."wrap-ansi-6.0.0" // { dependencies = [ - sources."ansi-styles-4.0.0" - sources."color-convert-2.0.0" + sources."ansi-styles-4.1.0" + sources."color-convert-2.0.1" sources."color-name-1.1.4" ]; }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.0" - sources."ws-7.1.1" + sources."ws-7.1.2" sources."xregexp-2.0.0" sources."yallist-2.1.2" ]; @@ -54515,6 +54825,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; ios-deploy = nodeEnv.buildNodePackage { name = "ios-deploy"; @@ -54532,6 +54843,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; jake = nodeEnv.buildNodePackage { name = "jake"; @@ -54566,6 +54878,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; @@ -54582,7 +54895,7 @@ in sources."assertion-error-1.1.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."bufrw-1.2.1" + sources."bufrw-1.3.0" sources."chai-4.2.0" sources."chai-as-promised-7.1.1" sources."chalk-2.4.2" @@ -54595,15 +54908,16 @@ in sources."error-7.0.2" sources."escape-string-regexp-1.0.5" sources."fast-deep-equal-2.0.1" - sources."fast-json-patch-2.2.0" + sources."fast-json-patch-2.2.1" sources."fs.realpath-1.0.0" sources."get-func-name-2.0.0" sources."glob-7.1.4" sources."has-flag-3.0.0" + sources."hexer-1.5.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."iterare-1.2.0" - (sources."jaeger-client-3.15.0" // { + (sources."jaeger-client-3.16.0" // { dependencies = [ sources."opentracing-0.13.0" ]; @@ -54611,6 +54925,7 @@ in sources."lodash-4.17.15" sources."long-2.4.0" sources."minimatch-3.0.4" + sources."minimist-1.2.0" sources."mz-2.7.0" sources."node-int64-0.4.0" sources."object-assign-4.1.1" @@ -54619,6 +54934,7 @@ in sources."opentracing-0.14.4" sources."path-is-absolute-1.0.1" sources."pathval-1.1.0" + sources."process-0.10.1" sources."rxjs-5.5.12" sources."semaphore-async-await-1.5.1" sources."string-similarity-2.0.0" @@ -54630,7 +54946,7 @@ in sources."thriftrw-3.11.3" sources."type-detect-4.0.8" sources."typescript-3.0.3" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."vscode-jsonrpc-4.0.0" sources."vscode-languageserver-5.2.1" sources."vscode-languageserver-protocol-3.14.1" @@ -54648,23 +54964,24 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.141"; + version = "1.0.146"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.141.tgz"; - sha512 = "Zl2YwRnjSEJM0LJrc+CB2tnfitfXNQ+wLGfT81usa1552CRdloyFrpwg3ivl+CjgMtpO8979maZw5OBpC6Ys/A=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.0.146.tgz"; + sha512 = "Qy7lEfrvRfCL2c+NQWXjSVrwVTsflwxSozvntF8yMtPDhGvy912PjQQFjRplqusdmUEOOacupcRovcvC+T5Bbw=="; }; dependencies = [ sources."@cronvel/get-pixels-3.3.1" - sources."abab-2.0.0" + sources."abab-2.0.1" sources."abbrev-1.1.1" sources."acorn-5.7.3" - (sources."acorn-globals-4.3.3" // { + (sources."acorn-globals-4.3.4" // { dependencies = [ - sources."acorn-6.2.1" + sources."acorn-6.3.0" ]; }) sources."acorn-walk-6.2.0" @@ -54698,19 +55015,20 @@ in sources."balanced-match-1.0.0" sources."base-64-0.1.0" sources."bcrypt-pbkdf-1.0.2" - sources."bl-1.2.2" + (sources."bl-3.0.0" // { + dependencies = [ + sources."readable-stream-3.4.0" + ]; + }) sources."brace-expansion-1.1.11" sources."browser-process-hrtime-0.1.3" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-fill-1.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."charenc-0.0.2" sources."chownr-1.1.2" - sources."chroma-js-2.0.4" + sources."chroma-js-2.0.6" sources."clean-css-4.2.1" sources."cliss-0.0.2" sources."code-point-at-1.1.0" @@ -54742,8 +55060,10 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepmerge-2.2.1" + sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" + sources."depd-1.1.2" sources."detect-libc-1.0.3" sources."diacritics-1.3.0" sources."diff-match-patch-1.0.4" @@ -54760,11 +55080,13 @@ in sources."encoding-0.1.12" sources."end-of-stream-1.4.1" sources."entities-1.1.2" + sources."es-abstract-1.14.2" + sources."es-to-primitive-1.2.0" sources."es6-promise-pool-2.5.0" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.1" + sources."escodegen-1.12.0" sources."esprima-3.1.3" - sources."estraverse-4.2.0" + sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."expand-template-2.0.3" sources."extend-3.0.2" @@ -54773,20 +55095,22 @@ in sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."fault-1.0.3" + sources."fd-slicer-1.1.0" sources."file-type-10.11.0" sources."file-uri-to-path-1.0.0" sources."find-up-2.1.0" - sources."follow-redirects-1.7.0" + sources."follow-redirects-1.9.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" sources."forever-agent-0.6.1" - sources."form-data-2.5.0" + sources."form-data-2.5.1" sources."format-0.2.2" sources."fs-constants-1.0.0" sources."fs-copy-file-sync-1.1.1" sources."fs-extra-5.0.0" - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" (sources."gauge-2.7.4" // { dependencies = [ sources."strip-ansi-3.0.1" @@ -54797,20 +55121,23 @@ in sources."getpass-0.1.7" sources."github-from-package-0.0.0" sources."glob-7.1.4" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" + sources."has-symbols-1.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" sources."highlight.js-9.12.0" sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.2.1" sources."html-minifier-3.5.21" + sources."http-errors-1.7.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" - sources."ignore-walk-3.0.1" + sources."ignore-walk-3.0.2" (sources."image-data-uri-2.0.1" // { dependencies = [ sources."fs-extra-0.26.7" @@ -54851,9 +55178,13 @@ in sources."is-absolute-0.2.6" sources."is-arrayish-0.3.2" sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-1.0.0" + sources."is-regex-1.0.4" sources."is-relative-0.2.1" sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-unc-path-0.1.2" sources."is-windows-0.2.0" @@ -54865,7 +55196,7 @@ in sources."isarray-1.0.0" sources."isstream-0.1.2" sources."joplin-turndown-4.0.17" - sources."joplin-turndown-plugin-gfm-1.0.8" + sources."joplin-turndown-plugin-gfm-1.0.9" sources."jpeg-js-0.1.2" sources."js-tokens-4.0.0" sources."jsbn-0.1.1" @@ -54901,21 +55232,22 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.3.5" - sources."minizlib-1.2.1" + sources."minipass-2.6.2" + sources."minizlib-1.2.2" sources."mkdirp-0.5.1" sources."moment-2.24.0" sources."ms-2.1.2" + sources."multiparty-4.2.1" sources."nan-2.14.0" sources."napi-build-utils-1.0.1" sources."ndarray-1.0.18" sources."ndarray-pack-1.2.1" sources."needle-2.4.0" - sources."nextgen-events-1.1.1" + sources."nextgen-events-1.3.0" sources."no-case-2.3.2" - (sources."node-abi-2.10.0" // { + (sources."node-abi-2.11.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."node-bitmap-0.0.1" @@ -54924,7 +55256,7 @@ in sources."node-persist-2.1.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."noop-logger-0.1.1" @@ -54936,12 +55268,15 @@ in sources."nwsapi-2.1.4" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" + sources."object-inspect-1.6.0" + sources."object-keys-1.1.1" (sources."object-to-arguments-0.0.8" // { dependencies = [ sources."inspect-parameters-declaration-0.0.10" sources."magicli-0.0.5" ]; }) + sources."object.getownpropertydescriptors-2.0.3" sources."omggif-1.0.10" sources."once-1.4.0" sources."optionator-0.8.2" @@ -54955,45 +55290,44 @@ in sources."parse5-4.0.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" sources."performance-now-2.1.0" sources."pify-3.0.0" sources."pipe-functions-1.3.0" sources."pn-1.1.0" sources."pngjs-2.3.1" - (sources."prebuild-install-5.3.0" // { + (sources."prebuild-install-5.3.2" // { dependencies = [ sources."minimist-1.2.0" - sources."simple-get-2.8.1" ]; }) sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-7.3.1" sources."proper-lockfile-2.0.1" - sources."psl-1.3.0" - sources."pump-2.0.1" + sources."psl-1.4.0" + sources."pump-3.0.0" sources."punycode-2.1.1" sources."q-1.1.2" sources."qs-6.5.2" sources."query-string-4.3.4" sources."querystringify-2.1.1" + sources."random-bytes-1.0.0" (sources."rc-1.2.8" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."read-chunk-2.1.0" - (sources."readable-stream-2.3.6" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."readable-stream-2.3.6" sources."reduce-flatten-1.0.1" sources."redux-3.7.2" sources."relateurl-0.2.7" (sources."request-2.88.0" // { dependencies = [ sources."form-data-2.3.3" + sources."punycode-1.4.1" + sources."tough-cookie-2.4.3" ]; }) sources."request-promise-core-1.1.2" @@ -55001,15 +55335,16 @@ in sources."requires-port-1.0.0" sources."resolve-url-0.2.1" sources."retry-0.10.1" - sources."rimraf-2.6.3" - sources."safe-buffer-5.2.0" + sources."rimraf-2.7.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-6.3.0" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" - sources."seventh-0.7.27" + sources."setprototypeof-1.1.1" + sources."seventh-0.7.28" sources."sharp-0.22.1" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" @@ -55025,11 +55360,12 @@ in sources."source-map-url-0.4.0" sources."split-skip-0.0.2" sources."sprintf-js-1.1.2" - sources."sqlite3-4.0.9" + sources."sqlite3-4.1.0" sources."sshpk-1.16.1" + sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-kit-0.9.10" + sources."string-kit-0.9.12" sources."string-padding-1.0.2" sources."string-to-stream-1.1.1" (sources."string-width-1.0.2" // { @@ -55037,11 +55373,9 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" + sources."string_decoder-1.1.1" (sources."stringify-parameters-0.0.4" // { dependencies = [ sources."magicli-0.0.5" @@ -55059,19 +55393,19 @@ in sources."syswide-cas-5.3.0" sources."table-layout-0.4.5" sources."tar-4.4.10" - (sources."tar-fs-1.16.3" // { + sources."tar-fs-2.0.0" + (sources."tar-stream-2.1.0" // { dependencies = [ - sources."pump-1.0.3" + sources."readable-stream-3.4.0" ]; }) - sources."tar-stream-1.6.2" (sources."tcp-port-used-0.1.2" // { dependencies = [ sources."debug-0.7.4" sources."q-0.9.7" ]; }) - sources."terminal-kit-1.29.3" + sources."terminal-kit-1.31.3" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -55079,12 +55413,8 @@ in sources."string-width-2.1.1" ]; }) - sources."to-buffer-1.1.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."toidentifier-1.0.0" + sources."tough-cookie-2.5.0" sources."tr46-1.0.1" sources."tree-kit-0.6.1" sources."tunnel-agent-0.6.0" @@ -55097,6 +55427,7 @@ in sources."commander-2.19.0" ]; }) + sources."uid-safe-2.1.5" sources."unc-path-regex-0.1.2" sources."uniq-1.0.1" sources."universalify-0.1.2" @@ -55106,7 +55437,8 @@ in sources."urix-0.1.0" sources."url-parse-1.4.7" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."util.promisify-1.0.0" + sources."uuid-3.3.3" sources."valid-url-1.0.9" sources."verror-1.10.0" sources."w3c-hr-time-1.0.1" @@ -55128,9 +55460,8 @@ in sources."wrappy-1.0.2" sources."ws-5.2.2" sources."xml-name-validator-3.0.0" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" - sources."xtend-4.0.2" + sources."xml2js-0.4.22" + sources."xmlbuilder-11.0.1" sources."yallist-3.0.3" sources."yargs-parser-7.0.0" ]; @@ -55142,14 +55473,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.1.tgz"; - sha512 = "4y8SHOIRC+/YQ2gs3zJEKBUraQerq49FJYyXRpdzUGYQzCq8q9xtIh0YXial1S5KmonVui4aiUb6XaGyjE51XA=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz"; + sha512 = "ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -55176,7 +55508,7 @@ in sources."path-is-absolute-1.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."sigmund-1.0.1" sources."wrappy-1.0.2" sources."yallist-2.1.2" @@ -55189,6 +55521,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; @@ -55211,6 +55544,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; @@ -55221,13 +55555,13 @@ in sha512 = "Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A=="; }; dependencies = [ - sources."@babel/parser-7.5.5" + sources."@babel/parser-7.6.0" sources."argparse-1.0.10" sources."bluebird-3.5.5" sources."catharsis-0.8.11" sources."entities-1.1.2" sources."escape-string-regexp-2.0.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."js2xmlparser-4.0.0" sources."klaw-3.0.0" sources."linkify-it-2.2.0" @@ -55254,6 +55588,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; jshint = nodeEnv.buildNodePackage { name = "jshint"; @@ -55306,6 +55641,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; json = nodeEnv.buildNodePackage { name = "json"; @@ -55322,6 +55658,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; json-diff = nodeEnv.buildNodePackage { name = "json-diff"; @@ -55346,6 +55683,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; json-refs = nodeEnv.buildNodePackage { name = "json-refs"; @@ -55367,7 +55705,7 @@ in sources."delayed-stream-1.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" - sources."form-data-2.5.0" + sources."form-data-2.5.1" sources."formidable-1.2.1" sources."graphlib-2.1.7" sources."inherits-2.0.4" @@ -55383,7 +55721,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.7.0" + sources."qs-6.8.0" sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" sources."slash-2.0.0" @@ -55401,14 +55739,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "0.15.0"; + version = "0.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.15.0.tgz"; - sha512 = "mo9CuRVoEzJ82g/IaxU0ljSKgPpRoj6rYiJoDIUK7VEqplOca2Saq6eTwmRULRgPiRe4hHC0aYB9tNKJUAQGgQ=="; + url = "https://registry.npmjs.org/json-server/-/json-server-0.15.1.tgz"; + sha512 = "6Vc6tC1uLasnMd6Ksnq+4gSQcRqLuSJ/yLoIG4fr4P8f5dAR1gbCqgaVRlk8jfRune0NXcrfDrz7liwAD2WEeQ=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -55507,7 +55846,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -55566,7 +55905,7 @@ in sources."minimist-1.2.0" sources."morgan-1.9.1" sources."ms-2.0.0" - sources."nanoid-2.0.3" + sources."nanoid-2.1.1" sources."negotiator-0.6.2" sources."normalize-url-4.3.0" sources."npm-run-path-2.0.2" @@ -55577,7 +55916,7 @@ in sources."once-1.4.0" sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."package-json-6.5.0" @@ -55588,12 +55927,12 @@ in sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" sources."pify-3.0.0" - sources."please-upgrade-node-3.1.1" - sources."pluralize-7.0.0" + sources."please-upgrade-node-3.2.0" + sources."pluralize-8.0.0" sources."prepend-http-2.0.0" sources."proxy-addr-2.0.5" sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -55616,7 +55955,7 @@ in sources."semver-compare-1.0.0" (sources."semver-diff-2.1.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) (sources."send-0.17.1" // { @@ -55657,7 +55996,7 @@ in sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-1.3.1" @@ -55675,8 +56014,8 @@ in sources."xdg-basedir-3.0.0" sources."y18n-4.0.0" sources."yallist-2.1.2" - sources."yargs-13.3.0" - sources."yargs-parser-13.1.1" + sources."yargs-14.1.0" + sources."yargs-parser-14.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -55686,6 +56025,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; jsonlint = nodeEnv.buildNodePackage { name = "jsonlint"; @@ -55711,19 +56051,20 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-4.2.0.tgz"; - sha512 = "fmCuxN1rwJxTdZfOXK5LjlmS4Ana/OvzNMpkyLL/TLE8hmgSkpVpMYQ7RTVa8TNKRVQDZNl5W1oF5cfKfgIMlA=="; + url = "https://registry.npmjs.org/karma/-/karma-4.3.0.tgz"; + sha512 = "NSPViHOt+RW38oJklvYxQC4BSQsv737oQlr/r06pCM+slDOr4myuI1ivkRmp+3dVpJDfZt2DmaPJ2wkx+ZZuMQ=="; }; dependencies = [ sources."accepts-1.3.7" sources."after-0.8.2" - sources."anymatch-3.0.3" + sources."anymatch-3.1.0" sources."arraybuffer.slice-0.0.7" sources."async-2.6.3" sources."async-limiter-1.0.1" @@ -55743,7 +56084,7 @@ in sources."buffer-fill-1.0.0" sources."bytes-3.1.0" sources."callsite-1.0.0" - sources."chokidar-3.0.2" + sources."chokidar-3.1.0" sources."colors-1.3.3" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" @@ -55752,7 +56093,7 @@ in sources."connect-3.7.0" sources."content-type-1.0.4" sources."cookie-0.3.1" - sources."core-js-3.1.4" + sources."core-js-3.2.1" sources."custom-event-1.0.1" sources."date-format-2.1.0" sources."debug-2.6.9" @@ -55779,7 +56120,7 @@ in sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."flatted-2.0.1" - (sources."follow-redirects-1.7.0" // { + (sources."follow-redirects-1.9.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -55790,7 +56131,7 @@ in sources."fsevents-2.0.7" sources."glob-7.1.4" sources."glob-parent-5.0.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."http-errors-1.7.2" @@ -55838,10 +56179,10 @@ in sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" - sources."readdirp-3.1.1" + sources."readdirp-3.1.2" sources."requires-port-1.0.0" sources."rfdc-1.1.4" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."setprototypeof-1.1.1" @@ -55899,6 +56240,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; @@ -55931,7 +56273,7 @@ in sources."glob-7.1.4" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-symbols-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -55992,6 +56334,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; leetcode-cli = nodeEnv.buildNodePackage { name = "leetcode-cli"; @@ -56053,9 +56396,9 @@ in sources."end-of-stream-1.4.1" sources."entities-1.1.2" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.1" + sources."escodegen-1.12.0" sources."esprima-3.1.3" - sources."estraverse-4.2.0" + sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."execa-1.0.0" sources."extend-3.0.2" @@ -56143,7 +56486,7 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parse5-1.5.1" @@ -56154,7 +56497,7 @@ in sources."pkginfo-0.4.1" sources."prelude-ls-1.1.2" sources."prompt-1.0.0" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -56170,12 +56513,12 @@ in sources."require-main-filename-1.0.1" sources."restore-cursor-2.0.0" sources."revalidator-0.1.8" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."secure-keys-1.0.0" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -56201,7 +56544,7 @@ in sources."async-0.9.2" ]; }) - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."webidl-conversions-2.0.1" @@ -56247,6 +56590,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; lerna = nodeEnv.buildNodePackage { name = "lerna"; @@ -56265,13 +56609,13 @@ in (sources."@evocateur/libnpmpublish-1.2.2" // { dependencies = [ sources."aproba-2.0.0" - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."@evocateur/npm-registry-fetch-4.0.0" - (sources."@evocateur/pacote-9.6.3" // { + (sources."@evocateur/pacote-9.6.5" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."@lerna/add-3.16.2" @@ -56351,25 +56695,25 @@ in sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - (sources."@octokit/endpoint-5.3.2" // { + (sources."@octokit/endpoint-5.3.5" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" ]; }) sources."@octokit/plugin-enterprise-rest-3.6.2" - (sources."@octokit/request-5.0.2" // { + (sources."@octokit/request-5.1.0" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" ]; }) sources."@octokit/request-error-1.0.4" - sources."@octokit/rest-16.28.7" + sources."@octokit/rest-16.28.9" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.6.9" + sources."@types/node-12.7.5" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -56422,7 +56766,7 @@ in sources."builtins-1.0.3" sources."byline-5.0.0" sources."byte-size-5.0.1" - sources."cacache-12.0.2" + sources."cacache-12.0.3" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -56512,11 +56856,11 @@ in sources."cosmiconfig-5.2.1" (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."currently-unhandled-0.4.1" - sources."cyclist-0.2.2" + sources."cyclist-1.0.1" sources."dargs-4.1.0" sources."dashdash-1.14.1" sources."dateformat-3.0.3" @@ -56534,7 +56878,6 @@ in }) sources."decode-uri-component-0.2.0" sources."dedent-0.7.0" - sources."deepmerge-4.0.0" sources."defaults-1.0.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" @@ -56553,7 +56896,7 @@ in sources."env-paths-1.0.0" sources."err-code-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -56621,7 +56964,7 @@ in sources."fragment-cache-0.2.1" sources."from2-2.3.0" sources."fs-extra-8.1.0" - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -56678,8 +57021,8 @@ in sources."pify-4.0.1" ]; }) - sources."graceful-fs-4.2.1" - (sources."handlebars-4.1.2" // { + sources."graceful-fs-4.2.2" + (sources."handlebars-4.2.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -56696,7 +57039,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."http-cache-semantics-3.8.1" sources."http-proxy-agent-2.1.0" sources."http-signature-1.2.0" @@ -56705,7 +57048,7 @@ in sources."iconv-lite-0.4.24" sources."iferr-0.1.5" sources."ignore-4.0.6" - sources."ignore-walk-3.0.1" + sources."ignore-walk-3.0.2" (sources."import-fresh-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -56720,10 +57063,10 @@ in sources."ini-1.3.5" (sources."init-package-json-1.10.3" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) - (sources."inquirer-6.5.0" // { + (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-regex-4.1.0" sources."strip-ansi-5.2.0" @@ -56812,7 +57155,7 @@ in sources."minimist-1.2.0" ]; }) - sources."merge2-1.2.4" + sources."merge2-1.3.0" sources."micromatch-3.1.10" sources."mime-db-1.40.0" sources."mime-types-2.1.24" @@ -56820,8 +57163,8 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minimist-options-3.0.2" - sources."minipass-2.3.5" - sources."minizlib-1.2.1" + sources."minipass-2.6.2" + sources."minizlib-1.2.2" sources."mississippi-3.0.0" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -56849,21 +57192,21 @@ in sources."nopt-3.0.6" (sources."normalize-package-data-2.5.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."normalize-url-3.3.0" sources."npm-bundled-1.0.6" - sources."npm-lifecycle-3.1.2" - (sources."npm-package-arg-6.1.0" // { + sources."npm-lifecycle-3.1.3" + (sources."npm-package-arg-6.1.1" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."npm-packlist-1.4.4" - (sources."npm-pick-manifest-2.2.3" // { + (sources."npm-pick-manifest-3.0.2" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."npm-run-path-2.0.2" @@ -56884,6 +57227,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.6.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.getownpropertydescriptors-2.0.3" @@ -56900,7 +57244,7 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-map-2.1.0" sources."p-map-series-1.0.0" @@ -56909,7 +57253,7 @@ in sources."p-reduce-1.0.0" sources."p-try-2.2.0" sources."p-waterfall-1.0.0" - sources."parallel-transform-1.1.0" + sources."parallel-transform-1.2.0" sources."parse-github-repo-url-1.4.1" sources."parse-json-4.0.0" sources."parse-path-4.0.1" @@ -56934,7 +57278,7 @@ in sources."proto-list-1.2.4" sources."protocols-1.4.7" sources."protoduck-5.0.1" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -56946,8 +57290,8 @@ in sources."qs-6.5.2" sources."quick-lru-1.1.0" sources."read-1.0.7" - sources."read-cmd-shim-1.0.1" - (sources."read-package-json-2.0.13" // { + sources."read-cmd-shim-1.0.4" + (sources."read-package-json-2.1.0" // { dependencies = [ sources."slash-1.0.0" ]; @@ -56992,10 +57336,10 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."retry-0.10.1" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."run-async-2.3.0" sources."run-queue-1.0.3" - sources."rxjs-6.5.2" + sources."rxjs-6.5.3" sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -57087,6 +57431,8 @@ in sources."strip-ansi-4.0.0" ]; }) + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -57141,7 +57487,7 @@ in sources."union-value-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - sources."universal-user-agent-3.0.0" + sources."universal-user-agent-4.0.0" sources."universalify-0.1.2" (sources."unset-value-1.0.0" // { dependencies = [ @@ -57155,11 +57501,10 @@ in }) sources."uri-js-4.2.2" sources."urix-0.1.0" - sources."url-template-2.0.8" sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."util-promisify-2.1.0" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -57183,7 +57528,7 @@ in dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) (sources."write-pkg-3.2.0" // { @@ -57205,14 +57550,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.9.0"; + version = "3.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.9.0.tgz"; - sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w=="; + url = "https://registry.npmjs.org/less/-/less-3.10.3.tgz"; + sha512 = "vz32vqfgmoxF1h3K4J+yKCtajH0PWmjkIFgbs5d78E/c/e+UQTnI+lWK+1eQRE95PXM2mC3rJlLSSP9VQHnaow=="; }; dependencies = [ sources."ajv-6.10.2" @@ -57238,7 +57584,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."getpass-0.1.7" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" @@ -57259,7 +57605,7 @@ in sources."performance-now-2.1.0" sources."promise-7.3.1" sources."prr-1.0.1" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" @@ -57275,7 +57621,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uri-js-4.2.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; @@ -57286,6 +57632,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; less-plugin-clean-css = nodeEnv.buildNodePackage { name = "less-plugin-clean-css"; @@ -57309,6 +57656,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; live-server = nodeEnv.buildNodePackage { name = "live-server"; @@ -57350,7 +57698,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."chokidar-2.1.6" + sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -57432,7 +57780,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -57613,12 +57961,12 @@ in sources."has-values-0.1.4" ]; }) - sources."upath-1.1.2" + sources."upath-1.2.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."vary-1.1.2" sources."websocket-driver-0.7.3" sources."websocket-extensions-0.1.3" @@ -57631,6 +57979,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; livedown = nodeEnv.buildNodePackage { name = "livedown"; @@ -57774,7 +58123,7 @@ in sources."github-slugger-1.2.1" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-binary2-1.0.3" // { @@ -57920,7 +58269,7 @@ in sources."preserve-0.2.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.5" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.7.0" (sources."randomatic-3.1.1" // { @@ -58116,7 +58465,7 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."vary-1.1.2" sources."verror-1.10.0" sources."ws-6.1.4" @@ -58131,6 +58480,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "lumo-build-deps-../interpreters/clojurescript/lumo" = nodeEnv.buildNodePackage { name = "lumo-build-deps"; @@ -58139,12 +58489,12 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.5.5" - sources."@babel/core-7.5.5" - sources."@babel/generator-7.5.5" + sources."@babel/core-7.6.0" + sources."@babel/generator-7.6.0" sources."@babel/helper-annotate-as-pure-7.0.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" sources."@babel/helper-call-delegate-7.4.4" - sources."@babel/helper-create-class-features-plugin-7.5.5" + sources."@babel/helper-create-class-features-plugin-7.6.0" sources."@babel/helper-define-map-7.5.5" sources."@babel/helper-explode-assignable-expression-7.1.0" sources."@babel/helper-function-name-7.1.0" @@ -58161,9 +58511,9 @@ in sources."@babel/helper-simple-access-7.1.0" sources."@babel/helper-split-export-declaration-7.4.4" sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.5.5" + sources."@babel/helpers-7.6.0" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.5.5" + sources."@babel/parser-7.6.0" sources."@babel/plugin-external-helpers-7.0.0" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" sources."@babel/plugin-proposal-class-properties-7.5.5" @@ -58180,10 +58530,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.2.0" sources."@babel/plugin-transform-async-to-generator-7.5.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.5.5" + sources."@babel/plugin-transform-block-scoping-7.6.0" sources."@babel/plugin-transform-classes-7.5.5" sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.5.0" + sources."@babel/plugin-transform-destructuring-7.6.0" sources."@babel/plugin-transform-dotall-regex-7.4.4" sources."@babel/plugin-transform-duplicate-keys-7.5.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" @@ -58192,29 +58542,29 @@ in sources."@babel/plugin-transform-literals-7.2.0" sources."@babel/plugin-transform-member-expression-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.5.0" - sources."@babel/plugin-transform-modules-commonjs-7.5.0" + sources."@babel/plugin-transform-modules-commonjs-7.6.0" sources."@babel/plugin-transform-modules-systemjs-7.5.0" sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.6.0" sources."@babel/plugin-transform-new-target-7.4.4" sources."@babel/plugin-transform-object-super-7.5.5" sources."@babel/plugin-transform-parameters-7.4.4" sources."@babel/plugin-transform-property-literals-7.2.0" sources."@babel/plugin-transform-regenerator-7.4.5" sources."@babel/plugin-transform-reserved-words-7.2.0" - sources."@babel/plugin-transform-runtime-7.5.5" + sources."@babel/plugin-transform-runtime-7.6.0" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.2.2" sources."@babel/plugin-transform-sticky-regex-7.2.0" sources."@babel/plugin-transform-template-literals-7.4.4" sources."@babel/plugin-transform-typeof-symbol-7.2.0" sources."@babel/plugin-transform-unicode-regex-7.4.4" - sources."@babel/preset-env-7.5.5" + sources."@babel/preset-env-7.6.0" sources."@babel/preset-stage-2-7.0.0" - sources."@babel/runtime-7.5.5" - sources."@babel/template-7.4.4" - sources."@babel/traverse-7.5.5" - sources."@babel/types-7.5.5" + sources."@babel/runtime-7.6.0" + sources."@babel/template-7.6.0" + sources."@babel/traverse-7.6.0" + sources."@babel/types-7.6.1" sources."@calebboyd/semaphore-1.3.1" sources."@comandeer/babel-plugin-banner-4.1.0" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -58225,7 +58575,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.6.9" + sources."@types/node-12.7.5" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -58247,7 +58597,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."ace.improved-0.2.1" - sources."acorn-6.2.1" + sources."acorn-6.3.0" sources."ajv-6.10.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" @@ -58352,14 +58702,14 @@ in sources."babel-plugin-jest-hoist-23.2.0" sources."babel-plugin-minify-builtins-0.5.0" sources."babel-plugin-minify-constant-folding-0.5.0" - sources."babel-plugin-minify-dead-code-elimination-0.5.0" + sources."babel-plugin-minify-dead-code-elimination-0.5.1" sources."babel-plugin-minify-flip-comparisons-0.4.3" - sources."babel-plugin-minify-guarded-expressions-0.4.3" + sources."babel-plugin-minify-guarded-expressions-0.4.4" sources."babel-plugin-minify-infinity-0.4.3" sources."babel-plugin-minify-mangle-names-0.5.0" sources."babel-plugin-minify-numeric-literals-0.4.3" sources."babel-plugin-minify-replace-0.5.0" - sources."babel-plugin-minify-simplify-0.5.0" + sources."babel-plugin-minify-simplify-0.5.1" sources."babel-plugin-minify-type-constructors-0.4.3" sources."babel-plugin-syntax-flow-6.18.0" sources."babel-plugin-syntax-object-rest-spread-6.13.0" @@ -58376,7 +58726,7 @@ in sources."babel-plugin-transform-simplify-comparison-operators-6.9.4" sources."babel-plugin-transform-undefined-to-void-6.9.4" sources."babel-preset-jest-23.2.0" - sources."babel-preset-minify-0.5.0" + sources."babel-preset-minify-0.5.1" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" @@ -58418,8 +58768,8 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.6.6" - sources."buffer-5.2.1" + sources."browserslist-4.7.0" + sources."buffer-5.4.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -58428,7 +58778,7 @@ in sources."buffer-xor-1.0.3" sources."builtin-modules-2.0.0" sources."builtin-status-codes-3.0.0" - sources."cacache-12.0.2" + sources."cacache-12.0.3" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -58450,7 +58800,7 @@ in ]; }) sources."cherow-1.6.9" - (sources."chokidar-2.1.6" // { + (sources."chokidar-2.1.8" // { dependencies = [ sources."array-unique-0.3.2" sources."braces-2.3.2" @@ -58518,12 +58868,11 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.9" - (sources."core-js-compat-3.1.4" // { + (sources."core-js-compat-3.2.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."core-js-pure-3.1.4" sources."core-util-is-1.0.2" sources."create-ecdh-4.0.3" sources."create-hash-1.2.0" @@ -58531,7 +58880,7 @@ in sources."cross-env-5.2.0" sources."cross-spawn-6.0.5" sources."crypto-browserify-3.12.0" - sources."cyclist-0.2.2" + sources."cyclist-1.0.1" sources."date-now-0.1.4" sources."death-1.1.0" sources."debug-4.1.1" @@ -58600,8 +58949,8 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.215" - sources."elliptic-6.5.0" + sources."electron-to-chromium-1.3.260" + sources."elliptic-6.5.1" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" @@ -58610,9 +58959,9 @@ in sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."eslint-scope-3.7.1" - sources."eslint-visitor-keys-1.0.0" + sources."eslint-visitor-keys-1.1.0" sources."esrecurse-4.2.1" - sources."estraverse-4.2.0" + sources."estraverse-4.3.0" sources."estree-walker-0.6.1" sources."esutils-2.0.3" sources."events-3.0.0" @@ -58795,7 +59144,7 @@ in sources."p-cancelable-1.1.0" ]; }) - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."graceful-readlink-1.0.1" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" @@ -58821,7 +59170,7 @@ in sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."homedir-polyfill-1.0.3" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."http-cache-semantics-3.8.1" sources."https-browserify-1.0.0" sources."ieee754-1.1.13" @@ -58874,7 +59223,7 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -58905,8 +59254,6 @@ in }) sources."locate-path-2.0.0" sources."lodash-4.17.15" - sources."lodash.isplainobject-4.0.6" - sources."lodash.some-4.6.0" sources."log-symbols-2.2.0" sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" @@ -58930,10 +59277,10 @@ in ]; }) sources."memory-fs-0.4.1" - sources."merge2-1.2.4" + sources."merge2-1.3.0" sources."micromatch-2.3.11" sources."miller-rabin-4.0.1" - sources."mime-db-1.40.0" + sources."mime-db-1.41.0" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -58976,7 +59323,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.26" + sources."node-releases-1.1.32" sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" (sources."normalize-url-2.0.1" // { @@ -59037,7 +59384,7 @@ in sources."p-timeout-2.0.1" sources."p-try-1.0.0" sources."pako-1.0.10" - sources."parallel-transform-1.1.0" + sources."parallel-transform-1.2.0" sources."paredit.js-0.3.4" sources."parse-asn1-5.1.4" sources."parse-glob-3.0.4" @@ -59060,7 +59407,7 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" ]; @@ -59157,8 +59504,8 @@ in sources."regenerator-transform-0.14.1" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - sources."regexp-tree-0.1.11" - sources."regexpu-core-4.5.4" + sources."regexp-tree-0.1.13" + sources."regexpu-core-4.6.0" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { dependencies = [ @@ -59199,7 +59546,7 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."retry-0.12.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."rollup-0.67.0" sources."rollup-plugin-babel-4.0.3" @@ -59211,14 +59558,14 @@ in }) sources."rollup-plugin-node-resolve-3.4.0" sources."rollup-plugin-replace-2.1.0" - sources."rollup-pluginutils-2.8.1" + sources."rollup-pluginutils-2.8.2" sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."schema-utils-1.0.0" sources."seek-bzip-1.0.5" - sources."semver-5.7.0" - sources."serialize-javascript-1.7.0" + sources."semver-5.7.1" + sources."serialize-javascript-1.9.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -59313,7 +59660,7 @@ in sources."supports-color-2.0.0" sources."tapable-1.1.3" sources."tar-stream-1.6.2" - (sources."terser-4.1.3" // { + (sources."terser-4.3.1" // { dependencies = [ sources."commander-2.20.0" sources."source-map-0.6.1" @@ -59328,7 +59675,7 @@ in sources."through-2.3.8" sources."through2-2.0.5" sources."timed-out-4.0.1" - sources."timers-browserify-2.0.10" + sources."timers-browserify-2.0.11" sources."to-arraybuffer-1.0.1" sources."to-buffer-1.1.1" sources."to-fast-properties-2.0.0" @@ -59365,7 +59712,7 @@ in sources."isobject-3.0.1" ]; }) - sources."upath-1.1.2" + sources."upath-1.2.0" sources."uri-js-4.2.2" sources."urix-0.1.0" (sources."url-0.11.0" // { @@ -59388,7 +59735,7 @@ in sources."vm-browserify-1.1.0" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - (sources."webpack-4.39.1" // { + (sources."webpack-4.40.2" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -59430,7 +59777,7 @@ in sources."ms-2.0.0" ]; }) - (sources."webpack-cli-3.3.6" // { + (sources."webpack-cli-3.3.8" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -59470,7 +59817,7 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."require-main-filename-2.0.0" @@ -59484,6 +59831,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; madoko = nodeEnv.buildNodePackage { name = "madoko"; @@ -59506,6 +59854,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; markdown-link-check = nodeEnv.buildNodePackage { name = "markdown-link-check"; @@ -59567,7 +59916,7 @@ in sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."progress-2.0.3" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" @@ -59583,7 +59932,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uri-js-4.2.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; @@ -59594,23 +59943,34 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; - version = "2.7.5"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.5.tgz"; - sha512 = "OzsJNitEHAJB3y4IIlPCAvS0yoXwYjlo2Y4kmm9KQzyIBZt2d8yKRalby3uTRNN4fZQiGL2iMXjpdP1u2Rq2DQ=="; + url = "https://registry.npmjs.org/mathjax/-/mathjax-3.0.0.tgz"; + sha512 = "z4uLbDHNbs/aRuR6zCcnzwFQuMixkHCcWqgVaommfK/3cA1Ahq7OXemn+m8JwTYcBApSHgcrSbPr9sm3sZFL+A=="; }; + dependencies = [ + sources."commander-3.0.1" + sources."esm-3.2.25" + sources."mathjax-full-git://github.com/mathjax/MathJax-src.git" + sources."mj-context-menu-0.2.0" + sources."speech-rule-engine-3.0.0-beta.6" + sources."wicked-good-xpath-1.3.0" + sources."xmldom-sre-0.1.31" + ]; buildInputs = globalBuildInputs; meta = { - description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers."; + description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers. This package includes the packaged components (install mathjax-full to get the source code)."; homepage = "https://github.com/mathjax/MathJax#readme"; license = "Apache-2.0"; }; production = true; bypassCache = true; + reconstructLock = true; }; meat = nodeEnv.buildNodePackage { name = "meat"; @@ -59647,14 +60007,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; meguca = nodeEnv.buildNodePackage { name = "meguca"; packageName = "meguca"; - version = "1.1.4"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/meguca/-/meguca-1.1.4.tgz"; - sha512 = "ccvNbLwUeWRLWO9l0dZj1G0T+n10MRtORrvuq8/UYBgCKzdmvHW5FTU/3T2yO2P3AK+6Ghsey/+6KBiJpokeSg=="; + url = "https://registry.npmjs.org/meguca/-/meguca-1.1.6.tgz"; + sha512 = "kqg6t8mUUpb4WwD+4WqgS41AejdSkIEmPCB7v2D7ioxtLFiCaQUlu+K8rT6qOe3PmMacZ2sZsmdIs5jtYtxPig=="; }; dependencies = [ (sources."@gulp-sourcemaps/identity-map-1.0.2" // { @@ -59676,7 +60037,7 @@ in dependencies = [ sources."glob-7.1.4" sources."minimatch-3.0.4" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."uglify-js-2.8.29" ]; }) @@ -59775,7 +60136,6 @@ in sources."concat-map-0.0.1" sources."convert-source-map-1.6.0" sources."copy-descriptor-0.1.1" - sources."core-js-2.5.7" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" (sources."css-2.2.4" // { @@ -59806,7 +60166,6 @@ in sources."deprecated-0.0.1" sources."detect-file-1.0.0" sources."detect-newline-2.1.0" - sources."dom4-2.1.3" (sources."duplexer2-0.0.2" // { dependencies = [ sources."isarray-0.0.1" @@ -59824,9 +60183,9 @@ in sources."ecc-jsbn-0.1.2" sources."end-of-stream-0.1.5" sources."errno-0.1.7" - sources."es5-ext-0.10.50" + sources."es5-ext-0.10.51" sources."es6-iterator-2.0.3" - sources."es6-symbol-3.1.1" + sources."es6-symbol-3.1.2" sources."es6-weak-map-2.0.3" sources."escape-string-regexp-1.0.5" sources."event-emitter-0.3.5" @@ -59886,7 +60245,7 @@ in sources."fragment-cache-0.2.1" (sources."fs-mkdirp-stream-1.0.0" // { dependencies = [ - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" sources."through2-2.0.5" @@ -59917,7 +60276,7 @@ in ]; }) sources."glogg-1.0.2" - sources."graceful-fs-3.0.11" + sources."graceful-fs-3.0.12" sources."gulp-3.9.1" (sources."gulp-clean-css-3.10.0" // { dependencies = [ @@ -59941,7 +60300,7 @@ in }) (sources."gulp-sourcemaps-2.6.4" // { dependencies = [ - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."readable-stream-2.3.6" sources."source-map-0.6.1" sources."string_decoder-1.1.1" @@ -59958,7 +60317,7 @@ in sources."extend-shallow-1.1.4" sources."glob-7.1.4" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."kind-of-1.1.0" sources."minimatch-3.0.4" sources."ordered-read-streams-1.0.1" @@ -60060,7 +60419,7 @@ in sources."lead-1.0.0" (sources."less-2.7.3" // { dependencies = [ - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" ]; }) sources."liftoff-2.5.0" @@ -60328,7 +60687,7 @@ in sources."use-3.1.1" sources."user-home-1.1.1" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."v8flags-2.1.1" sources."value-or-function-3.0.0" (sources."verror-1.10.0" // { @@ -60346,7 +60705,7 @@ in dependencies = [ sources."clone-2.1.2" sources."clone-stats-1.0.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."vinyl-2.2.0" ]; }) @@ -60367,6 +60726,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; mocha = nodeEnv.buildNodePackage { name = "mocha"; @@ -60402,7 +60762,7 @@ in sources."diff-3.5.0" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.1" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -60446,6 +60806,7 @@ in sources."node-environment-flags-1.0.5" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" + sources."object-inspect-1.6.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.0.3" @@ -60454,7 +60815,7 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."path-exists-3.0.0" @@ -60463,13 +60824,15 @@ in sources."pump-3.0.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."semver-5.7.0" + sources."semver-5.7.1" 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."sprintf-js-1.0.3" sources."string-width-2.1.1" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -60512,6 +60875,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; multi-file-swagger = nodeEnv.buildNodePackage { name = "multi-file-swagger"; @@ -60533,7 +60897,7 @@ in sources."delayed-stream-1.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" - sources."form-data-2.5.0" + sources."form-data-2.5.1" sources."formidable-1.2.1" sources."graphlib-2.1.7" sources."inherits-2.0.4" @@ -60554,7 +60918,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.7.0" + sources."qs-6.8.0" sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" sources."slash-2.0.0" @@ -60571,6 +60935,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; neovim = nodeEnv.buildNodePackage { name = "neovim"; @@ -60593,7 +60958,7 @@ in sources."isstream-0.1.2" sources."lodash-4.17.15" sources."msgpack-lite-0.1.26" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."stack-trace-0.0.10" sources."traverse-0.6.6" sources."which-1.3.1" @@ -60607,6 +60972,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; nijs = nodeEnv.buildNodePackage { name = "nijs"; @@ -60628,6 +60994,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; @@ -60669,12 +61036,12 @@ in sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -60695,8 +61062,8 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.3.5" - sources."minizlib-1.2.1" + sources."minipass-2.6.2" + sources."minizlib-1.2.2" sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-4.1.2" @@ -60707,12 +61074,12 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.88.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.3.0" @@ -60732,7 +61099,7 @@ in sources."tweetnacl-0.14.5" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."verror-1.10.0" sources."which-1.3.1" sources."wide-align-1.1.3" @@ -60747,14 +61114,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.0.tgz"; - sha512 = "rGLv++nK20BG8gc0MzzcYe1Nl3p3mtwJ74Q2QD0HTEDKZ6NvOFSelY6s2QBPWIHRR8h7hpad0LiwajfClBJfNg=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz"; + sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -60764,6 +61132,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node-inspector = nodeEnv.buildNodePackage { name = "node-inspector"; @@ -60857,14 +61226,14 @@ in ]; }) sources."glob-5.0.15" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-unicode-2.0.1" sources."hawk-3.1.3" sources."headless-0.1.7" sources."hoek-2.16.3" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."http-errors-1.7.2" sources."http-signature-1.1.1" sources."iconv-lite-0.4.24" @@ -60896,7 +61265,6 @@ in sources."load-json-file-1.1.0" sources."lodash-2.4.2" sources."loud-rejection-1.6.0" - sources."lru-cache-5.1.1" sources."map-obj-1.0.1" sources."media-typer-0.3.0" sources."meow-3.7.0" @@ -60918,8 +61286,8 @@ in (sources."node-pre-gyp-0.6.39" // { dependencies = [ sources."glob-7.1.4" - sources."rimraf-2.6.3" - sources."semver-5.7.0" + sources."rimraf-2.7.1" + sources."semver-5.7.1" ]; }) sources."nopt-4.0.1" @@ -61007,7 +61375,7 @@ in (sources."tar-pack-3.4.1" // { dependencies = [ sources."glob-7.1.4" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" ]; }) sources."toidentifier-1.0.0" @@ -61024,7 +61392,7 @@ in sources."untildify-2.1.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."v8-debug-1.0.1" sources."v8-profiler-5.7.0" sources."validate-npm-package-license-3.0.4" @@ -61054,7 +61422,6 @@ in sources."xmldom-0.1.27" sources."xtend-4.0.2" sources."y18n-3.2.1" - sources."yallist-3.0.3" sources."yargs-3.32.0" ]; buildInputs = globalBuildInputs; @@ -61064,6 +61431,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; @@ -61089,13 +61457,13 @@ in sources."deep-extend-0.6.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."glob-7.1.4" sources."has-unicode-2.0.1" sources."iconv-lite-0.4.24" - sources."ignore-walk-3.0.1" + sources."ignore-walk-3.0.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -61103,8 +61471,8 @@ in sources."isarray-1.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.3.5" - sources."minizlib-1.2.1" + sources."minipass-2.6.2" + sources."minizlib-1.2.2" sources."mkdirp-0.5.1" sources."ms-2.1.2" sources."needle-2.4.0" @@ -61126,11 +61494,11 @@ in ]; }) sources."readable-stream-2.3.6" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -61151,20 +61519,21 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.20.7.tgz"; - sha512 = "klwQup/74kYGLBujQj4txrmpMYUdR88A68xjdycedD9dwMDwWCu8NL5t+O8XMWYxJ332hOIgLS62tm8ChxrkuQ=="; + url = "https://registry.npmjs.org/node-red/-/node-red-0.20.8.tgz"; + sha512 = "+i2SHPo8AQED0lyf7xoGcWAs142Nc5zvCTzmuncslgxVt/fl6XADEEY4yT/eDVNOwRrf9TZMjhSxBM9ScJJu7Q=="; }; dependencies = [ - sources."@babel/runtime-7.5.5" - sources."@node-red/editor-api-0.20.7" - sources."@node-red/editor-client-0.20.7" - (sources."@node-red/nodes-0.20.7" // { + sources."@babel/runtime-7.6.0" + sources."@node-red/editor-api-0.20.8" + sources."@node-red/editor-client-0.20.8" + (sources."@node-red/nodes-0.20.8" // { dependencies = [ sources."cookie-0.4.0" sources."http-errors-1.7.3" @@ -61178,9 +61547,9 @@ in }) ]; }) - sources."@node-red/registry-0.20.7" - sources."@node-red/runtime-0.20.7" - sources."@node-red/util-0.20.7" + sources."@node-red/registry-0.20.8" + sources."@node-red/runtime-0.20.8" + sources."@node-red/util-0.20.8" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."addressparser-1.0.1" @@ -61292,13 +61661,17 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."entities-1.1.2" - sources."es5-ext-0.10.50" + sources."es5-ext-0.10.51" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" - sources."es6-set-0.1.5" - sources."es6-symbol-3.1.1" + (sources."es6-set-0.1.5" // { + dependencies = [ + sources."es6-symbol-3.1.1" + ]; + }) + sources."es6-symbol-3.1.2" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" @@ -61329,7 +61702,7 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-extra-8.1.0" - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" @@ -61342,7 +61715,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -61361,7 +61734,7 @@ in }) sources."i18next-15.1.0" sources."iconv-lite-0.4.24" - sources."ignore-walk-3.0.1" + sources."ignore-walk-3.0.2" (sources."imap-0.8.19" // { dependencies = [ sources."isarray-0.0.1" @@ -61436,12 +61809,12 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.3.5" // { + (sources."minipass-2.6.2" // { dependencies = [ sources."yallist-3.0.3" ]; }) - sources."minizlib-1.2.1" + sources."minizlib-1.2.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -61471,12 +61844,12 @@ in sources."next-tick-1.0.0" (sources."node-pre-gyp-0.12.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) - sources."node-red-node-email-1.6.2" + sources."node-red-node-email-1.6.3" sources."node-red-node-feedparser-0.1.14" - sources."node-red-node-rbe-0.2.4" + sources."node-red-node-rbe-0.2.5" sources."node-red-node-sentiment-0.1.4" sources."node-red-node-tail-0.0.2" sources."node-red-node-twitter-1.1.5" @@ -61522,7 +61895,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.5" sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -61545,7 +61918,7 @@ in ]; }) sources."retry-0.6.1" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -61569,10 +61942,14 @@ in sources."stream-shift-1.0.0" sources."streamsearch-0.1.2" sources."string-width-1.0.2" - sources."string_decoder-1.2.0" + (sources."string_decoder-1.3.0" // { + dependencies = [ + sources."safe-buffer-5.2.0" + ]; + }) sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tail-2.0.2" + sources."tail-2.0.3" (sources."tar-4.4.10" // { dependencies = [ sources."yallist-3.0.3" @@ -61616,7 +61993,7 @@ in }) sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."vary-1.1.2" sources."verror-1.10.0" (sources."websocket-stream-5.5.0" // { @@ -61644,6 +62021,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; node2nix = nodeEnv.buildNodePackage { name = "node2nix"; @@ -61697,7 +62075,7 @@ in sources."rimraf-2.2.8" ]; }) - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" (sources."fs.extra-1.3.2" // { dependencies = [ sources."mkdirp-0.3.5" @@ -61707,11 +62085,11 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -61726,30 +62104,29 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."lru-cache-5.1.1" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.3.5" - sources."minizlib-1.2.1" + sources."minipass-2.6.2" + sources."minizlib-1.2.2" sources."mkdirp-0.5.1" sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" (sources."normalize-package-data-2.5.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) - (sources."npm-package-arg-6.1.0" // { + (sources."npm-package-arg-6.1.1" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) (sources."npm-registry-client-8.6.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) (sources."npmconf-2.1.3" // { @@ -61772,7 +62149,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."readable-stream-2.3.6" // { @@ -61817,7 +62194,7 @@ in sources."uid-number-0.0.5" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -61834,14 +62211,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.19.1"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.1.tgz"; - sha512 = "/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.2.tgz"; + sha512 = "hRLYaw5Ihyw9zK7NF+9EUzVyS6Cvgc14yh8CAYr38tPxJa6UrOxwAQ351GwrgoanHCF0FalQFn6w5eoX/LGdJw=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -61879,7 +62257,7 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."chalk-2.4.2" - sources."chokidar-2.1.6" + sources."chokidar-2.1.8" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -61968,7 +62346,7 @@ in }) sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -62002,7 +62380,7 @@ in sources."is-path-inside-1.0.1" sources."is-plain-object-2.0.4" sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" @@ -62066,7 +62444,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."semver-diff-2.1.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -62166,7 +62544,7 @@ in ]; }) sources."unzip-response-2.0.1" - sources."upath-1.1.2" + sources."upath-1.2.0" sources."update-notifier-2.5.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" @@ -62186,14 +62564,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.10.2"; + version = "6.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.10.2.tgz"; - sha512 = "B6n5dgmsl1fpBYhor2OTEn9Md0r63/FpQocDn4WNT4gIQRQZLql9g+mk8s3j9qZD370kUTzwDaOBSmDdNGK3NA=="; + url = "https://registry.npmjs.org/npm/-/npm-6.11.3.tgz"; + sha512 = "K2h+MPzZiY39Xf6eHEdECe/LKoJXam4UCflz5kIxoskN3LQFeYs5fqBGT5i4TtM/aBk+86Mcf+jgXs/WuWAutQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -62203,14 +62582,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "3.1.20"; + version = "3.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.20.tgz"; - sha512 = "mc9BAoOYSTwP/IvoA+ofdkWSipwRvhgC0qop1PvlMZojgzi7N/dykdxOIWrw0OlZPnEKvXkKFEuPk97LrvXE1A=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.23.tgz"; + sha512 = "Z2dkMdNgue6OPkQDPcAK62Qrwv+G1PaEmKrDrrSAiSP7pRD3u30xOVy1nLukS1XrJ2/zF8XTVxFe9/ubcvlcPQ=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -62229,7 +62609,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."builtins-1.0.3" - sources."cacache-12.0.2" + sources."cacache-12.0.3" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.1.0" @@ -62248,7 +62628,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.0.3" - sources."commander-2.20.0" + sources."commander-3.0.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."configstore-4.0.0" @@ -62261,7 +62641,7 @@ in ]; }) sources."crypto-random-string-1.0.0" - sources."cyclist-0.2.2" + sources."cyclist-1.0.1" (sources."debug-3.1.0" // { dependencies = [ sources."ms-2.0.0" @@ -62291,7 +62671,7 @@ in sources."find-up-4.1.0" sources."flush-write-stream-1.1.1" sources."from2-2.3.0" - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" sources."genfun-5.0.0" @@ -62300,18 +62680,18 @@ in sources."glob-7.1.4" sources."global-dirs-0.1.1" sources."got-9.6.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."http-cache-semantics-3.8.1" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.2" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."iferr-0.1.5" - sources."ignore-walk-3.0.1" + sources."ignore-walk-3.0.2" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."infer-owner-1.0.4" @@ -62360,8 +62740,8 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.3.5" - sources."minizlib-1.2.1" + sources."minipass-2.6.2" + sources."minizlib-1.2.2" sources."mississippi-3.0.0" sources."mkdirp-0.5.1" sources."move-concurrently-1.0.1" @@ -62377,23 +62757,23 @@ in sources."node-fetch-npm-2.0.2" (sources."normalize-package-data-2.5.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."normalize-url-4.3.0" sources."npm-bundled-1.0.6" - (sources."npm-package-arg-6.1.0" // { + (sources."npm-package-arg-6.1.1" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."npm-packlist-1.4.4" - (sources."npm-pick-manifest-2.2.3" // { + (sources."npm-pick-manifest-3.0.2" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) - sources."npm-registry-fetch-4.0.0" + sources."npm-registry-fetch-4.0.1" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" sources."object-keys-1.1.1" @@ -62403,16 +62783,16 @@ in sources."osenv-0.1.5" sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."package-json-6.5.0" - (sources."pacote-9.5.4" // { + (sources."pacote-9.5.8" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) - sources."parallel-transform-1.1.0" + sources."parallel-transform-1.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -62460,14 +62840,14 @@ in sources."resolve-1.12.0" sources."responselike-1.0.2" sources."retry-0.10.1" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."run-queue-1.0.3" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-6.3.0" (sources."semver-diff-2.1.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."semver-utils-1.1.4" @@ -62544,6 +62924,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0" = nodeEnv.buildNodePackage { name = "npm2nix"; @@ -62605,7 +62986,7 @@ in sources."fs.realpath-1.0.0" (sources."fstream-0.1.31" // { dependencies = [ - sources."graceful-fs-3.0.11" + sources."graceful-fs-3.0.12" sources."mkdirp-0.5.1" ]; }) @@ -62660,7 +63041,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."readable-stream-2.3.6" // { @@ -62670,7 +63051,7 @@ in }) sources."request-2.88.0" sources."retry-0.6.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-4.3.6" @@ -62707,7 +63088,7 @@ in sources."underscore.string-2.3.3" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."verror-1.10.0" sources."walk-2.3.14" sources."wide-align-1.1.3" @@ -62720,6 +63101,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; ocaml-language-server = nodeEnv.buildNodePackage { name = "ocaml-language-server"; @@ -62761,6 +63143,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; parcel-bundler = nodeEnv.buildNodePackage { name = "parcel-bundler"; @@ -62789,16 +63172,16 @@ in (sources."@babel/helper-call-delegate-7.4.4" // { dependencies = [ sources."@babel/code-frame-7.5.5" - sources."@babel/generator-7.5.5" - sources."@babel/parser-7.5.5" - sources."@babel/traverse-7.5.5" - sources."@babel/types-7.5.5" + sources."@babel/generator-7.6.0" + sources."@babel/parser-7.6.0" + sources."@babel/traverse-7.6.0" + sources."@babel/types-7.6.1" sources."source-map-0.5.7" ]; }) (sources."@babel/helper-define-map-7.5.5" // { dependencies = [ - sources."@babel/types-7.5.5" + sources."@babel/types-7.6.1" ]; }) sources."@babel/helper-explode-assignable-expression-7.1.0" @@ -62806,20 +63189,20 @@ in sources."@babel/helper-get-function-arity-7.0.0" (sources."@babel/helper-hoist-variables-7.4.4" // { dependencies = [ - sources."@babel/types-7.5.5" + sources."@babel/types-7.6.1" ]; }) (sources."@babel/helper-member-expression-to-functions-7.5.5" // { dependencies = [ - sources."@babel/types-7.5.5" + sources."@babel/types-7.6.1" ]; }) sources."@babel/helper-module-imports-7.0.0" (sources."@babel/helper-module-transforms-7.5.5" // { dependencies = [ - sources."@babel/parser-7.5.5" - sources."@babel/template-7.4.4" - sources."@babel/types-7.5.5" + sources."@babel/parser-7.6.0" + sources."@babel/template-7.6.0" + sources."@babel/types-7.6.1" ]; }) sources."@babel/helper-optimise-call-expression-7.0.0" @@ -62829,28 +63212,28 @@ in (sources."@babel/helper-replace-supers-7.5.5" // { dependencies = [ sources."@babel/code-frame-7.5.5" - sources."@babel/generator-7.5.5" - sources."@babel/parser-7.5.5" - sources."@babel/traverse-7.5.5" - sources."@babel/types-7.5.5" + sources."@babel/generator-7.6.0" + sources."@babel/parser-7.6.0" + sources."@babel/traverse-7.6.0" + sources."@babel/types-7.6.1" sources."source-map-0.5.7" ]; }) sources."@babel/helper-simple-access-7.1.0" (sources."@babel/helper-split-export-declaration-7.4.4" // { dependencies = [ - sources."@babel/types-7.5.5" + sources."@babel/types-7.6.1" ]; }) sources."@babel/helper-wrap-function-7.2.0" - (sources."@babel/helpers-7.5.5" // { + (sources."@babel/helpers-7.6.0" // { dependencies = [ sources."@babel/code-frame-7.5.5" - sources."@babel/generator-7.5.5" - sources."@babel/parser-7.5.5" - sources."@babel/template-7.4.4" - sources."@babel/traverse-7.5.5" - sources."@babel/types-7.5.5" + sources."@babel/generator-7.6.0" + sources."@babel/parser-7.6.0" + sources."@babel/template-7.6.0" + sources."@babel/traverse-7.6.0" + sources."@babel/types-7.6.1" sources."source-map-0.5.7" ]; }) @@ -62870,10 +63253,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.2.0" sources."@babel/plugin-transform-async-to-generator-7.5.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.5.5" + sources."@babel/plugin-transform-block-scoping-7.6.0" sources."@babel/plugin-transform-classes-7.5.5" sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.5.0" + sources."@babel/plugin-transform-destructuring-7.6.0" sources."@babel/plugin-transform-dotall-regex-7.4.4" sources."@babel/plugin-transform-duplicate-keys-7.5.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" @@ -62885,7 +63268,7 @@ in sources."@babel/plugin-transform-modules-commonjs-7.2.0" sources."@babel/plugin-transform-modules-systemjs-7.5.0" sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.6.0" sources."@babel/plugin-transform-new-target-7.4.4" sources."@babel/plugin-transform-object-super-7.5.5" sources."@babel/plugin-transform-parameters-7.4.4" @@ -62911,12 +63294,12 @@ in sources."@parcel/watcher-1.12.0" sources."@parcel/workers-1.11.0" sources."@types/q-1.5.2" - sources."abab-2.0.0" + sources."abab-2.0.1" sources."abbrev-1.1.1" sources."acorn-5.7.3" - (sources."acorn-globals-4.3.3" // { + (sources."acorn-globals-4.3.4" // { dependencies = [ - sources."acorn-6.2.1" + sources."acorn-6.3.0" ]; }) sources."acorn-walk-6.2.0" @@ -62991,7 +63374,7 @@ in sources."pako-1.0.10" ]; }) - sources."browserslist-4.6.6" + sources."browserslist-4.7.0" (sources."buffer-4.9.1" // { dependencies = [ sources."isarray-1.0.0" @@ -63010,7 +63393,7 @@ in sources."caniuse-lite-1.0.30000989" sources."caseless-0.12.0" sources."chalk-2.4.2" - sources."chokidar-2.1.6" + sources."chokidar-2.1.8" sources."cipher-base-1.0.4" sources."class-utils-0.3.6" sources."cli-cursor-2.1.0" @@ -63145,18 +63528,22 @@ in sources."ecc-jsbn-0.1.2" sources."editorconfig-0.15.3" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.215" - sources."elliptic-6.5.0" + sources."electron-to-chromium-1.3.260" + sources."elliptic-6.5.1" sources."encodeurl-1.0.2" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.13.0" + (sources."es-abstract-1.14.2" // { + dependencies = [ + sources."object-inspect-1.6.0" + ]; + }) sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."escodegen-1.9.1" sources."esprima-3.1.3" - sources."estraverse-4.2.0" + sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" sources."events-3.0.0" @@ -63203,7 +63590,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."globals-11.12.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."grapheme-breaker-0.3.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -63232,7 +63619,7 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.4" // { dependencies = [ - sources."terser-4.1.3" + sources."terser-4.3.1" ]; }) (sources."htmlparser2-3.10.1" // { @@ -63252,7 +63639,6 @@ in sources."inherits-2.0.4" sources."ini-1.3.5" sources."invariant-2.2.4" - sources."ip-regex-2.1.0" sources."is-absolute-url-2.1.0" (sources."is-accessor-descriptor-1.0.0" // { dependencies = [ @@ -63295,7 +63681,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."js-beautify-1.10.1" + sources."js-beautify-1.10.2" sources."js-levenshtein-1.1.6" sources."js-tokens-4.0.0" (sources."js-yaml-3.13.1" // { @@ -63304,11 +63690,11 @@ in ]; }) sources."jsbn-0.1.1" - (sources."jsdom-15.1.1" // { + (sources."jsdom-14.1.0" // { dependencies = [ - sources."acorn-6.2.1" - sources."escodegen-1.11.1" - sources."ws-7.1.1" + sources."acorn-6.3.0" + sources."escodegen-1.12.0" + sources."ws-6.2.1" ]; }) sources."jsesc-2.5.2" @@ -63338,7 +63724,7 @@ in sources."source-map-0.5.7" ]; }) - sources."merge2-1.2.4" + sources."merge2-1.3.0" (sources."micromatch-3.1.10" // { dependencies = [ sources."define-property-2.0.2" @@ -63384,7 +63770,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.26" + sources."node-releases-1.1.32" sources."nopt-4.0.1" sources."normalize-html-whitespace-1.0.0" sources."normalize-path-3.0.0" @@ -63427,7 +63813,7 @@ in sources."physical-cpu-count-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.17" // { + (sources."postcss-7.0.18" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -63493,7 +63879,7 @@ in sources."postcss-svgo-4.0.2" sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-3.3.1" - sources."posthtml-0.11.4" + sources."posthtml-0.11.6" sources."posthtml-parser-0.4.1" sources."posthtml-render-1.1.5" sources."prelude-ls-1.1.2" @@ -63502,7 +63888,7 @@ in sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."public-encrypt-4.0.3" sources."punycode-2.1.1" sources."q-1.5.1" @@ -63529,8 +63915,8 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexp-tree-0.1.11" - sources."regexpu-core-4.5.4" + sources."regexp-tree-0.1.13" + sources."regexpu-core-4.6.0" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { dependencies = [ @@ -63547,11 +63933,7 @@ in ]; }) sources."request-promise-core-1.1.2" - (sources."request-promise-native-1.0.7" // { - dependencies = [ - sources."tough-cookie-2.5.0" - ]; - }) + sources."request-promise-native-1.0.7" sources."resolve-1.12.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" @@ -63559,7 +63941,7 @@ in sources."ret-0.1.15" sources."rgb-regex-1.0.1" sources."rgba-regex-1.0.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" @@ -63567,7 +63949,7 @@ in sources."safer-eval-1.3.5" sources."sax-1.2.4" sources."saxes-3.1.11" - sources."semver-5.7.0" + sources."semver-5.7.1" (sources."send-0.17.1" // { dependencies = [ (sources."debug-2.6.9" // { @@ -63627,6 +64009,8 @@ in sources."stealthy-require-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" (sources."stylehacks-4.0.3" // { @@ -63639,7 +64023,7 @@ in sources."symbol-tree-3.2.4" sources."terser-3.17.0" sources."through2-2.0.5" - sources."timers-browserify-2.0.10" + sources."timers-browserify-2.0.11" sources."timsort-0.3.0" sources."tiny-inflate-1.0.2" sources."to-arraybuffer-1.0.1" @@ -63654,7 +64038,7 @@ in }) sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" - sources."tough-cookie-3.0.1" + sources."tough-cookie-2.5.0" sources."tr46-1.0.1" sources."trim-right-1.0.1" sources."tty-browserify-0.0.0" @@ -63662,10 +64046,10 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" - (sources."uncss-0.17.0" // { + (sources."uncss-0.17.2" // { dependencies = [ sources."cssesc-3.0.0" - sources."is-absolute-url-3.0.0" + sources."is-absolute-url-3.0.2" sources."postcss-selector-parser-6.0.2" ]; }) @@ -63689,7 +64073,7 @@ in sources."isarray-1.0.0" ]; }) - sources."upath-1.1.2" + sources."upath-1.2.0" sources."uri-js-4.2.2" sources."urix-0.1.0" (sources."url-0.11.0" // { @@ -63705,7 +64089,7 @@ in }) sources."util-deprecate-1.0.2" sources."util.promisify-1.0.0" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."v8-compile-cache-2.1.0" sources."vendors-1.0.3" sources."verror-1.10.0" @@ -63723,7 +64107,7 @@ in sources."wrappy-1.0.2" sources."ws-5.2.2" sources."xml-name-validator-3.0.0" - sources."xmlchars-2.1.1" + sources."xmlchars-2.2.0" sources."xtend-4.0.2" sources."yallist-2.1.2" ]; @@ -63735,6 +64119,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; peerflix = nodeEnv.buildNodePackage { name = "peerflix"; @@ -63791,6 +64176,9 @@ in sources."camelcase-keys-2.1.0" sources."chalk-1.1.3" sources."chardet-0.4.2" + sources."chrome-dgram-3.0.3" + sources."chrome-dns-1.0.1" + sources."chrome-net-3.3.3" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" sources."clivas-0.2.0" @@ -63808,8 +64196,9 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" - sources."deep-equal-1.0.1" + sources."deep-equal-1.1.0" sources."deep-extend-0.6.0" + sources."define-properties-1.1.3" sources."dns-equal-1.0.0" sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" @@ -63828,14 +64217,16 @@ in ]; }) sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."get-browser-rtc-1.0.2" sources."get-stdin-4.0.1" sources."glob-7.1.4" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."hat-0.0.3" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."http-headers-3.0.2" sources."iconv-lite-0.4.24" sources."immediate-chunk-store-1.0.8" @@ -63859,10 +64250,13 @@ in sources."ip-1.1.5" sources."ip-set-1.0.2" sources."ipaddr.js-1.9.1" + sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" + sources."is-date-object-1.0.1" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" sources."is-promise-2.1.0" + sources."is-regex-1.0.4" sources."is-utf8-0.2.1" sources."isarray-1.0.0" sources."k-bucket-0.6.0" @@ -63871,13 +64265,12 @@ in sources."k-bucket-2.0.1" ]; }) - sources."k-rpc-socket-1.8.0" + sources."k-rpc-socket-1.11.1" sources."keypress-0.2.1" sources."load-json-file-1.1.0" sources."lodash-3.10.1" sources."loud-rejection-1.6.0" sources."lru-2.0.1" - sources."lru-cache-5.1.1" sources."magnet-uri-5.2.4" sources."map-obj-1.0.1" sources."meow-3.7.0" @@ -63897,6 +64290,8 @@ in sources."number-is-nan-1.0.1" sources."numeral-2.0.6" sources."object-assign-4.1.1" + sources."object-is-1.0.1" + sources."object-keys-1.1.1" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-0.0.5" @@ -63953,11 +64348,12 @@ in sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" sources."redent-1.0.0" + sources."regexp.prototype.flags-1.2.0" sources."repeating-2.0.1" sources."resolve-1.12.0" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."run-async-2.3.0" sources."run-parallel-1.1.9" sources."run-series-1.1.8" @@ -63965,7 +64361,7 @@ in sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."server-destroy-1.0.1" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" @@ -64027,7 +64423,6 @@ in sources."xmlbuilder-4.0.0" sources."xmldom-0.1.27" sources."xtend-4.0.2" - sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -64037,17 +64432,18 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.4.2.tgz"; - sha512 = "UuY4QsKFEPpB52Ee0y0jOOrTN1Mm2Lee/EJN3RdOxJxEupBujBypqZAfxQrjtsKle8QkZHG3z4j/DnwkroYnUQ=="; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.5.0.tgz"; + sha512 = "TmtYwbayKLfzTj4rMIQ5nfGcXqkp8VwsCXkfZz95JdJcfk0+HYhflLDwviq+qOUxgKMYpoggqb129c3KST7zmQ=="; }; dependencies = [ - sources."accepts-1.2.13" + sources."accepts-1.3.7" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" sources."ajv-6.10.2" @@ -64057,10 +64453,12 @@ in sources."readable-stream-2.3.6" ]; }) - sources."arraybuffer.slice-0.0.6" + sources."array-flatten-1.1.1" + sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" + sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" @@ -64068,11 +64466,8 @@ in sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" sources."base64-js-1.3.1" - sources."base64-url-1.2.1" sources."base64id-1.0.0" - sources."basic-auth-1.0.4" - sources."basic-auth-connect-1.0.0" - sources."batch-0.5.3" + sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" sources."bencode-0.7.0" sources."better-assert-1.0.2" @@ -64082,21 +64477,17 @@ in dependencies = [ sources."bencode-0.8.0" sources."minimist-1.2.0" + sources."ultron-1.0.2" + sources."ws-1.1.5" ]; }) sources."bl-3.0.0" - sources."blob-0.0.4" + sources."blob-0.0.5" sources."bn.js-4.11.8" sources."bncode-0.5.3" - (sources."body-parser-1.13.3" // { - dependencies = [ - sources."depd-1.0.1" - sources."http-errors-1.3.1" - sources."qs-4.0.0" - ]; - }) + sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" - sources."buffer-5.2.1" + sources."buffer-5.4.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -64104,11 +64495,13 @@ in sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" - sources."bytes-2.1.0" + sources."bytes-3.1.0" sources."callsite-1.0.0" sources."caseless-0.12.0" + sources."chrome-dgram-3.0.3" + sources."chrome-dns-1.0.1" + sources."chrome-net-3.3.3" sources."combined-stream-1.0.8" - sources."commander-2.6.0" sources."compact2string-1.4.1" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" @@ -64118,124 +64511,81 @@ in sources."readable-stream-2.3.6" ]; }) - sources."compressible-2.0.17" - sources."compression-1.5.2" sources."concat-map-0.0.1" - (sources."connect-2.30.2" // { - dependencies = [ - sources."depd-1.0.1" - sources."http-errors-1.3.1" - sources."isarray-0.0.1" - sources."multiparty-3.3.2" - sources."qs-4.0.0" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."connect-multiparty-2.2.0" - (sources."connect-timeout-1.6.2" // { + (sources."connect-multiparty-2.2.0" // { dependencies = [ - sources."http-errors-1.3.1" + sources."qs-6.5.2" ]; }) - sources."content-disposition-0.5.0" + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.1.3" - sources."cookie-parser-1.3.5" + sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."crc-3.8.0" sources."crc32-stream-3.0.1" - (sources."csrf-3.0.6" // { - dependencies = [ - sources."uid-safe-2.1.4" - ]; - }) - (sources."csurf-1.8.3" // { - dependencies = [ - sources."http-errors-1.3.1" - ]; - }) sources."cyclist-0.1.1" sources."dashdash-1.14.1" - sources."debug-2.2.0" + sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" - (sources."engine.io-1.8.5" // { + (sources."engine.io-3.3.2" // { dependencies = [ - sources."accepts-1.3.3" sources."cookie-0.3.1" - sources."debug-2.3.3" - sources."ms-0.7.2" - sources."negotiator-0.6.1" - ]; - }) - (sources."engine.io-client-1.8.5" // { - dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" - ]; - }) - sources."engine.io-parser-1.3.2" - (sources."errorhandler-1.4.3" // { - dependencies = [ - sources."accepts-1.3.7" - sources."escape-html-1.0.3" - sources."negotiator-0.6.2" - ]; - }) - sources."escape-html-1.0.2" - sources."etag-1.7.0" - (sources."express-3.21.2" // { - dependencies = [ - sources."depd-1.0.1" - sources."range-parser-1.0.3" + sources."debug-3.1.0" ]; }) - (sources."express-session-1.11.3" // { + (sources."engine.io-client-3.3.2" // { dependencies = [ - sources."crc-3.3.0" - sources."depd-1.0.1" - sources."uid-safe-2.0.0" + sources."debug-3.1.0" ]; }) + sources."engine.io-parser-2.1.3" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."express-4.17.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fd-slicer-1.1.0" sources."fifo-0.1.4" - sources."finalhandler-0.4.0" + sources."finalhandler-1.1.2" sources."flatten-0.0.1" sources."fluent-ffmpeg-2.1.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" - sources."fresh-0.3.0" + sources."fresh-0.5.2" sources."fs-chunk-store-1.7.0" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.0.2" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - (sources."has-binary-0.1.7" // { + (sources."has-binary2-1.0.3" // { dependencies = [ - sources."isarray-0.0.1" + sources."isarray-2.0.1" ]; }) sources."has-cors-1.1.0" sources."hat-0.0.3" - sources."http-errors-1.7.3" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) sources."http-signature-1.2.0" - sources."iconv-lite-0.4.11" + sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" sources."immediate-chunk-store-1.0.8" sources."indexof-0.0.1" @@ -64243,7 +64593,7 @@ in sources."inherits-2.0.4" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-1.0.5" + sources."ipaddr.js-1.9.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -64252,7 +64602,6 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."json3-3.3.2" sources."jsprim-1.4.1" sources."k-bucket-0.6.0" (sources."k-rpc-3.7.0" // { @@ -64260,7 +64609,7 @@ in sources."k-bucket-2.0.1" ]; }) - (sources."k-rpc-socket-1.8.0" // { + (sources."k-rpc-socket-1.11.1" // { dependencies = [ sources."bencode-2.0.1" ]; @@ -64279,33 +64628,21 @@ in sources."lru-2.0.1" sources."magnet-uri-2.0.1" sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.0" - (sources."method-override-2.3.10" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."vary-1.1.2" - ]; - }) + sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-1.3.4" + sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - (sources."morgan-1.6.1" // { - dependencies = [ - sources."depd-1.0.1" - ]; - }) - sources."ms-0.7.1" + sources."morgan-1.9.1" + sources."ms-2.0.0" sources."multiparty-4.2.1" - sources."negotiator-0.5.3" + sources."negotiator-0.6.2" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" - sources."object-assign-4.1.0" sources."object-component-0.0.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -64317,12 +64654,11 @@ in ]; }) sources."parse-torrent-file-2.1.4" - sources."parsejson-0.0.3" sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" - sources."pause-0.1.0" + sources."path-to-regexp-0.1.7" (sources."peer-wire-protocol-0.7.1" // { dependencies = [ sources."bncode-0.2.3" @@ -64335,64 +64671,38 @@ in sources."pend-1.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" - sources."proxy-addr-1.0.10" - sources."psl-1.3.0" - sources."pump-1.0.3" + sources."proxy-addr-2.0.5" + sources."psl-1.4.0" + sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.5.2" + sources."qs-6.7.0" sources."random-access-file-2.1.3" sources."random-access-storage-1.4.0" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - (sources."raw-body-2.1.7" // { - dependencies = [ - sources."bytes-2.4.0" - sources."iconv-lite-0.4.13" - ]; - }) + sources."raw-body-2.4.0" sources."re-emitter-1.1.4" sources."read-torrent-1.3.1" sources."readable-stream-3.4.0" - sources."request-2.88.0" - sources."response-time-2.3.2" - sources."rimraf-2.6.3" - sources."rndm-1.2.0" + (sources."request-2.88.0" // { + dependencies = [ + sources."qs-6.5.2" + ]; + }) + sources."rimraf-2.7.1" sources."run-parallel-1.1.9" sources."run-series-1.1.8" sources."rusha-0.8.13" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."send-0.13.0" // { - dependencies = [ - sources."depd-1.0.1" - sources."destroy-1.0.3" - sources."http-errors-1.3.1" - sources."range-parser-1.0.3" - sources."statuses-1.2.1" - ]; - }) - (sources."serve-favicon-2.3.2" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."serve-index-1.7.3" // { - dependencies = [ - sources."escape-html-1.0.3" - sources."http-errors-1.3.1" - ]; - }) - (sources."serve-static-1.10.3" // { + (sources."send-0.17.1" // { dependencies = [ - sources."escape-html-1.0.3" - sources."http-errors-1.3.1" - sources."range-parser-1.0.3" - sources."send-0.13.2" - sources."statuses-1.2.1" + sources."ms-2.1.1" ]; }) + sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" @@ -64406,44 +64716,30 @@ in dependencies = [ sources."readable-stream-2.3.6" sources."safe-buffer-5.0.1" - sources."ultron-1.1.1" sources."ws-2.3.1" ]; }) - (sources."socket.io-1.7.4" // { - dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" - ]; - }) - (sources."socket.io-adapter-0.5.0" // { + (sources."socket.io-2.2.0" // { dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" + sources."debug-4.1.1" + sources."ms-2.1.2" ]; }) - (sources."socket.io-client-1.7.4" // { + sources."socket.io-adapter-1.1.1" + (sources."socket.io-client-2.2.0" // { dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" + sources."debug-3.1.0" ]; }) - (sources."socket.io-parser-2.3.1" // { + (sources."socket.io-parser-3.3.0" // { dependencies = [ - sources."component-emitter-1.1.2" - sources."isarray-0.0.1" + sources."debug-3.1.0" + sources."isarray-2.0.1" ]; }) sources."speedometer-0.1.4" sources."sshpk-1.16.1" sources."statuses-1.5.0" - (sources."stream-counter-0.2.0" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) sources."string2compact-1.3.0" sources."string_decoder-1.1.1" sources."tar-stream-2.1.0" @@ -64465,27 +64761,24 @@ in sources."punycode-1.4.1" ]; }) - sources."tsscmp-1.0.5" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."uid-safe-2.1.5" - sources."ultron-1.0.2" + sources."ultron-1.1.1" sources."uniq-1.0.1" sources."unpipe-1.0.0" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.0" + sources."utils-merge-1.0.1" sources."utp-0.0.7" - sources."uuid-3.3.2" - sources."vary-1.0.1" + sources."uuid-3.3.3" + sources."vary-1.1.2" sources."verror-1.10.0" - sources."vhost-3.0.2" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-1.1.5" - sources."wtf-8-1.0.0" - sources."xmlhttprequest-ssl-1.5.3" + sources."ws-6.1.4" + sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."yeast-0.1.2" sources."zip-stream-2.1.2" @@ -64498,14 +64791,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "3.6.3"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-3.6.3.tgz"; - sha512 = "Hxk8VouMZRh870u0hJHCcumylGO8VV6Id+Fm7S+MyZVGGgtaZlEFFV2HIndVd9nXTksS+RuhINX6jGIVmqTmDg=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.8.1.tgz"; + sha512 = "uINy/U+TNvUHInG1l0/NrgDosUtafn9BrHjP5+v+ojpw+zb/lgXjkQmMHB4461LKezlNoBb7+0JOrNnm5JhZFg=="; }; buildInputs = globalBuildInputs; meta = { @@ -64515,6 +64809,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; prettier = nodeEnv.buildNodePackage { name = "prettier"; @@ -64532,6 +64827,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; pulp = nodeEnv.buildNodePackage { name = "pulp"; @@ -64543,13 +64839,9 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-6.2.1" - sources."acorn-dynamic-import-4.0.0" - sources."acorn-node-1.7.0" - sources."acorn-walk-6.2.0" - sources."array-filter-0.0.1" - sources."array-map-0.0.0" - sources."array-reduce-0.0.0" + sources."acorn-7.0.0" + sources."acorn-node-1.8.2" + sources."acorn-walk-7.0.0" sources."asn1.js-4.10.1" (sources."assert-1.5.0" // { dependencies = [ @@ -64569,7 +64861,7 @@ in sources."resolve-1.1.7" ]; }) - (sources."browserify-16.3.0" // { + (sources."browserify-16.5.0" // { dependencies = [ sources."concat-stream-1.6.2" ]; @@ -64587,7 +64879,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-5.2.1" + sources."buffer-5.4.3" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" @@ -64623,7 +64915,7 @@ in sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - sources."elliptic-6.5.0" + sources."elliptic-6.5.1" sources."es6-promise-3.3.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" @@ -64633,7 +64925,7 @@ in sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.4" sources."globule-1.2.1" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-1.0.3" sources."hash-base-3.0.4" sources."hash.js-1.1.7" @@ -64711,13 +65003,13 @@ in ]; }) sources."resolve-1.12.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.0" sources."sander-0.5.1" sources."sha.js-2.4.11" sources."shasum-1.0.2" - sources."shell-quote-1.6.1" + sources."shell-quote-1.7.2" sources."simple-concat-1.0.0" (sources."sorcery-0.10.0" // { dependencies = [ @@ -64728,24 +65020,27 @@ in sources."sourcemap-codec-1.4.6" sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.3" - sources."stream-splicer-2.0.1" - (sources."string_decoder-1.2.0" // { + (sources."stream-http-3.1.0" // { dependencies = [ - sources."safe-buffer-5.1.2" + sources."readable-stream-3.4.0" ]; }) + sources."stream-splicer-2.0.1" + sources."string_decoder-1.3.0" (sources."subarg-1.0.0" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."syntax-error-1.4.0" - sources."temp-0.9.0" + (sources."temp-0.9.0" // { + dependencies = [ + sources."rimraf-2.6.3" + ]; + }) sources."through-2.3.8" sources."through2-2.0.5" sources."timers-browserify-1.4.2" - sources."to-arraybuffer-1.0.1" sources."tree-kill-1.2.1" sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" @@ -64776,6 +65071,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; react-native-cli = nodeEnv.buildNodePackage { name = "react-native-cli"; @@ -64795,15 +65091,21 @@ in sources."colors-0.6.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" - sources."deep-equal-1.0.1" + sources."deep-equal-1.1.0" + sources."define-properties-1.1.3" sources."escape-string-regexp-1.0.5" sources."eyes-0.1.8" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."glob-7.1.4" + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."is-arguments-1.0.4" + sources."is-date-object-1.0.1" + sources."is-regex-1.0.4" sources."isstream-0.1.2" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -64814,14 +65116,17 @@ in }) sources."mute-stream-0.0.8" sources."ncp-0.4.2" + sources."object-is-1.0.1" + sources."object-keys-1.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."pkginfo-0.4.1" sources."prompt-0.2.14" sources."read-1.0.7" + sources."regexp.prototype.flags-1.2.0" sources."revalidator-0.1.8" - sources."rimraf-2.6.3" - sources."semver-5.7.0" + sources."rimraf-2.7.1" + sources."semver-5.7.1" sources."stack-trace-0.0.10" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" @@ -64841,6 +65146,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; react-tools = nodeEnv.buildNodePackage { name = "react-tools"; @@ -64865,7 +65171,7 @@ in sources."esprima-3.1.3" sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."glob-5.0.15" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -64894,6 +65200,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; @@ -64911,6 +65218,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; s3http = nodeEnv.buildNodePackage { name = "s3http"; @@ -65011,7 +65319,7 @@ in }) sources."pause-0.0.1" sources."performance-now-2.1.0" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-0.6.5" sources."range-parser-0.0.4" @@ -65036,7 +65344,7 @@ in sources."uid2-0.0.3" sources."uri-js-4.2.2" sources."util-0.4.9" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."verror-1.10.0" sources."xml2js-0.2.4" sources."xmlbuilder-0.4.2" @@ -65046,6 +65354,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; semver = nodeEnv.buildNodePackage { name = "semver"; @@ -65063,6 +65372,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; serve = nodeEnv.buildNodePackage { name = "serve"; @@ -65168,6 +65478,748 @@ in }; production = true; bypassCache = true; + reconstructLock = true; + }; + serverless = nodeEnv.buildNodePackage { + name = "serverless"; + packageName = "serverless"; + version = "1.52.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serverless/-/serverless-1.52.0.tgz"; + sha512 = "No+hosiPng/0MKfFMNj6lfLmNmn5vzLduss55YkefQNKZ9oJEBeZqBDrUEZC9reTHUpilCx0ESiLqkMoPBst2g=="; + }; + dependencies = [ + sources."@serverless/cli-1.2.1" + (sources."@serverless/component-metrics-1.0.8" // { + dependencies = [ + sources."node-fetch-2.6.0" + ]; + }) + (sources."@serverless/core-1.0.0" // { + dependencies = [ + sources."fs-extra-7.0.1" + sources."semver-6.3.0" + ]; + }) + (sources."@serverless/enterprise-plugin-2.0.0" // { + dependencies = [ + sources."fs-extra-7.0.1" + sources."node-fetch-2.6.0" + sources."uuid-3.3.3" + ]; + }) + sources."@serverless/event-mocks-1.1.1" + (sources."@serverless/platform-sdk-2.1.1" // { + dependencies = [ + sources."ramda-0.25.0" + sources."uuid-3.3.3" + ]; + }) + sources."@serverless/template-1.1.0" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/lodash-4.14.138" + sources."accepts-1.3.7" + sources."agent-base-4.3.0" + sources."ansi-0.3.1" + sources."ansi-align-2.0.0" + sources."ansi-escapes-4.2.1" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.0" + (sources."archiver-1.3.0" // { + dependencies = [ + sources."async-2.6.3" + ]; + }) + (sources."archiver-utils-1.3.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."are-we-there-yet-1.1.5" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-union-3.1.0" + sources."array-flatten-1.1.1" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."async-1.5.2" + sources."asynckit-0.4.0" + sources."atob-2.1.2" + (sources."aws-sdk-2.529.0" // { + dependencies = [ + sources."buffer-4.9.1" + sources."ieee754-1.1.8" + sources."uuid-3.3.2" + ]; + }) + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base64-js-1.3.1" + sources."binary-extensions-2.0.0" + sources."bl-1.2.2" + sources."bluebird-3.5.5" + sources."body-parser-1.19.0" + sources."boxen-1.3.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."buffer-5.4.3" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-crc32-0.2.13" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.1" + sources."builtin-modules-3.1.0" + sources."bytes-3.1.0" + sources."cache-base-1.0.1" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."cachedir-2.2.0" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.1" + sources."caw-2.0.1" + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."chokidar-3.1.0" + sources."ci-info-1.6.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."cli-boxes-1.0.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."clone-response-1.0.2" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colors-1.3.3" + sources."combined-stream-1.0.8" + sources."commander-2.19.0" + sources."component-emitter-1.3.0" + (sources."compress-commons-1.2.2" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."config-chain-1.1.12" + sources."configstore-3.1.2" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."cookiejar-2.1.2" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."crc-3.8.0" + sources."crc32-stream-2.0.0" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypto-random-string-1.0.0" + sources."d-1.0.1" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."decompress-4.2.0" + sources."decompress-response-3.3.0" + sources."decompress-tar-4.1.1" + (sources."decompress-tarbz2-4.1.1" // { + dependencies = [ + sources."file-type-6.2.0" + ]; + }) + sources."decompress-targz-4.1.1" + (sources."decompress-unzip-4.0.1" // { + dependencies = [ + sources."file-type-3.9.0" + sources."get-stream-2.3.1" + ]; + }) + sources."deep-extend-0.6.0" + sources."defer-to-connect-1.0.2" + sources."deferred-0.7.11" + sources."define-property-2.0.2" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dot-prop-4.2.0" + sources."dotenv-8.1.0" + (sources."download-5.0.3" // { + dependencies = [ + sources."get-stream-3.0.0" + sources."got-6.7.1" + sources."prepend-http-1.0.4" + sources."url-parse-lax-1.0.0" + ]; + }) + sources."duplexer3-0.1.4" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."encoding-0.1.12" + sources."end-of-stream-1.4.1" + sources."es5-ext-0.10.51" + sources."es6-iterator-2.0.3" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + (sources."es6-set-0.1.5" // { + dependencies = [ + sources."es6-symbol-3.1.1" + ]; + }) + sources."es6-symbol-3.1.2" + sources."es6-weak-map-2.0.3" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."esniff-1.1.0" + sources."esprima-4.0.1" + sources."etag-1.8.1" + sources."event-emitter-0.3.5" + sources."events-1.1.1" + (sources."execa-0.7.0" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) + sources."exit-hook-1.1.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."extend-3.0.2" + sources."extend-shallow-3.0.2" + sources."external-editor-3.1.0" + sources."fast-levenshtein-2.0.6" + sources."fd-slicer-1.1.0" + sources."figures-3.0.0" + sources."file-type-5.2.0" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-2.1.0" + sources."filesize-3.6.1" + sources."fill-range-7.0.1" + sources."finalhandler-1.1.2" + sources."find-requires-1.0.0" + sources."flat-4.1.0" + sources."for-in-1.0.2" + sources."form-data-2.5.1" + sources."formidable-1.2.1" + sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."fs-constants-1.0.0" + (sources."fs-extra-0.30.0" // { + dependencies = [ + sources."jsonfile-2.4.0" + ]; + }) + sources."fs.realpath-1.0.0" + sources."fs2-0.3.5" + sources."fsevents-2.0.7" + sources."gauge-1.2.7" + sources."get-proxy-2.1.0" + sources."get-stdin-5.0.1" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."glob-7.1.4" + sources."glob-parent-5.0.0" + sources."global-dirs-0.1.1" + sources."globby-6.1.0" + sources."got-9.6.0" + sources."graceful-fs-4.2.2" + sources."graceful-readlink-1.0.1" + sources."graphlib-2.1.7" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" + sources."has-unicode-2.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."is-buffer-1.1.6" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + sources."http-cache-semantics-4.0.3" + sources."http-errors-1.7.2" + (sources."https-proxy-agent-2.2.2" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" + sources."ignore-5.1.4" + sources."immediate-3.0.6" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + (sources."inquirer-6.5.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + sources."figures-2.0.0" + ]; + }) + sources."ipaddr.js-1.9.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-binary-path-2.1.0" + sources."is-buffer-2.0.3" + sources."is-ci-1.2.1" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-docker-1.1.0" + sources."is-extendable-1.0.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" + sources."is-installed-globally-0.1.0" + sources."is-natural-number-4.0.1" + sources."is-npm-1.0.0" + sources."is-number-7.0.0" + sources."is-obj-1.0.1" + sources."is-object-1.0.1" + sources."is-path-inside-1.0.1" + sources."is-plain-object-2.0.4" + sources."is-promise-2.1.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.2.0" + sources."is-stream-1.1.0" + sources."is-windows-1.0.2" + sources."is-wsl-2.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."iso8601-duration-1.2.0" + sources."isobject-3.0.1" + sources."isomorphic-fetch-2.2.1" + sources."isurl-1.0.0" + sources."jmespath-0.15.0" + sources."js-yaml-3.13.1" + sources."json-buffer-3.0.0" + sources."json-cycle-1.3.0" + sources."json-refs-2.1.7" + sources."json-stringify-safe-5.0.1" + sources."jsonata-1.6.5" + sources."jsonfile-4.0.0" + sources."jszip-3.2.2" + sources."jwt-decode-2.2.0" + sources."keyv-3.1.0" + sources."kind-of-6.0.2" + sources."klaw-1.3.1" + (sources."latest-version-3.1.0" // { + dependencies = [ + sources."get-stream-3.0.0" + sources."got-6.7.1" + sources."package-json-4.0.1" + sources."prepend-http-1.0.4" + sources."registry-auth-token-3.4.0" + sources."registry-url-3.1.0" + sources."url-parse-lax-1.0.0" + ]; + }) + sources."lazystream-1.0.0" + sources."lie-3.3.0" + sources."lodash-4.17.15" + sources."lodash.difference-4.5.0" + sources."lodash.pad-4.5.1" + sources."lodash.padend-4.6.1" + sources."lodash.padstart-4.6.1" + sources."lodash.uniq-4.5.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.5" + sources."lru-queue-0.1.0" + sources."lsmod-1.0.0" + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."media-typer-0.3.0" + sources."memoizee-0.4.14" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."mimic-fn-1.2.0" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mixin-deep-1.3.2" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."moment-2.24.0" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."nanoid-2.1.1" + sources."nanomatch-1.2.13" + sources."native-promise-only-0.8.1" + sources."ncjsm-3.0.0" + sources."negotiator-0.6.2" + sources."next-tick-1.0.0" + sources."node-dir-0.1.17" + sources."node-fetch-1.7.3" + sources."normalize-path-3.0.0" + sources."normalize-url-4.3.0" + (sources."npm-conf-1.1.3" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."npm-run-path-2.0.2" + sources."npmlog-2.0.4" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-hash-1.3.1" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."onetime-2.0.1" + (sources."opn-5.5.0" // { + dependencies = [ + sources."is-wsl-1.1.0" + ]; + }) + sources."os-shim-0.1.3" + sources."os-tmpdir-1.0.2" + sources."p-cancelable-1.1.0" + sources."p-finally-1.0.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."pako-1.0.10" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-loader-1.0.10" + sources."path-to-regexp-0.1.7" + sources."pend-1.2.0" + sources."picomatch-2.0.7" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prepend-http-2.0.0" + sources."prettyoutput-1.2.0" + sources."process-nextick-args-2.0.1" + sources."promise-queue-2.2.5" + sources."proto-list-1.2.4" + sources."proxy-addr-2.0.5" + sources."pseudomap-1.0.2" + sources."pump-3.0.0" + sources."punycode-1.3.2" + sources."qs-6.7.0" + sources."querystring-0.2.0" + sources."ramda-0.26.1" + sources."range-parser-1.2.1" + (sources."raven-1.2.1" // { + dependencies = [ + sources."cookie-0.3.1" + sources."uuid-3.0.0" + ]; + }) + sources."raw-body-2.4.0" + sources."rc-1.2.8" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."readdirp-3.1.2" + sources."regenerator-runtime-0.13.3" + sources."regex-not-1.0.2" + sources."registry-auth-token-4.0.0" + sources."registry-url-5.1.0" + sources."remove-trailing-separator-1.1.0" + sources."replaceall-0.1.6" + sources."resolve-url-0.2.1" + sources."responselike-1.0.2" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."rimraf-2.7.1" + sources."run-async-2.3.0" + sources."rx-4.1.0" + sources."rxjs-6.5.3" + sources."safe-buffer-5.2.0" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sax-1.2.1" + (sources."seek-bzip-1.0.5" // { + dependencies = [ + sources."commander-2.8.1" + ]; + }) + sources."semver-5.7.1" + sources."semver-diff-2.1.0" + sources."semver-regex-1.0.0" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."set-immediate-shim-1.0.1" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."setprototypeof-1.1.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shortid-2.2.15" + sources."signal-exit-3.0.2" + (sources."simple-git-1.126.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) + sources."slash-1.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" + sources."source-map-0.5.7" + ]; + }) + sources."source-map-0.6.1" + sources."source-map-resolve-0.5.2" + sources."source-map-support-0.5.13" + sources."source-map-url-0.4.0" + sources."spawn-sync-1.0.15" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."stack-trace-0.0.9" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."statuses-1.5.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."strip-ansi-5.2.0" + sources."strip-dirs-2.1.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + sources."strip-outer-1.0.1" + (sources."superagent-3.8.3" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) + sources."supports-color-5.5.0" + (sources."tabtab-2.2.2" // { + dependencies = [ + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."cli-cursor-1.0.2" + sources."external-editor-1.1.1" + sources."figures-1.7.0" + sources."inquirer-1.2.3" + sources."is-fullwidth-code-point-1.0.0" + sources."mute-stream-0.0.6" + sources."onetime-1.1.0" + sources."restore-cursor-1.0.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."tmp-0.0.29" + ]; + }) + sources."tar-stream-1.6.2" + sources."term-size-1.2.0" + sources."through-2.3.8" + sources."timed-out-4.0.1" + sources."timers-ext-0.1.7" + sources."tmp-0.0.33" + sources."to-buffer-1.1.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."is-buffer-1.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."to-readable-stream-1.0.0" + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" + sources."traverse-0.6.6" + sources."trim-repeated-1.0.0" + sources."tslib-1.10.0" + sources."tunnel-agent-0.6.0" + sources."type-1.0.3" + sources."type-fest-0.5.2" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."unbzip2-stream-1.3.3" + (sources."union-value-1.0.1" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) + sources."unique-string-1.0.0" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."untildify-3.0.3" + sources."unzip-response-2.0.1" + sources."update-notifier-2.5.0" + (sources."uri-js-3.0.2" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) + sources."urix-0.1.0" + sources."url-0.10.3" + sources."url-parse-lax-3.0.0" + sources."url-to-options-1.0.1" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-2.0.3" + sources."vary-1.1.2" + sources."walkdir-0.0.11" + sources."whatwg-fetch-3.0.0" + sources."which-1.3.1" + sources."widest-line-2.0.1" + sources."wrappy-1.0.2" + sources."write-file-atomic-2.4.3" + sources."xdg-basedir-3.0.0" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xtend-4.0.2" + sources."yallist-2.1.2" + sources."yaml-ast-parser-0.0.43" + sources."yamljs-0.3.0" + sources."yauzl-2.10.0" + sources."zip-stream-1.2.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more"; + homepage = "https://github.com/serverless/serverless#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; }; shout = nodeEnv.buildNodePackage { name = "shout"; @@ -65315,7 +66367,7 @@ in sources."pause-stream-0.0.11" sources."performance-now-2.1.0" sources."proxy-addr-2.0.5" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.7.0" sources."range-parser-1.2.1" @@ -65385,7 +66437,7 @@ in sources."uri-js-4.2.2" sources."utf8-2.0.0" sources."utils-merge-1.0.1" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."vary-1.1.2" sources."verror-1.10.0" (sources."ws-0.4.31" // { @@ -65403,6 +66455,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; sloc = nodeEnv.buildNodePackage { name = "sloc"; @@ -65495,7 +66548,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."get-value-2.0.6" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."graceful-readlink-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -65642,6 +66695,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; smartdc = nodeEnv.buildNodePackage { name = "smartdc"; @@ -65784,28 +66838,34 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.210.0"; + version = "1.227.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.210.0.tgz"; - sha512 = "k6/EIX1Dc4Qk8omcKQDm13RRywkKqXoQ0IMz5Nyk1y8sdmg1S78QSWnfTaEPe+OQE1olrtjInrDX3Yu20CnMzg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz"; + sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw=="; }; dependencies = [ + sources."@snyk/cli-interface-2.1.0" sources."@snyk/composer-lockfile-parser-1.0.3" sources."@snyk/dep-graph-1.12.0" sources."@snyk/gemfile-1.2.0" sources."@types/agent-base-4.2.0" - sources."@types/debug-4.1.4" + sources."@types/bunyan-1.8.6" + sources."@types/debug-4.1.5" sources."@types/events-3.0.0" - sources."@types/node-12.6.9" + sources."@types/node-12.7.5" + sources."@types/restify-4.3.6" + sources."@types/semver-5.5.0" + sources."@types/xml2js-0.4.3" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.3.0" sources."ansi-align-2.0.0" - sources."ansi-escapes-4.2.1" + sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" @@ -65837,6 +66897,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" + sources."wrap-ansi-2.1.0" ]; }) sources."clone-deep-0.3.0" @@ -65850,33 +66911,42 @@ in sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."crypto-random-string-1.0.0" (sources."data-uri-to-buffer-2.0.1" // { dependencies = [ - sources."@types/node-8.10.51" + sources."@types/node-8.10.54" ]; }) sources."debug-3.2.6" sources."decamelize-1.2.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" + sources."define-properties-1.1.3" sources."degenerator-1.0.4" sources."depd-1.1.2" sources."diff-4.0.1" sources."dockerfile-ast-0.0.16" sources."dot-prop-4.2.0" + (sources."dotnet-deps-parser-4.5.0" // { + dependencies = [ + sources."xml2js-0.4.19" + ]; + }) sources."duplexer3-0.1.4" sources."email-validator-2.0.4" + sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.1" + sources."es-abstract-1.14.2" + sources."es-to-primitive-1.2.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.1" + sources."escodegen-1.12.0" sources."esprima-3.1.3" - sources."estraverse-4.2.0" + sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."execa-1.0.0" sources."extend-3.0.2" @@ -65892,6 +66962,7 @@ in sources."readable-stream-1.1.14" ]; }) + sources."function-bind-1.1.1" sources."get-stream-4.1.0" (sources."get-uri-2.0.3" // { dependencies = [ @@ -65907,15 +66978,12 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."graphlib-2.1.7" + sources."has-1.0.3" sources."has-flag-3.0.0" - (sources."hosted-git-info-2.8.2" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.0.3" - ]; - }) + sources."has-symbols-1.0.0" + sources."hosted-git-info-2.8.4" sources."http-errors-1.7.3" (sources."http-proxy-agent-2.1.0" // { dependencies = [ @@ -65931,15 +66999,13 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-6.5.0" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - ]; - }) + sources."inquirer-6.5.2" sources."invert-kv-1.0.0" sources."ip-1.1.5" sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" sources."is-ci-1.2.1" + sources."is-date-object-1.0.1" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" @@ -65949,9 +67015,11 @@ in sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" + sources."is-regex-1.0.4" + sources."is-retry-allowed-1.2.0" sources."is-ssh-1.3.1" sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" sources."is-wsl-1.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" @@ -65965,6 +67033,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -66004,6 +67073,9 @@ in sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."object-hash-1.3.1" + sources."object-inspect-1.6.0" + sources."object-keys-1.1.1" + sources."object.getownpropertydescriptors-2.0.3" sources."once-1.4.0" sources."onetime-2.0.1" sources."opn-5.5.0" @@ -66016,7 +67088,7 @@ in sources."pac-resolver-3.0.0" (sources."package-json-4.0.1" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."pako-1.0.10" @@ -66039,23 +67111,23 @@ in sources."rc-1.2.8" (sources."readable-stream-3.4.0" // { dependencies = [ - sources."string_decoder-1.2.0" + sources."string_decoder-1.3.0" ]; }) sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."restore-cursor-2.0.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."run-async-2.3.0" - sources."rxjs-6.5.2" - sources."safe-buffer-5.1.2" + sources."rxjs-6.5.3" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."secure-keys-1.0.0" sources."semver-6.3.0" (sources."semver-diff-2.1.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."set-immediate-shim-1.0.1" @@ -66070,7 +67142,7 @@ in sources."signal-exit-3.0.2" sources."smart-buffer-4.0.2" sources."snyk-config-2.2.3" - (sources."snyk-docker-plugin-1.25.1" // { + (sources."snyk-docker-plugin-1.29.1" // { dependencies = [ sources."debug-4.1.1" ]; @@ -66081,19 +67153,19 @@ in sources."debug-4.1.1" ]; }) - (sources."snyk-gradle-plugin-2.12.5" // { + (sources."snyk-gradle-plugin-3.0.2" // { dependencies = [ sources."debug-4.1.1" ]; }) sources."snyk-module-1.9.1" - (sources."snyk-mvn-plugin-2.3.3" // { + (sources."snyk-mvn-plugin-2.4.0" // { dependencies = [ sources."tslib-1.9.3" ]; }) sources."snyk-nodejs-lockfile-parser-1.16.0" - sources."snyk-nuget-plugin-1.11.3" + sources."snyk-nuget-plugin-1.12.1" sources."snyk-paket-parser-1.5.0" (sources."snyk-php-plugin-1.6.4" // { dependencies = [ @@ -66101,14 +67173,15 @@ in ]; }) sources."snyk-policy-1.13.5" - sources."snyk-python-plugin-1.10.2" + sources."snyk-python-plugin-1.13.2" sources."snyk-resolve-1.0.1" - (sources."snyk-resolve-deps-4.0.3" // { + (sources."snyk-resolve-deps-4.4.0" // { dependencies = [ - sources."semver-5.7.0" + sources."@types/node-6.14.7" + sources."semver-5.7.1" ]; }) - (sources."snyk-sbt-plugin-2.6.1" // { + (sources."snyk-sbt-plugin-2.8.0" // { dependencies = [ sources."tmp-0.1.0" ]; @@ -66130,6 +67203,8 @@ in sources."strip-ansi-4.0.0" ]; }) + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."string_decoder-0.10.31" (sources."strip-ansi-5.2.0" // { dependencies = [ @@ -66158,32 +67233,33 @@ in sources."tree-kill-1.2.1" sources."tslib-1.10.0" sources."type-check-0.3.2" - sources."type-fest-0.5.2" sources."unique-string-1.0.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."util.promisify-1.0.0" + sources."uuid-3.3.3" sources."vscode-languageserver-types-3.14.0" sources."which-1.3.1" sources."widest-line-2.0.1" sources."window-size-0.1.4" sources."windows-release-3.2.0" sources."wordwrap-1.0.0" - (sources."wrap-ansi-2.1.0" // { + (sources."wrap-ansi-5.1.0" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" + sources."string-width-3.1.0" ]; }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - sources."xml2js-0.4.19" + (sources."xml2js-0.4.22" // { + dependencies = [ + sources."xmlbuilder-11.0.1" + ]; + }) sources."xmlbuilder-9.0.7" sources."xregexp-2.0.0" sources."y18n-3.2.1" @@ -66205,6 +67281,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; @@ -66280,6 +67357,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; speed-test = nodeEnv.buildNodePackage { name = "speed-test"; @@ -66311,12 +67389,7 @@ in sources."color-name-1.1.3" sources."configstore-3.1.2" sources."create-error-class-3.0.2" - (sources."cross-spawn-5.1.0" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) + sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" sources."debug-3.1.0" @@ -66328,21 +67401,27 @@ in }) sources."deep-extend-0.6.0" sources."defaults-1.0.3" + sources."define-properties-1.1.3" sources."dot-prop-4.2.0" sources."draftlog-1.0.12" sources."duplexer3-0.1.4" sources."error-ex-1.3.2" + sources."es-abstract-1.14.2" + sources."es-to-primitive-1.2.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" sources."find-up-2.1.0" + sources."function-bind-1.1.1" sources."get-stream-3.0.0" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" + sources."has-1.0.3" sources."has-flag-3.0.0" - sources."hosted-git-info-2.8.2" + sources."has-symbols-1.0.0" + sources."hosted-git-info-2.8.4" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.2" sources."import-lazy-2.1.0" @@ -66350,7 +67429,9 @@ in sources."indent-string-3.2.0" sources."ini-1.3.5" sources."is-arrayish-0.2.1" + sources."is-callable-1.1.4" sources."is-ci-1.2.1" + sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -66358,8 +67439,10 @@ in sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" + sources."is-regex-1.0.4" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" sources."isexe-2.0.0" sources."json-parse-better-errors-1.0.2" sources."latest-version-3.1.0" @@ -66369,7 +67452,7 @@ in sources."log-update-2.3.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-5.1.1" + sources."lru-cache-4.1.5" sources."make-dir-1.3.0" sources."map-obj-2.0.0" sources."meow-5.0.0" @@ -66379,6 +67462,9 @@ in sources."ms-2.0.0" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" + sources."object-inspect-1.6.0" + sources."object-keys-1.1.1" + sources."object.getownpropertydescriptors-2.0.3" sources."onetime-2.0.1" (sources."ora-3.4.0" // { dependencies = [ @@ -66412,7 +67498,7 @@ in sources."round-to-3.0.0" sources."safe-buffer-5.2.0" sources."sax-1.2.4" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."semver-diff-2.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -66423,6 +67509,8 @@ in sources."spdx-license-ids-3.0.5" sources."speedtest-net-1.5.1" sources."string-width-2.1.1" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."strip-ansi-4.0.0" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" @@ -66436,6 +67524,7 @@ in sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" sources."url-parse-lax-1.0.0" + sources."util.promisify-1.0.0" sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -66443,9 +67532,9 @@ in sources."wrap-ansi-3.0.1" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" - sources."yallist-3.0.3" + sources."xml2js-0.4.22" + sources."xmlbuilder-11.0.1" + sources."yallist-2.1.2" sources."yargs-parser-10.1.0" ]; buildInputs = globalBuildInputs; @@ -66456,14 +67545,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; ssb-server = nodeEnv.buildNodePackage { name = "ssb-server"; packageName = "ssb-server"; - version = "15.1.0"; + version = "15.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-server/-/ssb-server-15.1.0.tgz"; - sha512 = "4qn3Q+xpKL6BKBTgO1dHSt5ljyrZkWVoHYaZzCYbs75rGbaGvc0evSyu2TpaYwiiSxrVxJGYr8s4MyXzdPqUVQ=="; + url = "https://registry.npmjs.org/ssb-server/-/ssb-server-15.1.1.tgz"; + sha512 = "MaQl721UDrU/YM1U2bu6bdLqSg8qPYjkGg/6TevWoohqSLLOfo3CXyE8OARCqX37y9fhKOKXAhhmqj8nPgQ2yw=="; }; dependencies = [ sources."abstract-leveldown-6.0.3" @@ -66576,9 +67666,13 @@ in sources."cross-spawn-6.0.5" sources."debug-4.1.1" sources."decode-uri-component-0.2.0" - sources."deep-equal-1.0.1" + sources."deep-equal-1.1.0" sources."deep-extend-0.6.0" - sources."deferred-leveldown-5.1.0" + (sources."deferred-leveldown-5.2.0" // { + dependencies = [ + sources."abstract-leveldown-6.1.1" + ]; + }) sources."define-properties-1.1.3" (sources."define-property-2.0.2" // { dependencies = [ @@ -66593,10 +67687,14 @@ in sources."elegant-spinner-1.0.1" sources."emoji-named-characters-1.0.2" sources."emoji-server-1.0.0" - sources."encoding-down-6.1.0" + (sources."encoding-down-6.2.0" // { + dependencies = [ + sources."abstract-leveldown-6.1.1" + ]; + }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.7" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" sources."exit-hook-1.1.1" @@ -66650,7 +67748,7 @@ in sources."glob-parent-2.0.0" sources."globby-4.1.0" sources."gossip-query-2.0.2" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-network-0.0.1" @@ -66690,6 +67788,7 @@ in }) sources."is-alphabetical-1.0.3" sources."is-alphanumerical-1.0.3" + sources."is-arguments-1.0.4" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-callable-1.1.4" @@ -66743,7 +67842,7 @@ in ]; }) sources."level-js-4.0.1" - sources."level-packager-5.0.2" + sources."level-packager-5.0.3" sources."level-post-1.0.7" (sources."level-sublevel-6.6.5" // { dependencies = [ @@ -66766,8 +67865,12 @@ in sources."string_decoder-0.10.31" ]; }) - sources."leveldown-5.1.1" - sources."levelup-4.1.0" + (sources."leveldown-5.2.0" // { + dependencies = [ + sources."abstract-leveldown-6.1.1" + ]; + }) + sources."levelup-4.2.0" sources."libnested-1.4.1" sources."libsodium-0.7.5" sources."libsodium-wrappers-0.7.5" @@ -66824,11 +67927,11 @@ in sources."kind-of-6.0.2" ]; }) - sources."napi-macros-1.8.2" + sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.18.0" + sources."nearley-2.19.0" sources."nice-try-1.0.5" - sources."node-gyp-build-4.1.0" + sources."node-gyp-build-4.1.1" sources."non-private-ip-1.4.4" sources."normalize-path-2.1.1" sources."normalize-uri-1.1.2" @@ -66848,6 +67951,7 @@ in ]; }) sources."object-inspect-1.6.0" + sources."object-is-1.0.1" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ @@ -66927,7 +68031,7 @@ in sources."pull-reader-1.3.1" sources."pull-sink-through-0.0.0" sources."pull-sort-1.0.2" - sources."pull-stream-3.6.13" + sources."pull-stream-3.6.14" (sources."pull-through-1.0.18" // { dependencies = [ sources."looper-3.0.0" @@ -67011,6 +68115,7 @@ in }) sources."regex-cache-0.4.4" sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.2.0" sources."relative-url-1.0.2" (sources."remark-3.2.3" // { dependencies = [ @@ -67028,7 +68133,7 @@ in sources."resumer-0.0.0" sources."ret-0.1.15" sources."right-pad-1.0.1" - (sources."rimraf-2.6.3" // { + (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.1.4" ]; @@ -67039,7 +68144,7 @@ in sources."safe-regex-1.1.0" sources."secret-handshake-1.1.20" sources."secret-stack-6.3.0" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."separator-escape-0.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -67087,7 +68192,7 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.4.5" + sources."sodium-native-2.4.6" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" @@ -67154,6 +68259,8 @@ in }) sources."string-width-1.0.2" sources."string.prototype.trim-1.1.2" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."string_decoder-1.1.1" sources."stringify-entities-1.3.2" sources."strip-ansi-3.0.1" @@ -67161,6 +68268,7 @@ in sources."supports-color-2.0.0" (sources."tape-4.11.0" // { dependencies = [ + sources."deep-equal-1.0.1" sources."glob-7.1.4" ]; }) @@ -67233,6 +68341,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; stackdriver-statsd-backend = nodeEnv.buildNodePackage { name = "stackdriver-statsd-backend"; @@ -67250,6 +68359,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; stf = nodeEnv.buildNodePackage { name = "stf"; @@ -67260,7 +68370,7 @@ in sha512 = "ddyn6GoWoboSze2SSRMKjDGu4i0z1xaQ0KN5BiQInAyeuIXGiZygZBxeJsO02GrQJ88rCb5i9JSR+qMwyBz6Bw=="; }; dependencies = [ - sources."@sailshq/lodash-3.10.3" + sources."@sailshq/lodash-3.10.4" (sources."@slack/client-3.16.0" // { dependencies = [ sources."bluebird-3.5.5" @@ -67319,7 +68429,11 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.504.0" + (sources."aws-sdk-2.529.0" // { + dependencies = [ + sources."uuid-3.3.2" + ]; + }) sources."aws-sign2-0.6.0" sources."aws4-1.8.0" sources."babel-runtime-6.26.0" @@ -67428,7 +68542,7 @@ in sources."dicer-0.2.5" sources."doctypes-1.1.0" sources."drange-1.1.1" - (sources."dtrace-provider-0.8.7" // { + (sources."dtrace-provider-0.8.8" // { dependencies = [ sources."nan-2.14.0" ]; @@ -67487,7 +68601,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - (sources."follow-redirects-1.7.0" // { + (sources."follow-redirects-1.9.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -67515,7 +68629,7 @@ in sources."ms-2.1.2" ]; }) - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."graphlib-2.1.7" sources."har-schema-2.0.0" sources."har-validator-2.0.6" @@ -67535,12 +68649,7 @@ in ]; }) sources."hoek-2.16.3" - (sources."hosted-git-info-2.8.2" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.0.3" - ]; - }) + sources."hosted-git-info-2.8.4" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -67711,7 +68820,7 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parse-json-2.2.0" @@ -67753,7 +68862,7 @@ in ]; }) sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pug-2.0.4" sources."pug-attrs-2.0.4" sources."pug-code-gen-2.0.2" @@ -67823,7 +68932,7 @@ in sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.1" - sources."semver-5.7.0" + sources."semver-5.7.1" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" @@ -67901,9 +69010,9 @@ in (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.6" - sources."form-data-2.5.0" + sources."form-data-2.5.1" sources."ms-2.1.2" - sources."qs-6.7.0" + sources."qs-6.8.0" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; @@ -67916,7 +69025,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.13.1" sources."lodash-3.10.1" - sources."qs-6.7.0" + sources."qs-6.8.0" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -67979,7 +69088,7 @@ in sources."utf-8-validate-1.2.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" sources."validator-5.7.0" sources."vary-1.1.2" @@ -68075,6 +69184,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; svgo = nodeEnv.buildNodePackage { name = "svgo"; @@ -68112,7 +69222,7 @@ in sources."domelementtype-1.3.1" sources."domutils-1.7.0" sources."entities-2.0.0" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -68129,6 +69239,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."nth-check-1.0.2" + sources."object-inspect-1.6.0" sources."object-keys-1.1.1" sources."object.getownpropertydescriptors-2.0.3" sources."object.values-1.1.0" @@ -68137,6 +69248,8 @@ in sources."source-map-0.5.7" sources."sprintf-js-1.0.3" sources."stable-0.1.8" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."supports-color-5.5.0" sources."unquote-1.1.1" sources."util.promisify-1.0.0" @@ -68149,6 +69262,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; swagger = nodeEnv.buildNodePackage { name = "swagger"; @@ -68226,7 +69340,7 @@ in sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" sources."charenc-0.0.2" - sources."chokidar-2.1.6" + sources."chokidar-2.1.8" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -68336,7 +69450,7 @@ in }) sources."finalhandler-1.1.2" sources."for-in-1.0.2" - sources."form-data-2.5.0" + sources."form-data-2.5.1" sources."formidable-1.2.1" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" @@ -68353,14 +69467,14 @@ in }) sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" (sources."graphlib-2.1.7" // { dependencies = [ sources."lodash-4.17.15" ]; }) sources."growl-1.9.2" - (sources."handlebars-4.1.2" // { + (sources."handlebars-4.2.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -68409,7 +69523,7 @@ in sources."is-path-inside-1.0.1" sources."is-plain-object-2.0.4" sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-valid-path-0.1.1" sources."is-windows-1.0.2" @@ -68500,7 +69614,7 @@ in sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" sources."neo-async-2.6.1" - (sources."nodemon-1.19.1" // { + (sources."nodemon-1.19.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -68543,7 +69657,7 @@ in dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" - sources."qs-6.7.0" + sources."qs-6.8.0" sources."superagent-3.8.3" ]; }) @@ -68584,13 +69698,13 @@ in sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" sources."ret-0.1.15" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."run-async-0.1.0" sources."rx-lite-3.1.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."sanitize-filename-1.6.2" - sources."semver-5.7.0" + sources."sanitize-filename-1.6.3" + sources."semver-5.7.1" sources."semver-diff-2.1.0" (sources."send-0.17.1" // { dependencies = [ @@ -68740,7 +69854,7 @@ in ]; }) sources."unzip-response-2.0.1" - sources."upath-1.1.2" + sources."upath-1.2.0" (sources."update-notifier-2.5.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -68775,6 +69889,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; "tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7" = nodeEnv.buildNodePackage { name = "tedicross"; @@ -68786,7 +69901,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-12.6.9" + sources."@types/node-12.7.5" sources."ajv-6.10.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -68847,13 +69962,13 @@ in sources."ms-2.1.2" sources."node-fetch-2.6.0" sources."oauth-sign-0.9.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."path-exists-3.0.0" sources."performance-now-2.1.0" sources."prism-media-0.0.3" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."ramda-0.25.0" @@ -68884,7 +69999,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.1" sources."uri-js-4.2.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."verror-1.10.0" sources."which-module-2.0.0" sources."wrap-ansi-5.1.0" @@ -68900,6 +70015,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; tern = nodeEnv.buildNodePackage { name = "tern"; @@ -68910,7 +70026,7 @@ in sha512 = "6jK0DcgziZ0NAitZNncg+do/fKGh8hQJShcVU7dHoAljdckr7qr2oozd4l4kTIA7M+0FoKXy6gvRBLO8oWpTEw=="; }; dependencies = [ - sources."acorn-6.2.1" + sources."acorn-6.3.0" sources."acorn-loose-6.1.0" sources."acorn-walk-6.2.0" sources."balanced-match-1.0.0" @@ -68921,7 +70037,7 @@ in sources."errno-0.1.7" sources."fs.realpath-1.0.0" sources."glob-7.1.4" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-1.0.0" @@ -68948,6 +70064,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint = nodeEnv.buildNodePackage { name = "textlint"; @@ -68998,12 +70115,12 @@ in sources."core-util-is-1.0.2" sources."crypt-0.0.2" sources."debug-4.1.1" - sources."deep-equal-1.0.1" + sources."deep-equal-1.1.0" sources."deep-is-0.1.3" sources."define-properties-1.1.3" sources."diff-4.0.1" sources."error-ex-1.3.2" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -69019,15 +70136,16 @@ in sources."function-bind-1.1.1" sources."get-stdin-5.0.1" sources."glob-7.1.4" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-symbols-1.0.0" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-alphabetical-1.0.3" sources."is-alphanumerical-1.0.3" + sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-callable-1.1.4" @@ -69057,7 +70175,6 @@ in sources."locate-path-2.0.0" sources."lodash-4.17.15" sources."log-symbols-1.0.2" - sources."lru-cache-5.1.1" sources."map-like-2.0.0" sources."markdown-escapes-1.0.3" sources."md5-2.2.1" @@ -69068,6 +70185,8 @@ in sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" + sources."object-inspect-1.6.0" + sources."object-is-1.0.1" sources."object-keys-1.1.1" sources."once-1.4.0" sources."optionator-0.8.2" @@ -69100,6 +70219,7 @@ in ]; }) sources."readable-stream-2.3.6" + sources."regexp.prototype.flags-1.2.0" sources."remark-frontmatter-1.3.2" sources."remark-parse-5.0.0" sources."repeat-string-1.6.1" @@ -69108,7 +70228,7 @@ in sources."resolve-1.12.0" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."slice-ansi-0.0.4" sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" @@ -69118,6 +70238,8 @@ in sources."state-toggle-1.0.2" sources."string-width-1.0.2" sources."string.prototype.padstart-3.0.0" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -69158,7 +70280,6 @@ in sources."x-is-string-0.1.0" sources."xml-escape-1.1.0" sources."xtend-4.0.2" - sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -69168,6 +70289,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-plugin-latex = nodeEnv.buildNodePackage { name = "textlint-plugin-latex"; @@ -69189,6 +70311,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-abbr-within-parentheses = nodeEnv.buildNodePackage { name = "textlint-rule-abbr-within-parentheses"; @@ -69212,6 +70335,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-alex = nodeEnv.buildNodePackage { name = "textlint-rule-alex"; @@ -69266,12 +70390,7 @@ in sources."configstore-3.1.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" - (sources."cross-spawn-5.1.0" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) + sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" sources."cuss-1.16.0" @@ -69301,9 +70420,9 @@ in sources."glob-7.1.4" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-flag-3.0.0" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."ignore-3.3.10" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -69329,7 +70448,7 @@ in sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."is-whitespace-character-1.0.3" @@ -69345,7 +70464,7 @@ in sources."lodash.intersection-4.4.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-5.1.1" + sources."lru-cache-4.1.5" (sources."make-dir-1.3.0" // { dependencies = [ sources."pify-3.0.0" @@ -69415,7 +70534,7 @@ in sources."retext-equality-3.2.0" sources."retext-profanities-4.4.0" sources."safe-buffer-5.1.2" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."semver-diff-2.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -69519,7 +70638,7 @@ in sources."x-is-string-0.1.0" sources."xdg-basedir-3.0.0" sources."xtend-4.0.2" - sources."yallist-3.0.3" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -69529,6 +70648,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-common-misspellings = nodeEnv.buildNodePackage { name = "textlint-rule-common-misspellings"; @@ -69553,6 +70673,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-diacritics = nodeEnv.buildNodePackage { name = "textlint-rule-diacritics"; @@ -69574,6 +70695,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-en-max-word-count = nodeEnv.buildNodePackage { name = "textlint-rule-en-max-word-count"; @@ -69610,6 +70732,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-max-comma = nodeEnv.buildNodePackage { name = "textlint-rule-max-comma"; @@ -69646,6 +70769,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-no-start-duplicated-conjunction = nodeEnv.buildNodePackage { name = "textlint-rule-no-start-duplicated-conjunction"; @@ -69663,7 +70787,7 @@ in sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."define-properties-1.1.3" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -69675,12 +70799,15 @@ in sources."is-symbol-1.0.2" sources."isarray-1.0.0" sources."object-assign-4.1.1" + sources."object-inspect-1.6.0" sources."object-keys-1.1.1" sources."object.values-1.1.0" sources."process-nextick-args-2.0.1" sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" sources."sentence-splitter-3.0.11" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."string_decoder-1.1.1" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -69698,6 +70825,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-period-in-list-item = nodeEnv.buildNodePackage { name = "textlint-rule-period-in-list-item"; @@ -69713,7 +70841,7 @@ in sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" sources."end-with-1.0.2" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -69722,7 +70850,10 @@ in sources."is-date-object-1.0.1" sources."is-regex-1.0.4" sources."is-symbol-1.0.2" + sources."object-inspect-1.6.0" sources."object-keys-1.1.1" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -69732,6 +70863,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; @@ -69761,6 +70893,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-terminology = nodeEnv.buildNodePackage { name = "textlint-rule-terminology"; @@ -69790,6 +70923,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-unexpanded-acronym = nodeEnv.buildNodePackage { name = "textlint-rule-unexpanded-acronym"; @@ -69802,7 +70936,7 @@ in dependencies = [ sources."array-includes-3.0.3" sources."define-properties-1.1.3" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -69812,7 +70946,10 @@ in sources."is-date-object-1.0.1" sources."is-regex-1.0.4" sources."is-symbol-1.0.2" + sources."object-inspect-1.6.0" sources."object-keys-1.1.1" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -69822,6 +70959,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; textlint-rule-write-good = nodeEnv.buildNodePackage { name = "textlint-rule-write-good"; @@ -69861,14 +70999,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; thelounge = nodeEnv.buildNodePackage { name = "thelounge"; packageName = "thelounge"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/thelounge/-/thelounge-3.1.1.tgz"; - sha512 = "TaYiWjvP5wjKAob3qMr8Ks+C8LfTxIohrhZ8b4DuilHlZCpIeEgADXs2K8u+ZVSMJ6GHOQKvpCogSE30sTL36A=="; + url = "https://registry.npmjs.org/thelounge/-/thelounge-3.2.0.tgz"; + sha512 = "yOS19bt2O0l6DGAiJRad6DFMmDHmDVylfInLthNl9YfMfgSoC7aZcT7fofTe9htAE4SRfac9YsgKEtmywQ+MkA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -69886,6 +71025,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -69930,17 +71070,21 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" - sources."commander-2.20.0" + sources."commander-3.0.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."content-disposition-0.5.3" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.1.4" + sources."core-js-3.2.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -69984,13 +71128,17 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."eventemitter3-2.0.3" - sources."express-4.17.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."extend-3.0.2" sources."extsprintf-1.2.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-text-encoding-1.0.0" - sources."file-type-12.0.1" + sources."file-type-12.1.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.1.0" sources."finalhandler-1.1.2" @@ -69999,14 +71147,14 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-extra-8.1.0" - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.4" sources."got-9.6.0" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."grapheme-splitter-1.0.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -70030,7 +71178,7 @@ in ]; }) sources."iconv-lite-0.4.24" - sources."ignore-walk-3.0.1" + sources."ignore-walk-3.0.2" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -70062,8 +71210,8 @@ in sources."assert-plus-0.1.5" ]; }) - sources."linkify-it-2.1.0" - sources."lodash-4.17.14" + sources."linkify-it-2.2.0" + sources."lodash-4.17.15" sources."lodash.assignin-4.2.0" sources."lodash.bind-4.2.1" sources."lodash.defaults-4.2.0" @@ -70088,8 +71236,8 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."minipass-2.3.5" - sources."minizlib-1.2.1" + sources."minipass-2.6.2" + sources."minizlib-1.2.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -70107,7 +71255,7 @@ in sources."negotiator-0.6.2" (sources."node-pre-gyp-0.11.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."nopt-4.0.1" @@ -70128,7 +71276,7 @@ in sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" sources."p-try-2.2.0" - sources."package-json-6.4.0" + sources."package-json-6.5.0" sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.3" @@ -70140,7 +71288,7 @@ in sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.5" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -70151,7 +71299,7 @@ in sources."read-chunk-3.2.0" sources."readable-stream-3.4.0" sources."regenerator-runtime-0.13.3" - sources."registry-auth-token-3.4.0" + sources."registry-auth-token-4.0.0" sources."registry-url-5.1.0" (sources."request-2.88.0" // { dependencies = [ @@ -70159,11 +71307,11 @@ in ]; }) sources."responselike-1.0.2" - sources."rimraf-2.6.3" - sources."safe-buffer-5.1.2" + sources."rimraf-2.7.1" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-6.2.0" + sources."semver-6.3.0" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" @@ -70200,7 +71348,7 @@ in sources."statuses-1.5.0" sources."streamsearch-0.1.2" sources."string-width-1.0.2" - sources."string_decoder-1.2.0" + sources."string_decoder-1.3.0" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" @@ -70244,7 +71392,7 @@ in sources."ws-6.1.4" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.0.3" - sources."yarn-1.16.0" + sources."yarn-1.17.3" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -70255,14 +71403,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.107.0"; + version = "0.108.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.107.0.tgz"; - sha512 = "vqbKJRLBEviPVa7poEzXocobicwxzsctr5mnymA7n8fEzcVS49rYP0RrwqZ98JqujRoruK+/YzcchNpRP+kXsQ=="; + url = "https://registry.npmjs.org/three/-/three-0.108.0.tgz"; + sha512 = "d1ysIXwi8qTlbmMwrTxi5pYiiYIflEr0e48krP0LAY8ndS8c6fkLHn6NvRT+o76/Fs9PBLxFViuI62iGVWwwlg=="; }; buildInputs = globalBuildInputs; meta = { @@ -70272,14 +71421,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; tiddlywiki = nodeEnv.buildNodePackage { name = "tiddlywiki"; packageName = "tiddlywiki"; - version = "5.1.19"; + version = "5.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.19.tgz"; - sha512 = "G7JnwrQJ6d2ue49yaBl7WzmTOV/WH/mm4WgknChr6z8sSUVU+czPoYBXfwqHOuCbdZqWRPjiYfjkdm+eUiWodw=="; + url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.21.tgz"; + sha512 = "VuBK9N2u9ttPcaHCh4NmRX3YYB2tMPoIKCHhfNaJ62VGQj8ozmVD+PkvP/w7R50g6HaZtaSsqUJj26gRTIBa6w=="; }; buildInputs = globalBuildInputs; meta = { @@ -70289,6 +71439,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; titanium = nodeEnv.buildNodePackage { name = "titanium"; @@ -70338,7 +71489,7 @@ in sources."fs.realpath-1.0.0" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" @@ -70374,7 +71525,7 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."pkginfo-0.3.1" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" @@ -70402,7 +71553,7 @@ in sources."uglify-js-3.4.10" sources."universalify-0.1.2" sources."uri-js-4.2.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."verror-1.10.0" (sources."winston-1.1.2" // { dependencies = [ @@ -70422,14 +71573,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.3.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.3.0.tgz"; - sha512 = "7O44Ds3J1bVeTHW4uZKSaEzxyV4+Dy5P29hQ4G9XgxGMUAVGtfUZEe77gppEqIxoIscDP9LRpzBPim21b6p+8Q=="; + url = "https://registry.npmjs.org/triton/-/triton-7.5.0.tgz"; + sha512 = "t1b1B2H0y9jOUqDm2rr9gQsnI0mm0ws47h+pz8sBWw+Ylw+J664bM/usKPevh38J17zlKo3FisAZvSjcOVfIZQ=="; }; dependencies = [ sources."asn1-0.2.4" @@ -70454,7 +71606,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."dtrace-provider-0.8.7" + sources."dtrace-provider-0.8.8" sources."ecc-jsbn-0.1.2" sources."extsprintf-1.0.2" sources."fast-safe-stringify-1.2.3" @@ -70581,7 +71733,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" (sources."vasync-1.6.3" // { dependencies = [ sources."extsprintf-1.2.0" @@ -70613,6 +71765,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; tsun = nodeEnv.buildNodePackage { name = "tsun"; @@ -70651,6 +71804,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; ttf2eot = nodeEnv.buildNodePackage { name = "ttf2eot"; @@ -70673,14 +71827,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.5.3"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz"; - sha512 = "ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz"; + sha512 = "N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw=="; }; buildInputs = globalBuildInputs; meta = { @@ -70690,31 +71845,33 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.3.8"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.3.8.tgz"; - sha512 = "ohi+libVtaJ0F8asuXeqYlrPV84AkbcpWsp5kBeO6XnCrilwQS+elDrJ+jPu2tfVy3CIUpUbUYUmg4Bq3CA/XQ=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.4.0.tgz"; + sha512 = "K8jNOmDFn+QfrCh8ujby2pGDs5rpjYZQn+zvQnf42rxG4IHbfw5CHoMvbGkWPK/J5Gw8/l5K3i03kVZC2IBElg=="; }; dependencies = [ sources."command-exists-1.2.6" sources."commander-2.20.0" sources."crypto-random-string-1.0.0" sources."fs-extra-7.0.1" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."jsonfile-4.0.0" sources."p-debounce-1.0.0" sources."temp-dir-1.0.0" sources."tempy-0.2.1" sources."unique-string-1.0.0" sources."universalify-0.1.2" - sources."vscode-jsonrpc-4.0.0" - sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.14.1" - sources."vscode-languageserver-types-3.14.0" + sources."vscode-jsonrpc-4.1.0-next.3" + sources."vscode-languageserver-5.3.0-next.10" + sources."vscode-languageserver-protocol-3.15.0-next.8" + sources."vscode-languageserver-types-3.15.0-next.4" + sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" ]; buildInputs = globalBuildInputs; @@ -70724,6 +71881,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; @@ -70745,14 +71903,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.46"; + version = "1.4.47"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.46.tgz"; - sha512 = "mJFQJQftgrdqP4npnUd9P9WUeMsTfrDeStfTuUG8g58ELxm2RKvLsphxzKK5HkI+u61MasftxdGvcGPUs3gOzQ=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.47.tgz"; + sha512 = "aTkH2jg6vCcobdSeElJ2xqRI6zHL8Y+TPLEgE+86BmdSLPyRgvYbqTzvieTXF+4U9y693NtfyALcvKxqHhcmJA=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -70820,7 +71979,7 @@ in sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."crossroads-0.12.2" @@ -70843,9 +72002,9 @@ in ]; }) sources."ecc-jsbn-0.1.2" - (sources."editions-2.1.3" // { + (sources."editions-2.2.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-6.3.0" ]; }) sources."ee-first-1.1.1" @@ -70863,7 +72022,7 @@ in ]; }) sources."engine.io-parser-2.1.3" - sources."errlop-1.1.1" + sources."errlop-1.1.2" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eve-0.5.4" @@ -70895,7 +72054,7 @@ in sources."eyes-0.1.8" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" - sources."fast-safe-stringify-2.0.6" + sources."fast-safe-stringify-2.0.7" (sources."finalhandler-1.1.1" // { dependencies = [ sources."statuses-1.4.0" @@ -70914,7 +72073,7 @@ in sources."getmac-1.4.6" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-binary2-1.0.3" // { @@ -70930,16 +72089,11 @@ in sources."mkdirp-0.3.0" ]; }) - (sources."hosted-git-info-2.8.2" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.0.3" - ]; - }) + sources."hosted-git-info-2.8.4" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" - sources."ignore-5.1.2" + sources."ignore-5.1.4" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -70994,18 +72148,18 @@ in sources."nopt-1.0.10" (sources."normalize-package-data-2.5.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."npm-6.9.2" - (sources."npm-package-arg-6.1.0" // { + (sources."npm-package-arg-6.1.1" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) (sources."npm-registry-client-8.6.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."npm-run-path-2.0.2" @@ -71027,7 +72181,7 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parseqs-0.0.5" @@ -71046,7 +72200,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.5" sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -71149,7 +72303,7 @@ in sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" @@ -71191,6 +72345,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; vscode-css-languageserver-bin = nodeEnv.buildNodePackage { name = "vscode-css-languageserver-bin"; @@ -71218,6 +72373,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; vscode-html-languageserver-bin = nodeEnv.buildNodePackage { name = "vscode-html-languageserver-bin"; @@ -71255,6 +72411,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; vue-cli = nodeEnv.buildNodePackage { name = "vue-cli"; @@ -71289,7 +72446,7 @@ in sources."bl-1.2.2" sources."bluebird-3.5.5" sources."brace-expansion-1.1.11" - sources."buffer-5.2.1" + sources."buffer-5.4.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -71364,10 +72521,10 @@ in sources."git-clone-0.1.0" sources."glob-7.1.4" sources."got-6.7.1" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."graceful-readlink-1.0.1" sources."gray-matter-2.1.1" - sources."handlebars-4.1.2" + sources."handlebars-4.2.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -71385,7 +72542,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-6.5.0" + sources."inquirer-6.5.2" sources."is-3.3.0" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -71393,7 +72550,7 @@ in sources."is-object-1.0.1" sources."is-promise-2.1.0" sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -71456,7 +72613,7 @@ in sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-metadata-1.0.0" @@ -71468,9 +72625,9 @@ in sources."recursive-readdir-2.2.2" sources."request-2.88.0" sources."restore-cursor-2.0.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."run-async-2.3.0" - sources."rxjs-6.5.2" + sources."rxjs-6.5.3" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { @@ -71478,7 +72635,7 @@ in sources."commander-2.8.1" ]; }) - sources."semver-5.7.0" + sources."semver-5.7.1" sources."signal-exit-3.0.2" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" @@ -71530,7 +72687,7 @@ in sources."url-to-options-1.0.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."ware-1.3.0" @@ -71550,19 +72707,22 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; vue-language-server = nodeEnv.buildNodePackage { name = "vue-language-server"; packageName = "vue-language-server"; - version = "0.0.57"; + version = "0.0.61"; src = fetchurl { - url = "https://registry.npmjs.org/vue-language-server/-/vue-language-server-0.0.57.tgz"; - sha512 = "o0CSn0HJdo1/ASh2nY9MZh/dZrq+U+fVfIL4XDL/VRMrFAyr9pPmhT9/pdRZlHPN46r05UhBfGQXnbeOOssguA=="; + url = "https://registry.npmjs.org/vue-language-server/-/vue-language-server-0.0.61.tgz"; + sha512 = "/fBg8FrW2H4CRO/dsr3VuGVYs5RS6zQIT+eG9SEQdo3VRDF8bNmJro1QpszJ0KVC7UxW9+fwf98i+xDBtne2Xw=="; }; dependencies = [ sources."@babel/code-frame-7.5.5" sources."@babel/highlight-7.5.0" sources."@emmetio/extract-abbreviation-0.1.6" + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.stat-1.1.3" sources."@starptech/expression-parser-0.9.0" sources."@starptech/hast-util-from-webparser-0.9.0" sources."@starptech/prettyhtml-0.9.0" @@ -71573,28 +72733,42 @@ in sources."@starptech/rehype-minify-whitespace-0.9.0" sources."@starptech/rehype-webparser-0.9.0" sources."@starptech/webparser-0.9.0" - sources."@types/node-12.6.9" + sources."@types/node-12.7.5" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-1.0.1" sources."abbrev-1.1.1" - sources."acorn-6.2.1" - sources."acorn-jsx-5.0.1" + sources."acorn-6.3.0" + sources."acorn-jsx-5.0.2" sources."ajv-6.10.2" sources."ajv-keywords-2.1.1" - sources."amdefine-1.0.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."anymatch-1.3.2" + (sources."anymatch-1.3.2" // { + dependencies = [ + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + sources."braces-1.8.5" + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."is-buffer-1.1.6" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."kind-of-3.2.2" + sources."micromatch-2.3.11" + ]; + }) sources."argparse-1.0.10" - sources."arr-diff-2.0.0" + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" sources."array-find-index-1.0.2" sources."array-iterate-1.1.3" - sources."array-unique-0.2.1" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" sources."arrify-1.0.1" sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" @@ -71617,21 +72791,22 @@ in (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" - sources."isobject-3.0.1" ]; }) sources."binary-extensions-1.13.1" sources."bootstrap-vue-helper-json-1.1.1" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" - sources."buefy-helper-json-1.0.3" - sources."buffer-from-1.1.1" - (sources."cache-base-1.0.1" // { + (sources."braces-2.3.2" // { dependencies = [ - sources."isobject-3.0.1" + sources."extend-shallow-2.0.1" ]; }) + sources."buefy-helper-json-1.0.3" + sources."buffer-from-1.1.1" + sources."builtin-modules-1.1.1" + sources."cache-base-1.0.1" + sources."call-me-maybe-1.0.1" (sources."caller-path-0.1.0" // { dependencies = [ sources."callsites-0.2.0" @@ -71648,7 +72823,13 @@ in sources."character-entities-legacy-1.1.3" sources."character-reference-invalid-1.1.3" sources."chardet-0.7.0" - sources."chokidar-1.5.2" + (sources."chokidar-1.5.2" // { + dependencies = [ + sources."glob-parent-2.0.0" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) sources."ci-info-1.6.0" sources."circular-json-0.3.3" (sources."class-utils-0.3.6" // { @@ -71666,21 +72847,13 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."isobject-3.0.1" sources."kind-of-5.1.0" ]; }) sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) + sources."cliui-4.1.0" sources."clone-1.0.4" sources."co-4.6.0" sources."code-point-at-1.1.0" @@ -71706,14 +72879,14 @@ in sources."core-js-2.6.9" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" - (sources."cross-spawn-5.1.0" // { + sources."cross-spawn-5.1.0" + sources."crypto-random-string-1.0.0" + (sources."css-2.2.4" // { dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" + sources."source-map-0.6.1" ]; }) - sources."crypto-random-string-1.0.0" - sources."css-parse-1.7.0" + sources."css-parse-2.0.0" sources."currently-unhandled-0.4.1" sources."debug-3.2.6" sources."decamelize-1.2.0" @@ -71726,22 +72899,15 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."defaults-1.0.3" - (sources."define-property-2.0.2" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."define-property-2.0.2" + sources."diff-4.0.1" + sources."dir-glob-2.0.0" sources."dlv-1.1.3" sources."doctrine-3.0.0" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" - (sources."editorconfig-0.15.3" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) - sources."element-helper-json-2.0.5" + sources."editorconfig-0.15.3" + sources."element-helper-json-2.0.6" sources."emoji-regex-7.0.3" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" @@ -71760,17 +72926,45 @@ in ]; }) sources."eslint-scope-4.0.3" - sources."eslint-utils-1.4.0" - sources."eslint-visitor-keys-1.0.0" + sources."eslint-utils-1.4.2" + sources."eslint-visitor-keys-1.1.0" sources."espree-5.0.1" sources."esprima-4.0.1" sources."esquery-1.0.1" sources."esrecurse-4.2.1" - sources."estraverse-4.2.0" + sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."execa-0.7.0" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."expand-range-1.8.2" // { + dependencies = [ + sources."fill-range-2.2.4" + sources."is-buffer-1.1.6" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + sources."kind-of-3.2.2" + ]; + }) sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ @@ -71778,15 +72972,25 @@ in ]; }) sources."external-editor-3.1.0" - sources."extglob-0.3.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) sources."fast-deep-equal-2.0.1" + sources."fast-glob-2.2.7" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."fault-1.0.3" sources."figures-2.0.0" sources."file-entry-cache-5.0.1" sources."filename-regex-2.0.1" - sources."fill-range-2.2.4" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."find-up-2.1.0" sources."flat-cache-2.0.1" sources."flatted-2.0.1" @@ -71799,15 +73003,28 @@ in sources."fsevents-1.2.9" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" + sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-7.1.4" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" + (sources."glob-base-0.3.0" // { + dependencies = [ + sources."glob-parent-2.0.0" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" sources."globals-11.12.0" + sources."globby-8.0.2" sources."got-6.7.1" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -71816,19 +73033,10 @@ in ]; }) sources."has-flag-3.0.0" - (sources."has-value-1.0.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ sources."is-buffer-1.1.6" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."kind-of-4.0.0" ]; }) @@ -71839,7 +73047,7 @@ in sources."hast-util-parse-selector-2.2.2" sources."hast-util-to-string-1.0.2" sources."hast-util-whitespace-1.0.3" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."html-void-elements-1.0.4" sources."html-whitespace-sensitive-tag-names-1.0.1" sources."iconv-lite-0.4.24" @@ -71855,69 +73063,58 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-6.5.0" // { + (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-regex-4.1.0" sources."strip-ansi-5.2.0" ]; }) sources."invert-kv-1.0.0" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."is-accessor-descriptor-1.0.0" sources."is-alphabetical-1.0.3" sources."is-alphanumerical-1.0.3" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-2.0.3" sources."is-ci-1.2.1" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.3" - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."is-descriptor-1.0.2" sources."is-dotfile-1.0.3" sources."is-empty-1.2.0" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-2.0.1" + sources."is-glob-4.0.1" sources."is-hexadecimal-1.0.3" sources."is-hidden-1.1.2" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" - sources."is-number-2.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."is-buffer-1.1.6" + sources."kind-of-3.2.2" + ]; + }) sources."is-obj-1.0.1" sources."is-object-1.0.1" sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" - (sources."is-plain-object-2.0.4" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."is-plain-object-2.0.4" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-resolvable-1.1.0" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" - sources."js-beautify-1.10.1" + sources."isobject-3.0.1" + sources."js-beautify-1.10.2" sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" sources."json-parse-better-errors-1.0.2" @@ -71925,11 +73122,7 @@ in sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-2.1.0" sources."jsonc-parser-1.0.3" - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) + sources."kind-of-6.0.2" sources."latest-version-3.1.0" sources."lcid-1.0.0" sources."levn-0.3.0" @@ -71944,7 +73137,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.rest-4.0.5" sources."lodash.unescape-4.0.1" - sources."loglevel-1.6.3" + sources."loglevel-1.6.4" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -71957,19 +73150,21 @@ in sources."longest-streak-1.0.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-5.1.1" + sources."lru-cache-4.1.5" sources."make-dir-1.3.0" sources."map-cache-0.2.2" sources."map-obj-2.0.0" sources."map-visit-1.0.0" sources."markdown-table-0.4.0" sources."math-random-1.0.4" + sources."mem-1.1.0" (sources."meow-5.0.0" // { dependencies = [ sources."read-pkg-up-3.0.0" ]; }) - sources."micromatch-2.3.11" + sources."merge2-1.3.0" + sources."micromatch-3.1.10" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -71988,13 +73183,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.7" sources."nan-2.14.0" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."kind-of-6.0.2" - ]; - }) + sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" sources."nopt-4.0.1" @@ -72009,30 +73198,24 @@ in dependencies = [ sources."define-property-0.2.5" sources."is-accessor-descriptor-0.1.6" + sources."is-buffer-1.1.6" sources."is-data-descriptor-0.1.4" (sources."is-descriptor-0.1.6" // { dependencies = [ sources."kind-of-5.1.0" ]; }) + sources."kind-of-3.2.2" ]; }) - (sources."object-visit-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."object-visit-1.0.1" sources."object.omit-2.0.1" - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-2.0.1" sources."optionator-0.8.2" sources."os-homedir-1.0.2" - sources."os-locale-1.4.0" + sources."os-locale-2.1.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-finally-1.0.0" @@ -72043,9 +73226,15 @@ in sources."parent-module-1.0.1" sources."parse-entities-1.2.2" sources."parse-gitignore-1.0.1" - sources."parse-glob-3.0.4" + (sources."parse-glob-3.0.4" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) sources."parse-json-4.0.0" sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -72099,6 +73288,7 @@ in sources."write-0.2.1" ]; }) + sources."prettier-tslint-0.4.2" sources."pretty-format-23.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" @@ -72110,7 +73300,6 @@ in (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" - sources."kind-of-6.0.2" ]; }) sources."rc-1.2.8" @@ -72119,66 +73308,13 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" ]; }) sources."readable-stream-2.3.6" - (sources."readdirp-2.2.1" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."debug-2.6.9" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.2" - sources."micromatch-3.1.10" - sources."ms-2.0.0" - ]; - }) + sources."readdirp-2.2.1" sources."redent-2.0.0" sources."regenerator-runtime-0.11.1" sources."regex-cache-0.4.4" @@ -72203,6 +73339,7 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" + sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" (sources."require-uncached-1.0.3" // { @@ -72219,14 +73356,14 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."rxjs-6.5.2" + sources."rxjs-6.5.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sax-0.5.8" - sources."semver-5.7.0" + sources."sax-1.2.4" + sources."semver-5.7.1" sources."semver-diff-2.1.0" - sources."set-blocking-1.0.0" + sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -72237,6 +73374,7 @@ in sources."shellsubstitute-1.2.0" sources."sigmund-1.0.1" sources."signal-exit-3.0.2" + sources."slash-1.0.0" sources."slice-ansi-2.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -72257,17 +73395,20 @@ in sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" sources."ms-2.0.0" - sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { dependencies = [ sources."define-property-1.0.0" - sources."isobject-3.0.1" ]; }) - sources."snapdragon-util-3.0.1" - sources."source-map-0.1.43" + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."is-buffer-1.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."space-separated-tokens-1.1.4" @@ -72308,22 +73449,42 @@ in dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" + sources."camelcase-3.0.0" sources."chalk-1.1.3" + sources."cliui-3.2.0" + sources."find-up-1.1.2" sources."glob-7.0.4" + sources."is-fullwidth-code-point-1.0.0" + sources."load-json-file-1.1.0" + sources."os-locale-1.4.0" + sources."parse-json-2.2.0" + sources."path-exists-2.1.0" sources."path-is-absolute-1.0.0" + sources."path-type-1.1.0" + sources."pify-2.3.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."set-blocking-1.0.0" + sources."string-width-1.0.2" sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" sources."supports-color-2.0.0" + sources."yargs-4.7.1" + sources."yargs-parser-2.4.1" ]; }) - (sources."stylus-0.54.5" // { + (sources."stylus-0.54.7" // { dependencies = [ - sources."glob-7.0.6" + sources."debug-3.1.0" + sources."ms-2.0.0" + sources."semver-6.3.0" + sources."source-map-0.7.3" ]; }) sources."stylus-supremacy-2.12.7" sources."supports-color-5.5.0" sources."symbol-0.2.3" - (sources."table-5.4.5" // { + (sources."table-5.4.6" // { dependencies = [ sources."ansi-regex-4.1.0" sources."string-width-3.1.0" @@ -72335,13 +73496,14 @@ in sources."through-2.3.8" sources."timed-out-4.0.1" sources."tmp-0.0.33" - sources."to-object-path-0.3.0" - sources."to-regex-3.0.2" - (sources."to-regex-range-2.1.1" // { + (sources."to-object-path-0.3.0" // { dependencies = [ - sources."is-number-3.0.0" + sources."is-buffer-1.1.6" + sources."kind-of-3.2.2" ]; }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" (sources."to-vfile-5.0.3" // { dependencies = [ sources."vfile-3.0.1" @@ -72352,9 +73514,11 @@ in sources."trim-trailing-lines-1.1.2" sources."trough-1.0.4" sources."tslib-1.10.0" + sources."tslint-5.20.0" + sources."tsutils-2.29.0" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."typescript-3.5.3" + sources."typescript-3.6.3" (sources."typescript-eslint-parser-16.0.1" // { dependencies = [ sources."semver-5.5.0" @@ -72394,7 +73558,6 @@ in ]; }) sources."has-values-0.1.4" - sources."isobject-3.0.1" ]; }) sources."untildify-2.1.0" @@ -72428,10 +73591,10 @@ in sources."vscode-languageserver-types-3.14.0" ]; }) - sources."vscode-jsonrpc-4.1.0-next.2" - sources."vscode-languageserver-5.3.0-next.8" - sources."vscode-languageserver-protocol-3.15.0-next.6" - sources."vscode-languageserver-types-3.15.0-next.2" + sources."vscode-jsonrpc-4.1.0-next.3" + sources."vscode-languageserver-5.3.0-next.10" + sources."vscode-languageserver-protocol-3.15.0-next.8" + sources."vscode-languageserver-types-3.15.0-next.4" sources."vscode-nls-4.1.1" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" @@ -72441,9 +73604,9 @@ in ]; }) sources."vue-onsenui-helper-json-1.0.2" - sources."vuetify-helper-json-1.0.0" sources."wcwidth-1.0.1" sources."which-1.3.1" + sources."which-module-2.0.0" sources."widest-line-2.0.1" sources."window-size-0.2.0" sources."wordwrap-1.0.0" @@ -72463,24 +73626,10 @@ in sources."xdg-basedir-3.0.0" sources."xtend-4.0.2" sources."y18n-3.2.1" - sources."yallist-3.0.3" - (sources."yargs-4.7.1" // { + sources."yallist-2.1.2" + (sources."yargs-11.1.0" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."camelcase-3.0.0" - sources."find-up-1.1.2" - sources."is-fullwidth-code-point-1.0.0" - sources."load-json-file-1.1.0" - sources."parse-json-2.2.0" - sources."path-exists-2.1.0" - sources."path-type-1.1.0" - sources."pify-2.3.0" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - sources."strip-bom-2.0.0" - sources."yargs-parser-2.4.1" + sources."yargs-parser-9.0.2" ]; }) sources."yargs-parser-10.1.0" @@ -72493,6 +73642,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; web-ext = nodeEnv.buildNodePackage { name = "web-ext"; @@ -72507,19 +73657,24 @@ in sources."@babel/highlight-7.5.0" sources."@babel/polyfill-7.4.4" sources."@babel/runtime-7.4.5" - sources."@babel/runtime-corejs2-7.5.5" + sources."@babel/runtime-corejs2-7.6.0" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" + sources."@snyk/cli-interface-2.1.0" sources."@snyk/composer-lockfile-parser-1.0.3" sources."@snyk/dep-graph-1.12.0" sources."@snyk/gemfile-1.2.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/agent-base-4.2.0" - sources."@types/debug-4.1.4" + sources."@types/bunyan-1.8.6" + sources."@types/debug-4.1.5" sources."@types/events-3.0.0" sources."@types/minimatch-3.0.3" - sources."@types/node-12.6.9" + sources."@types/node-12.7.5" + sources."@types/restify-4.3.6" + sources."@types/semver-5.5.0" + sources."@types/xml2js-0.4.3" sources."@yarnpkg/lockfile-1.1.0" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" @@ -72548,7 +73703,7 @@ in sources."ajv-keywords-1.5.1" sources."ajv-merge-patch-4.1.0" sources."ansi-align-2.0.0" - sources."ansi-escapes-4.2.1" + sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" @@ -72559,6 +73714,7 @@ in sources."async-2.6.3" sources."isarray-1.0.0" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -72566,6 +73722,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -72624,8 +73781,16 @@ in (sources."bl-1.2.2" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) ]; }) sources."bluebird-2.9.34" @@ -72641,7 +73806,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."buffer-5.2.1" + sources."buffer-5.4.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -72670,7 +73835,7 @@ in sources."chalk-2.4.2" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.3" - (sources."chokidar-2.1.6" // { + (sources."chokidar-2.1.8" // { dependencies = [ sources."fsevents-1.2.9" sources."normalize-path-3.0.0" @@ -72702,6 +73867,7 @@ in dependencies = [ sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" + sources."wrap-ansi-2.1.0" ]; }) sources."clone-1.0.4" @@ -72722,6 +73888,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -72730,6 +73897,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -72742,13 +73910,14 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."crx-parser-0.1.2" @@ -72759,7 +73928,7 @@ in sources."dashdash-1.14.1" (sources."data-uri-to-buffer-2.0.1" // { dependencies = [ - sources."@types/node-8.10.51" + sources."@types/node-8.10.54" ]; }) sources."debounce-1.2.0" @@ -72771,13 +73940,14 @@ in }) sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" - sources."deep-equal-1.0.1" + sources."deep-equal-1.1.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepcopy-0.6.3" sources."deepmerge-3.2.0" sources."defaults-1.0.3" sources."defer-to-connect-1.0.2" + sources."define-properties-1.1.3" sources."define-property-2.0.2" (sources."degenerator-1.0.4" // { dependencies = [ @@ -72799,7 +73969,12 @@ in sources."domhandler-2.4.2" sources."domutils-1.5.1" sources."dot-prop-4.2.0" - sources."dtrace-provider-0.8.7" + (sources."dotnet-deps-parser-4.5.0" // { + dependencies = [ + sources."xml2js-0.4.19" + ]; + }) + sources."dtrace-provider-0.8.8" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" @@ -72809,17 +73984,23 @@ in sources."end-of-stream-1.4.1" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es5-ext-0.10.50" + sources."es-abstract-1.14.2" + sources."es-to-primitive-1.2.0" + sources."es5-ext-0.10.51" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-promise-2.3.0" sources."es6-promisify-6.0.1" - sources."es6-set-0.1.5" - sources."es6-symbol-3.1.1" + (sources."es6-set-0.1.5" // { + dependencies = [ + sources."es6-symbol-3.1.1" + ]; + }) + sources."es6-symbol-3.1.2" sources."es6-weak-map-2.0.3" sources."escape-string-regexp-1.0.5" - (sources."escodegen-1.11.1" // { + (sources."escodegen-1.12.0" // { dependencies = [ sources."esprima-3.1.3" ]; @@ -72830,7 +74011,7 @@ in sources."ansi-regex-3.0.0" sources."debug-4.1.1" sources."ms-2.1.2" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" ]; @@ -72874,18 +74055,18 @@ in ]; }) sources."eslint-scope-4.0.3" - sources."eslint-utils-1.4.0" + sources."eslint-utils-1.4.2" sources."eslint-visitor-keys-1.0.0" (sources."espree-5.0.1" // { dependencies = [ - sources."acorn-6.2.1" - sources."acorn-jsx-5.0.1" + sources."acorn-6.3.0" + sources."acorn-jsx-5.0.2" ]; }) sources."esprima-4.0.1" sources."esquery-1.0.1" sources."esrecurse-4.2.1" - sources."estraverse-4.2.0" + sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" @@ -72928,11 +74109,11 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-patch-2.2.0" + sources."fast-json-patch-2.2.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."fast-redact-1.5.0" - sources."fast-safe-stringify-2.0.6" + sources."fast-safe-stringify-2.0.7" sources."fd-slicer-1.1.0" sources."figures-2.0.0" sources."file-entry-cache-5.0.1" @@ -72968,6 +74149,7 @@ in sources."string_decoder-0.10.31" ]; }) + sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" (sources."fx-runner-1.0.11" // { dependencies = [ @@ -73010,15 +74192,17 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."graceful-readlink-1.0.1" sources."graphlib-2.1.7" sources."growly-1.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-color-0.1.7" sources."has-flag-3.0.0" + sources."has-symbols-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -73026,12 +74210,7 @@ in ]; }) sources."has-yarn-2.1.0" - (sources."hosted-git-info-2.8.2" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.0.3" - ]; - }) + sources."hosted-git-info-2.8.4" sources."htmlparser2-3.10.1" sources."http-cache-semantics-4.0.3" sources."http-errors-1.7.3" @@ -73057,9 +74236,8 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-6.5.0" // { + (sources."inquirer-6.5.2" // { dependencies = [ - sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" sources."strip-ansi-5.2.0" ]; @@ -73073,15 +74251,18 @@ in sources."kind-of-6.0.2" ]; }) + sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" sources."is-ci-1.2.1" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.2" ]; }) + sources."is-date-object-1.0.1" (sources."is-descriptor-1.0.2" // { dependencies = [ sources."kind-of-6.0.2" @@ -73103,11 +74284,13 @@ in sources."is-promise-2.1.0" sources."is-property-1.0.2" sources."is-redirect-1.0.0" + sources."is-regex-1.0.4" sources."is-relative-0.1.3" sources."is-resolvable-1.1.0" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-ssh-1.3.1" sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -73144,6 +74327,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -73157,6 +74341,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -73263,7 +74448,7 @@ in sources."node-forge-0.7.6" (sources."node-notifier-5.4.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) (sources."nomnom-1.8.1" // { @@ -73293,7 +74478,11 @@ in ]; }) sources."object-hash-1.3.1" + sources."object-inspect-1.6.0" + sources."object-is-1.0.1" + sources."object-keys-1.1.1" sources."object-visit-1.0.1" + sources."object.getownpropertydescriptors-2.0.3" sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-2.0.1" @@ -73313,7 +74502,7 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" (sources."pac-proxy-agent-3.0.0" // { @@ -73325,7 +74514,7 @@ in sources."pac-resolver-3.0.0" (sources."package-json-4.0.1" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."pako-1.0.10" @@ -73373,7 +74562,7 @@ in }) sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -73389,6 +74578,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -73401,6 +74591,7 @@ in sources."rechoir-0.6.2" sources."regenerator-runtime-0.13.3" sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.2.0" sources."regexpp-2.0.1" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" @@ -73425,8 +74616,8 @@ in sources."rimraf-2.6.3" sources."run-async-2.3.0" sources."rx-lite-3.1.2" - sources."rxjs-6.5.2" - sources."safe-buffer-5.1.2" + sources."rxjs-6.5.3" + sources."safe-buffer-5.2.0" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -73435,7 +74626,7 @@ in sources."semver-6.1.1" (sources."semver-diff-2.1.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) sources."set-blocking-2.0.0" @@ -73503,7 +74694,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.210.0" // { + (sources."snyk-1.227.0" // { dependencies = [ sources."ansi-regex-4.1.0" sources."debug-3.2.6" @@ -73518,7 +74709,7 @@ in sources."ms-2.1.2" ]; }) - (sources."snyk-docker-plugin-1.25.1" // { + (sources."snyk-docker-plugin-1.29.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -73532,7 +74723,7 @@ in sources."tmp-0.0.33" ]; }) - (sources."snyk-gradle-plugin-2.12.5" // { + (sources."snyk-gradle-plugin-3.0.2" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -73545,13 +74736,13 @@ in sources."ms-2.1.2" ]; }) - (sources."snyk-mvn-plugin-2.3.3" // { + (sources."snyk-mvn-plugin-2.4.0" // { dependencies = [ sources."tslib-1.9.3" ]; }) sources."snyk-nodejs-lockfile-parser-1.16.0" - (sources."snyk-nuget-plugin-1.11.3" // { + (sources."snyk-nuget-plugin-1.12.1" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -73569,7 +74760,7 @@ in sources."ms-2.1.2" ]; }) - (sources."snyk-python-plugin-1.10.2" // { + (sources."snyk-python-plugin-1.13.2" // { dependencies = [ sources."tmp-0.0.33" ]; @@ -73580,14 +74771,15 @@ in sources."ms-2.1.2" ]; }) - (sources."snyk-resolve-deps-4.0.3" // { + (sources."snyk-resolve-deps-4.4.0" // { dependencies = [ + sources."@types/node-6.14.7" sources."debug-3.2.6" sources."ms-2.1.2" - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) - (sources."snyk-sbt-plugin-2.6.1" // { + (sources."snyk-sbt-plugin-2.8.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -73607,7 +74799,7 @@ in sources."es6-promisify-5.0.0" ]; }) - sources."sonic-boom-0.7.5" + sources."sonic-boom-0.7.6" sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" sources."source-map-support-0.5.12" @@ -73649,7 +74841,9 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string_decoder-1.2.0" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" + sources."string_decoder-1.3.0" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" sources."strip-bom-buf-2.0.0" @@ -73657,7 +74851,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-3.0.1" sources."supports-color-5.5.0" - (sources."table-5.4.5" // { + (sources."table-5.4.6" // { dependencies = [ sources."ajv-6.10.2" sources."ansi-regex-4.1.0" @@ -73669,6 +74863,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -73710,7 +74905,7 @@ in sources."tweetnacl-0.14.5" sources."type-1.0.3" sources."type-check-0.3.2" - sources."type-fest-0.5.2" + sources."type-fest-0.3.1" sources."typedarray-0.0.6" sources."underscore-1.6.0" sources."union-value-1.0.1" @@ -73749,7 +74944,6 @@ in sources."semver-6.3.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" - sources."type-fest-0.3.1" sources."url-parse-lax-3.0.0" ]; }) @@ -73759,7 +74953,8 @@ in sources."use-3.1.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."util.promisify-1.0.0" + sources."uuid-3.3.3" sources."verror-1.10.0" sources."vscode-languageserver-types-3.14.0" sources."watchpack-1.6.0" @@ -73774,17 +74969,22 @@ in sources."windows-release-3.2.0" sources."winreg-0.0.12" sources."wordwrap-1.0.0" - (sources."wrap-ansi-2.1.0" // { + (sources."wrap-ansi-5.1.0" // { dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."wrappy-1.0.2" sources."write-1.0.3" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - sources."xml2js-0.4.19" + (sources."xml2js-0.4.22" // { + dependencies = [ + sources."xmlbuilder-11.0.1" + ]; + }) sources."xmlbuilder-9.0.7" sources."xregexp-2.0.0" sources."xtend-4.0.2" @@ -73796,7 +74996,6 @@ in sources."cliui-5.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" - sources."wrap-ansi-5.1.0" sources."y18n-4.0.0" ]; }) @@ -73816,6 +75015,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -73828,14 +75028,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.39.1"; + version = "4.40.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz"; - sha512 = "/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.40.2.tgz"; + sha512 = "5nIvteTDCUws2DVvP9Qe+JPla7kWPPIDFZv55To7IycHWZ+Z5qBdaBYPyuXWdhggTufZkQwfIK+5rKQTVovm2A=="; }; dependencies = [ sources."@webassemblyjs/ast-1.8.5" @@ -73858,7 +75059,7 @@ in sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-6.2.1" + sources."acorn-6.3.0" sources."ajv-6.10.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" @@ -73910,9 +75111,9 @@ in sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" - sources."cacache-12.0.2" + sources."cacache-12.0.3" sources."cache-base-1.0.1" - sources."chokidar-2.1.6" + sources."chokidar-2.1.8" sources."chownr-1.1.2" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" @@ -73948,7 +75149,7 @@ in sources."create-hash-1.2.0" sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" - sources."cyclist-0.2.2" + sources."cyclist-1.0.1" sources."date-now-0.1.4" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" @@ -73957,14 +75158,14 @@ in sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexify-3.7.1" - sources."elliptic-6.5.0" + sources."elliptic-6.5.1" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" sources."enhanced-resolve-4.1.0" sources."errno-0.1.7" sources."eslint-scope-4.0.3" sources."esrecurse-4.2.1" - sources."estraverse-4.2.0" + sources."estraverse-4.3.0" sources."events-3.0.0" sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { @@ -74020,7 +75221,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -74115,11 +75316,11 @@ in sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-browserify-0.3.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."pako-1.0.10" - sources."parallel-transform-1.1.0" + sources."parallel-transform-1.2.0" sources."parse-asn1-5.1.4" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" @@ -74154,14 +75355,14 @@ in sources."repeat-string-1.6.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."schema-utils-1.0.0" - sources."semver-5.7.0" - sources."serialize-javascript-1.7.0" + sources."semver-5.7.1" + sources."serialize-javascript-1.9.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -74231,7 +75432,7 @@ in sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" sources."tapable-1.1.3" - (sources."terser-4.1.3" // { + (sources."terser-4.3.1" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -74242,7 +75443,7 @@ in ]; }) sources."through2-2.0.5" - sources."timers-browserify-2.0.10" + sources."timers-browserify-2.0.11" sources."to-arraybuffer-1.0.1" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -74267,7 +75468,7 @@ in sources."has-values-0.1.4" ]; }) - sources."upath-1.1.2" + sources."upath-1.2.0" sources."uri-js-4.2.2" sources."urix-0.1.0" (sources."url-0.11.0" // { @@ -74303,14 +75504,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.6"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.6.tgz"; - sha512 = "0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz"; + sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw=="; }; dependencies = [ sources."ansi-regex-4.1.0" @@ -74424,7 +75626,7 @@ in ]; }) sources."global-prefix-1.0.2" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -74499,7 +75701,7 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parse-passwd-1.0.0" @@ -74528,7 +75730,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -74631,38 +75833,50 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.0.0"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.0.0.tgz"; - sha512 = "ktehmMXkJbM1gnlPxiiVbTYq0rQHLs+U/A/3pXNt0vIYjHgzsydooejwHZlmL7vxdfZAaSHilbkBDRgWW071rA=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.0.4.tgz"; + sha512 = "aIxXrSAtLmENSEfQlg5xs+wV/nRp+wtckilxxpFp22k428L0DHn6jGRBWEDJ99D1lzmm9UD5NvGe2MpbsDOLOg=="; }; dependencies = [ + sources."@protobufjs/aspromise-1.1.2" + sources."@protobufjs/base64-1.1.2" + sources."@protobufjs/codegen-2.0.4" + sources."@protobufjs/eventemitter-1.1.0" + sources."@protobufjs/fetch-1.1.0" + sources."@protobufjs/float-1.0.2" + sources."@protobufjs/inquire-1.1.0" + sources."@protobufjs/path-1.1.2" + sources."@protobufjs/pool-1.1.0" + sources."@protobufjs/utf8-1.1.0" + sources."@types/long-4.0.0" + sources."@types/node-10.14.18" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" - sources."ascli-0.3.0" sources."async-limiter-1.0.1" sources."balanced-match-1.0.0" sources."bencode-2.0.1" sources."binary-search-1.3.6" sources."bitfield-3.0.0" - (sources."bittorrent-dht-9.0.1" // { + (sources."bittorrent-dht-9.0.3" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - sources."bittorrent-peerid-1.3.0" - (sources."bittorrent-protocol-3.1.0" // { + sources."bittorrent-peerid-1.3.2" + (sources."bittorrent-protocol-3.1.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-9.12.1" // { + (sources."bittorrent-tracker-9.14.4" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -74676,16 +75890,21 @@ in sources."browserify-package-json-1.0.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" sources."bufferutil-4.0.1" - sources."bufferview-1.0.1" - sources."bytebuffer-3.5.5" - sources."castv2-0.1.9" + (sources."castv2-0.1.10" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) sources."castv2-client-1.2.0" sources."charset-1.0.1" + sources."chrome-dgram-3.0.3" + sources."chrome-dns-1.0.1" + sources."chrome-net-3.3.3" (sources."chromecasts-1.9.1" // { dependencies = [ sources."mime-1.6.0" @@ -74693,8 +75912,6 @@ in }) sources."chunk-store-stream-4.1.0" sources."clivas-0.2.0" - sources."closest-to-2.0.0" - sources."colour-0.7.1" sources."common-tags-1.8.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" @@ -74706,9 +75923,10 @@ in ]; }) sources."core-util-is-1.0.2" - sources."create-torrent-4.2.1" + sources."create-torrent-4.4.1" sources."debug-2.6.9" sources."decompress-response-3.3.0" + sources."define-properties-1.1.3" (sources."dlnacasts-0.1.0" // { dependencies = [ sources."mime-1.6.0" @@ -74720,44 +75938,53 @@ in sources."ee-first-1.1.1" sources."elementtree-0.1.7" sources."end-of-stream-1.4.1" + sources."es-abstract-1.14.2" + sources."es-to-primitive-1.2.0" + sources."escape-html-1.0.3" sources."executable-4.1.1" sources."filestream-5.0.0" - (sources."fs-chunk-store-1.7.0" // { + sources."freelist-1.0.3" + (sources."fs-chunk-store-2.0.1" // { dependencies = [ sources."thunky-1.0.3" ]; }) sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."get-browser-rtc-1.0.2" sources."get-stdin-7.0.0" sources."glob-7.1.4" + sources."has-1.0.3" + sources."has-symbols-1.0.0" sources."he-1.2.0" - sources."immediate-chunk-store-2.0.0" + sources."http-node-git://github.com/feross/http-node#webtorrent" + sources."http-parser-js-0.4.13" + sources."immediate-chunk-store-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ip-1.1.5" sources."ip-set-1.0.2" sources."ipaddr.js-1.9.1" sources."is-ascii-1.0.0" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" sources."is-file-1.0.0" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."junk-3.1.0" sources."k-bucket-5.0.0" - (sources."k-rpc-5.0.0" // { - dependencies = [ - sources."k-bucket-4.0.1" - ]; - }) - sources."k-rpc-socket-1.8.0" + sources."k-rpc-5.1.0" + sources."k-rpc-socket-1.11.1" sources."last-one-wins-1.0.4" (sources."load-ip-set-2.1.0" // { dependencies = [ sources."simple-get-3.0.3" ]; }) - sources."long-2.4.0" + sources."long-4.0.0" sources."lru-3.1.0" sources."magnet-uri-5.2.4" sources."mdns-js-0.5.0" @@ -74774,34 +76001,36 @@ in ]; }) sources."moment-2.24.0" - sources."mp4-box-encoding-1.3.0" - sources."mp4-stream-3.0.0" + sources."mp4-box-encoding-1.4.1" + sources."mp4-stream-3.1.0" sources."ms-2.0.0" (sources."multicast-dns-6.2.3" // { dependencies = [ sources."thunky-1.0.3" ]; }) - sources."multistream-3.1.0" + sources."multistream-4.0.0" sources."netmask-1.0.6" sources."network-address-1.1.2" sources."next-event-1.0.0" sources."node-gyp-build-3.7.0" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" + sources."object-inspect-1.6.0" + sources."object-keys-1.1.1" + sources."object.getownpropertydescriptors-2.0.3" sources."on-finished-2.3.0" sources."once-1.4.0" sources."open-6.4.0" - sources."optjs-3.2.2" sources."package-json-versionify-1.0.4" sources."parse-numeric-range-0.0.2" - (sources."parse-torrent-7.0.0" // { + (sources."parse-torrent-7.0.1" // { dependencies = [ sources."simple-get-3.0.3" ]; }) sources."path-is-absolute-1.0.1" - sources."piece-length-1.0.0" + sources."piece-length-2.0.1" sources."pify-2.3.0" (sources."plist-with-patches-0.5.1" // { dependencies = [ @@ -74810,9 +76039,10 @@ in }) sources."prettier-bytes-1.0.4" sources."process-nextick-args-2.0.1" - sources."protobufjs-3.8.2" + sources."protobufjs-6.8.8" sources."pump-3.0.0" sources."qap-3.3.1" + sources."queue-microtask-1.1.2" sources."random-access-file-2.1.3" sources."random-access-storage-1.4.0" sources."random-iterate-1.0.1" @@ -74821,13 +76051,13 @@ in sources."range-slice-stream-2.0.0" sources."readable-stream-3.4.0" sources."record-cache-1.1.0" - (sources."render-media-3.3.0" // { + (sources."render-media-3.4.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - sources."rimraf-2.6.3" + sources."rimraf-3.0.0" sources."run-parallel-1.1.9" sources."run-parallel-limit-1.0.5" sources."run-series-1.1.8" @@ -74843,8 +76073,8 @@ in sources."ms-2.1.2" ]; }) - sources."simple-sha1-2.1.2" - (sources."simple-websocket-8.0.0" // { + sources."simple-sha1-3.0.1" + (sources."simple-websocket-8.0.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -74853,23 +76083,17 @@ in sources."speedometer-1.1.0" sources."split-1.0.1" sources."stream-to-blob-2.0.0" - (sources."stream-to-blob-url-2.1.2" // { - dependencies = [ - sources."stream-to-blob-1.0.2" - ]; - }) + sources."stream-to-blob-url-3.0.0" sources."stream-with-known-length-to-buffer-1.0.3" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."string2compact-1.3.0" - (sources."string_decoder-1.2.0" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."string_decoder-1.3.0" sources."thirty-two-1.0.2" sources."through-2.3.8" sources."thunky-0.1.0" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.1.2" // { + (sources."torrent-discovery-9.2.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -74884,18 +76108,19 @@ in sources."upnp-device-client-1.0.2" sources."upnp-mediarenderer-client-1.2.4" sources."url-join-4.0.1" - (sources."ut_metadata-3.4.0" // { + (sources."ut_metadata-3.5.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - sources."ut_pex-1.2.1" + sources."ut_pex-2.0.0" sources."utf-8-validate-5.0.2" sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.0" sources."videostream-3.2.1" - sources."vlc-command-1.1.2" - (sources."webtorrent-0.106.0" // { + sources."vlc-command-1.2.0" + (sources."webtorrent-0.107.16" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -74904,9 +76129,9 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.1.1" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" + sources."ws-7.1.2" + sources."xml2js-0.4.22" + sources."xmlbuilder-11.0.1" sources."xmldom-0.1.27" ]; buildInputs = globalBuildInputs; @@ -74917,6 +76142,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; wring = nodeEnv.buildNodePackage { name = "wring"; @@ -74934,14 +76160,15 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; write-good = nodeEnv.buildNodePackage { name = "write-good"; packageName = "write-good"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/write-good/-/write-good-1.0.1.tgz"; - sha512 = "wSmjZBTHMOexWmK3AmSORGlWAICD98BF0LORYjkK58tChjjMr/BltpvohCThxmIE2vcHYccXHzSVBd/v8ew71g=="; + url = "https://registry.npmjs.org/write-good/-/write-good-1.0.2.tgz"; + sha512 = "1gm9Ouz7mBROF7aC8vvSm/3JtPfTiZ+fegPGCKdxsYhf6VYeStHfVFx2Hnj2kJviHPx5zZkiQ8DytzZMP0Zqwg=="; }; dependencies = [ sources."adverb-where-0.2.1" @@ -74960,6 +76187,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; yarn = nodeEnv.buildNodePackage { name = "yarn"; @@ -74977,6 +76205,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; yo = nodeEnv.buildNodePackage { name = "yo"; @@ -75093,7 +76322,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.2" sources."copy-descriptor-0.1.1" - sources."core-js-3.1.4" + sources."core-js-3.2.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -75107,9 +76336,11 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."default-uid-1.0.0" + sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" + sources."detect-node-2.0.4" sources."diff-3.5.0" (sources."dir-glob-2.0.0" // { dependencies = [ @@ -75187,6 +76418,7 @@ in sources."from2-2.3.0" sources."fs.realpath-1.0.0" sources."fullname-3.3.0" + sources."function-bind-1.1.1" sources."gauge-1.2.7" sources."get-stdin-4.0.1" sources."get-stream-3.0.0" @@ -75199,16 +76431,17 @@ in ]; }) sources."glob-to-regexp-0.3.0" - (sources."global-agent-2.0.1" // { + (sources."global-agent-2.1.0" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."global-dirs-0.1.1" sources."global-tunnel-ng-2.7.1" + sources."globalthis-1.0.0" sources."globby-8.0.2" sources."got-8.3.2" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."grouped-queue-0.3.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -75227,12 +76460,7 @@ in sources."kind-of-4.0.0" ]; }) - (sources."hosted-git-info-2.8.2" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.0.3" - ]; - }) + sources."hosted-git-info-2.8.4" sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" sources."humanize-string-1.0.2" @@ -75244,7 +76472,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-6.5.0" + sources."inquirer-6.5.2" sources."insight-0.10.3" sources."into-stream-3.1.0" sources."ip-regex-2.1.0" @@ -75275,7 +76503,7 @@ in sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-regexp-1.0.0" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-root-1.0.0" sources."is-scoped-1.0.0" sources."is-stream-1.1.0" @@ -75341,7 +76569,7 @@ in sources."read-pkg-up-1.0.1" ]; }) - sources."merge2-1.2.4" + sources."merge2-1.3.0" sources."micromatch-3.1.10" sources."mime-db-1.40.0" sources."mime-types-2.1.24" @@ -75393,6 +76621,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" @@ -75445,7 +76674,7 @@ in sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -75457,7 +76686,7 @@ in sources."find-up-3.0.0" sources."load-json-file-4.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.2.0" + sources."p-limit-2.2.1" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parse-json-4.0.0" @@ -75494,16 +76723,16 @@ in sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."ret-0.1.15" - sources."roarr-2.13.3" + sources."roarr-2.14.1" sources."root-check-1.0.0" sources."run-async-2.3.0" sources."rx-4.1.0" - sources."rxjs-6.5.2" + sources."rxjs-6.5.3" sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."scoped-regex-1.0.0" - sources."semver-5.7.0" + sources."semver-5.7.1" sources."semver-compare-1.0.0" sources."semver-diff-2.1.0" sources."semver-regex-1.0.0" @@ -75683,7 +76912,7 @@ in sources."use-3.1.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" sources."vinyl-1.2.0" @@ -75749,5 +76978,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; }
\ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index a4a765d70ed..63b388f88eb 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -643,13 +643,13 @@ let sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; }; }; - "fs-minipass-1.2.6" = { + "fs-minipass-1.2.7" = { name = "fs-minipass"; packageName = "fs-minipass"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz"; - sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ=="; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; + sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; }; }; "fs.extra-1.3.2" = { @@ -724,13 +724,13 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "graceful-fs-4.2.1" = { + "graceful-fs-4.2.2" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz"; - sha512 = "b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz"; + sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="; }; }; "grunt-known-options-1.1.1" = { @@ -814,13 +814,13 @@ let sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; - "hosted-git-info-2.8.2" = { + "hosted-git-info-2.8.4" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.8.2"; + version = "2.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz"; - sha512 = "CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz"; + sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="; }; }; "http-signature-1.2.0" = { @@ -1183,15 +1183,6 @@ let sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; }; }; - "lru-cache-5.1.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; - }; - }; "make-iterator-1.0.1" = { name = "make-iterator"; packageName = "make-iterator"; @@ -1264,22 +1255,22 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "minipass-2.3.5" = { + "minipass-2.6.2" = { name = "minipass"; packageName = "minipass"; - version = "2.3.5"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz"; - sha512 = "Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA=="; + url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz"; + sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ=="; }; }; - "minizlib-1.2.1" = { + "minizlib-1.2.2" = { name = "minizlib"; packageName = "minizlib"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz"; - sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA=="; + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz"; + sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ=="; }; }; "mixin-deep-1.3.2" = { @@ -1372,13 +1363,13 @@ let sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; - "npm-package-arg-6.1.0" = { + "npm-package-arg-6.1.1" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz"; - sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA=="; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz"; + sha512 = "qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg=="; }; }; "npm-registry-client-8.6.0" = { @@ -1633,13 +1624,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "psl-1.3.0" = { + "psl-1.4.0" = { name = "psl"; packageName = "psl"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz"; - sha512 = "avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag=="; + url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; + sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; }; }; "punycode-1.4.1" = { @@ -1831,13 +1822,13 @@ let sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; }; }; - "semver-5.7.0" = { + "semver-5.7.1" = { name = "semver"; packageName = "semver"; - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; - sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; "semver-6.1.3" = { @@ -2200,13 +2191,13 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "uuid-3.3.2" = { + "uuid-3.3.3" = { name = "uuid"; packageName = "uuid"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; - sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz"; + sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="; }; }; "v8flags-3.1.3" = { @@ -2312,7 +2303,8 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; + reconstructLock = true; }; coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; @@ -2329,7 +2321,8 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; + reconstructLock = true; }; grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; @@ -2594,7 +2587,8 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; + reconstructLock = true; }; node2nix = nodeEnv.buildNodePackage { name = "node2nix"; @@ -2648,7 +2642,7 @@ in sources."rimraf-2.2.8" ]; }) - sources."fs-minipass-1.2.6" + sources."fs-minipass-1.2.7" (sources."fs.extra-1.3.2" // { dependencies = [ sources."mkdirp-0.3.5" @@ -2658,11 +2652,11 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.4" - sources."graceful-fs-4.2.1" + sources."graceful-fs-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.8.2" + sources."hosted-git-info-2.8.4" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -2677,30 +2671,29 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."lru-cache-5.1.1" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.3.5" - sources."minizlib-1.2.1" + sources."minipass-2.6.2" + sources."minizlib-1.2.2" sources."mkdirp-0.5.1" sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" (sources."normalize-package-data-2.5.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) - (sources."npm-package-arg-6.1.0" // { + (sources."npm-package-arg-6.1.1" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) (sources."npm-registry-client-8.6.0" // { dependencies = [ - sources."semver-5.7.0" + sources."semver-5.7.1" ]; }) (sources."npmconf-2.1.3" // { @@ -2723,7 +2716,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."readable-stream-2.3.6" // { @@ -2768,7 +2761,7 @@ in sources."uid-number-0.0.5" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -2784,6 +2777,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; + reconstructLock = true; }; }
\ No newline at end of file diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 8180373a3dd..8181433e1ee 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildFlags = "setup.data build"; - preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/cryptokit"; + preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; meta = { homepage = http://pauillac.inria.fr/~xleroy/software.html; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index f4e3586b43c..f86909cc10b 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, js_of_ocaml -, jsooSupport ? true +, jsooSupport ? lib.versionAtLeast ocaml.version "4.03" }: with lib; diff --git a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix new file mode 100644 index 00000000000..1ef7b6c2d40 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix @@ -0,0 +1,38 @@ +{ stdenv, ocaml, fetchFromGitHub, ocamlbuild, findlib, ppx_deriving_protobuf }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ocaml-protoc-${version}"; + version = "1.2.0"; + + minimumOCamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "mransan"; + repo = "ocaml-protoc"; + rev = "60d2d4dd55f73830e1bed603cc44d3420430632c"; + sha256 = "1d1p8ch723z2qa9azmmnhbcpwxbpzk3imh1cgkjjq4p5jwzj8amj"; + }; + + installPhase = '' + mkdir -p tmp/bin + export PREFIX=`pwd`/tmp + make all.install.build + make check_install + make lib.install + make bin.install + ''; + + buildInputs = [ ocaml findlib ocamlbuild ]; + propagatedBuildInputs = [ ppx_deriving_protobuf ]; + + createFindlibDestdir = true; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/mransan/ocaml-protoc"; + description = "A Protobuf Compiler for OCaml"; + license = licenses.mit; + maintainers = [ maintainers.vyorkin ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 9499bff84a1..df484b230c2 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH:${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; diff --git a/pkgs/development/ocaml-modules/optint/default.nix b/pkgs/development/ocaml-modules/optint/default.nix index 613973200d2..508bbfba605 100644 --- a/pkgs/development/ocaml-modules/optint/default.nix +++ b/pkgs/development/ocaml-modules/optint/default.nix @@ -1,28 +1,18 @@ -{ stdenv, fetchurl, ocaml, findlib, dune }: +{ lib, buildDunePackage, fetchurl }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" -then throw "optint is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - version = "0.0.2"; - name = "ocaml${ocaml.version}-optint-${version}"; +buildDunePackage rec { + minimumOCamlVersion = "4.03"; + version = "0.0.3"; + pname = "optint"; src = fetchurl { - url = "https://github.com/mirage/optint/releases/download/v0.0.2/optint-v0.0.2.tbz"; - sha256 = "1lmb7nycmkr05y93slqi98i1lcs1w4kcngjzjwz7i230qqjpw9w1"; + url = "https://github.com/mirage/optint/releases/download/v${version}/optint-v${version}.tbz"; + sha256 = "0c7r3s6lal9xkixngkj25nqncj4s33ka40bjdi7fz7mly08djycj"; }; - buildInputs = [ ocaml findlib dune ]; - - buildPhase = "dune build"; - - inherit (dune) installPhase; - meta = { homepage = "https://github.com/mirage/optint"; description = "Abstract type of integer between x64 and x86 architecture"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix new file mode 100644 index 00000000000..4af711ce395 --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, buildDunePackage, cppo, ppx_tools, ppx_deriving +, ppxfind }: + +buildDunePackage rec { + pname = "ppx_deriving_protobuf"; + version = "2.7"; + + src = fetchFromGitHub { + owner = "ocaml-ppx"; + repo = pname; + rev = "v${version}"; + sha256 = "0aq4f3gbkhhai0c8i5mcw2kpqy8l610f4dknwkrxh0nsizwbwryn"; + }; + + buildInputs = [ cppo ppx_tools ppxfind ppx_deriving ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf"; + description = "A Protocol Buffers codec generator for OCaml"; + license = licenses.mit; + maintainers = [ maintainers.vyorkin ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix new file mode 100644 index 00000000000..7746200d4ff --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage, rpclib, ppxfind, ppx_deriving, cppo }: + +buildDunePackage rec { + pname = "ppx_deriving_rpc"; + + inherit (rpclib) version src; + + buildInputs = [ ppxfind cppo ]; + + propagatedBuildInputs = [ rpclib ppx_deriving ]; + + meta = with lib; { + homepage = "https://github.com/mirage/ocaml-rpc"; + description = "Ppx deriver for ocaml-rpc"; + license = licenses.isc; + maintainers = [ maintainers.vyorkin ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 53e8265c3a7..d8a8f22ae70 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "ppx_deriving_yojson"; - version = "3.3"; + version = "3.5.1"; minimumOCamlVersion = "4.04"; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "ocaml-ppx"; repo = "ppx_deriving_yojson"; rev = "v${version}"; - sha256 = "1gbfziw03r9azqlsmyn6izrgrf1xc30s88jgdany1kblpgq41rsz"; + sha256 = "13nscby635vab9jf5pl1wgmdmqw192nf2r26m3gr01hp3bpn38zh"; }; buildInputs = [ ppxfind ounit ]; diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix index 4c5d1edcb09..2c4cf4928db 100644 --- a/pkgs/development/ocaml-modules/xtmpl/default.nix +++ b/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1hq6y4rhz958q40145k4av8hx8jyvspg78xf741samd7vc3jd221"; }; + patches = [ ./jsoo.patch ]; + buildInputs = [ ocaml findlib ppx_tools js_of_ocaml js_of_ocaml-ppx ]; propagatedBuildInputs = [ iri re ]; diff --git a/pkgs/development/ocaml-modules/xtmpl/jsoo.patch b/pkgs/development/ocaml-modules/xtmpl/jsoo.patch new file mode 100644 index 00000000000..7546dbca924 --- /dev/null +++ b/pkgs/development/ocaml-modules/xtmpl/jsoo.patch @@ -0,0 +1,26 @@ +diff --git a/xtmpl_js.ml b/xtmpl_js.ml +index e0d3894..991d1b3 100644 +--- a/xtmpl_js.ml ++++ b/xtmpl_js.ml +@@ -25,6 +25,8 @@ + + (** *) + ++open Js_of_ocaml ++ + let log s = Firebug.console##log (Js.string s);; + + module X = Xtmpl_rewrite +diff --git a/xtmpl_js.mli b/xtmpl_js.mli +index d709896..5ed471c 100644 +--- a/xtmpl_js.mli ++++ b/xtmpl_js.mli +@@ -25,6 +25,8 @@ + + (** Convenient functions to use in JS code *) + ++open Js_of_ocaml ++ + (** Create a new tree of DOM nodes from a given XML tree. + Errors are logged to the firebug console. + @param doc Default is [Dom_html.document]. diff --git a/pkgs/development/python-modules/Logbook/default.nix b/pkgs/development/python-modules/Logbook/default.nix index 866c0410929..503fefc0013 100644 --- a/pkgs/development/python-modules/Logbook/default.nix +++ b/pkgs/development/python-modules/Logbook/default.nix @@ -18,6 +18,9 @@ buildPythonPackage rec { py.test tests ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = { homepage = https://pythonhosted.org/Logbook/; description = "A logging replacement for Python"; diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index b524cb0c6b3..679725db307 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.2.0"; + version = "1.2.1"; # PyPI release tarball doesn't contain tests so let's use GitHub. See: # https://github.com/jmcnamara/XlsxWriter/issues/327 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = pname; rev = "RELEASE_${version}"; - sha256 = "0w9ggzi887w4z6i5mz24kcy7qbkd4d7gycqi0dhqgaj9lzxh7jjh"; + sha256 = "0br8ib9n17dfprfly93mjkhdhpndb7i4g57lwscvp2s69ssql32s"; }; meta = { diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 0afb1c432d6..8d8467207ce 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.0.1"; + version = "2.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "db09e34dfc148279f303481c7da94b84c9b1442a41794f039c31253e81a58ffb"; + sha256 = "0znal1hi964acc8bl3z0ikscax7zziks838ld099rjsbffjwmwn5"; }; propagatedBuildInputs = [ attrs protobuf zeroconf ]; @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Client for ESPHome native API"; - homepage = https://github.com/esphome/aioesphomeapi; + homepage = "https://github.com/esphome/aioesphomeapi"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix index 520e01723e6..654567cc23f 100644 --- a/pkgs/development/python-modules/application/default.nix +++ b/pkgs/development/python-modules/application/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "python-application"; - version = "2.0.2"; + version = "2.7.0"; disabled = isPy3k; src = fetchdarcs { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; - sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn"; + sha256 = "1xpyk2v3naxkjhpyris58dxg1lxbraxgjd6f7w1sah5j0sk7psla"; }; buildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 3b25ce6bcfb..b3c6f3fa1cc 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -1,8 +1,9 @@ -{ pkgs +{ lib , buildPythonPackage , fetchPypi , azure-nspkg , isPyPy +, setuptools , python , isPy3k }: @@ -20,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-nspkg - ]; + ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py @@ -28,7 +29,7 @@ buildPythonPackage rec { doCheck = false; - meta = with pkgs.lib; { + meta = with lib; { description = "This is the Microsoft Azure common code"; homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-common; license = licenses.mit; diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix index e948afd91cf..482c0d190bc 100644 --- a/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; doCheck = false; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index e8683a68e29..84ebf617bae 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "0.50.0"; + version = "0.50.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c5864cfc69402e3e2897e61b3bd224ade28d9e33dad849e4bd6afad26a3d2786"; + sha256 = "0i8ls5h2ny12h9gnqwyq13ysvxgdq7b1kxirj4n58dfy94a182gv"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index a86acbb23ac..50f2023418e 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { sha256 = "1hambr925ml2v2zcxnmnpi39395gl2928yac4p2kghk9xicymraw"; }; + dontUseCmakeConfigure = true; + nativeBuildInputs = [ cmake cython ]; checkInputs = [ pytest ]; propagatedBuildInputs = [ spglib numpy scipy matplotlib ase netcdf4 ]; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index d499a937f50..19eaeaf8d82 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect +{ lib, buildPythonPackage, fetchPypi, libredirect , case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet }: @@ -17,19 +17,17 @@ buildPythonPackage rec { --replace "pytest>=4.3.1,<4.4.0" pytest ''; - # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox - preCheck = stdenv.lib.optionalString stdenv.isLinux '' - export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ - LD_PRELOAD=${libredirect}/lib/libredirect.so - ''; - postCheck = stdenv.lib.optionalString stdenv.isLinux '' - unset NIX_REDIRECTS LD_PRELOAD + # ignore test that's incompatible with pytest5 + # test_eventlet touches network + checkPhase = '' + pytest -k 'not restore_current_app_fallback' \ + --ignore=t/unit/concurrency/test_eventlet.py ''; checkInputs = [ case pytest boto3 moto ]; propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/celery/celery/; description = "Distributed task queue"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 8c55c3ac8bb..9b3050942a8 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -31,9 +31,12 @@ buildPythonPackage rec { checkPhase = '' substituteInPlace pytest.ini --replace "--doctest-modules" "" --replace "-n auto" "" ${lib.optionalString (pythonAtLeast "3.7") "sed -i '/warnings/,+2d' pytest.ini"} - pytest ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} + pytest -k 'not tls' ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "High-performance, pure-Python HTTP"; homepage = https://github.com/cherrypy/cheroot; diff --git a/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/pkgs/development/python-modules/csvs-to-sqlite/default.nix index ab9ca982718..0e5e902be2e 100644 --- a/pkgs/development/python-modules/csvs-to-sqlite/default.nix +++ b/pkgs/development/python-modules/csvs-to-sqlite/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, isPy3k , pytestrunner , click , dateparser @@ -12,17 +13,16 @@ buildPythonPackage rec { pname = "csvs-to-sqlite"; - version = "0.9"; + version = "1.0"; + disabled = !isPy3k; src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = version; - sha256 = "0js86m4kj70g9n9gagr8l6kgswqllg6hn1xa3yvxwv95i59ihpz5"; + sha256 = "0n80y9a6qhbhhbz64jdpscx0nha9jn9nygp9nkgszmw04ri5j5hm"; }; - buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ click dateparser diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 4847d57b67b..201c8ccda70 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -65,7 +65,6 @@ buildPythonPackage rec { programming language. ''; maintainers = with maintainers; [ edwtjo ]; - broken = stdenv.targetPlatform.isDarwin; license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix index 853beaf34a1..265a4cb5712 100644 --- a/pkgs/development/python-modules/demjson/default.nix +++ b/pkgs/development/python-modules/demjson/default.nix @@ -1,9 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy36 }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "demjson"; version = "2.2.4"; - disabled = isPy36; + disabled = isPy3k; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index d9b3bb93264..a57d8307551 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -21,4 +21,7 @@ buildPythonPackage { ''; checkInputs = [ pytest more-itertools ]; + + enableParallelBuilding = true; + dontUseCmakeConfigure = true; } diff --git a/pkgs/development/python-modules/eventlib/default.nix b/pkgs/development/python-modules/eventlib/default.nix index 147e18d45f4..837ffa0d86d 100644 --- a/pkgs/development/python-modules/eventlib/default.nix +++ b/pkgs/development/python-modules/eventlib/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-eventlib"; - version = "0.2.2"; + version = "0.2.4"; # Judging from SyntaxError disabled = isPy3k; src = fetchdarcs { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; - sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8"; + sha256 = "1w1axsm6w9bl2smzxmyk4in1lsm8gk8ma6y183m83cpj66aqxg4z"; }; propagatedBuildInputs = [ greenlet ]; diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix index 960bffb903d..12587e6792d 100644 --- a/pkgs/development/python-modules/face_recognition_models/default.nix +++ b/pkgs/development/python-modules/face_recognition_models/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, stdenv, fetchPypi }: +{ buildPythonPackage, stdenv, fetchPypi, setuptools }: buildPythonPackage rec { pname = "face_recognition_models"; @@ -12,6 +12,8 @@ buildPythonPackage rec { # no module named `tests` as no tests are available doCheck = false; + propagatedBuildInputs = [ setuptools ]; + meta = with stdenv.lib; { homepage = https://github.com/ageitgey/face_recognition_models; license = licenses.cc0; diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix index 1b9542824c0..bb38c738760 100644 --- a/pkgs/development/python-modules/hug/default.nix +++ b/pkgs/development/python-modules/hug/default.nix @@ -1,27 +1,36 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, isPy27 +{ lib , buildPythonPackage, fetchFromGitHub, isPy27 , falcon +, pytestrunner , requests +, pytest +, marshmallow +, mock +, numpy }: buildPythonPackage rec { pname = "hug"; - version = "2.4.8"; + version = "2.6.0"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "2b33904660d07df3a6a998a52d1a36e2855e56dc9ffc4eddb2158e32d1ce7621"; + src = fetchFromGitHub { + owner = "hugapi"; + repo = pname; + rev = version; + sha256 = "05rsv16g7ph100p8kl4l2jba0y4wcpp3xblc02mfp67zp1279vaq"; }; + nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ falcon requests ]; - # tests are not shipped in the tarball - doCheck = false; + checkInputs = [ mock marshmallow pytest numpy ]; + checkPhase = '' + mv hug hug.hidden + # some tests attempt network access + PATH=$out/bin:$PATH pytest -k "not (test_request or test_datagram_request)" + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python framework that makes developing APIs as simple as possible, but no simpler"; homepage = https://github.com/timothycrosley/hug; license = licenses.mit; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 5203047b77f..4bdd9011d1e 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -37,6 +37,9 @@ buildPythonPackage rec { HOME=$(mktemp -d) pytest ipykernel -k "not (test_sys_path or test_sys_path_profile_dir or test_complete)" ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = { description = "IPython Kernel for Jupyter"; homepage = http://ipython.org/; diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix index fe6382f6fb6..59d0d27b8b6 100644 --- a/pkgs/development/python-modules/iso-639/default.nix +++ b/pkgs/development/python-modules/iso-639/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage, setuptools }: buildPythonPackage rec { pname = "iso-639"; @@ -9,6 +9,8 @@ buildPythonPackage rec { sha256 = "dc9cd4b880b898d774c47fe9775167404af8a85dd889d58f9008035109acce49"; }; + propagatedBuildInputs = [ setuptools ]; + meta = with lib; { homepage = https://github.com/noumar/iso639; description = "ISO 639 library for Python"; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 10dbcafd04b..f428e7dbfba 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { cmake ]; + dontUseCmakeConfigure = true; + # we never actually explicitly call the install command so this is the only way # to inject these options to it - however, openmp-library doesn't appear to have # any effect, so we have to inject it into NIX_LDFLAGS manually below diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 364fa4d81be..1438391dc40 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , nose , pyyaml }: @@ -14,6 +15,8 @@ buildPythonPackage rec { sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; }; + propagatedBuildInputs = [ setuptools ]; + checkInputs = [ nose pyyaml ]; meta = { diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix index 209ecf998cc..bf66a886f76 100644 --- a/pkgs/development/python-modules/minidb/default.nix +++ b/pkgs/development/python-modules/minidb/default.nix @@ -1,29 +1,31 @@ -{ stdenv -, buildPythonPackage -, fetchurl +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k , nose +, pytest }: buildPythonPackage rec { pname = "minidb"; version = "2.0.2"; - src = fetchurl { - url = "https://github.com/thp/minidb/archive/${version}.tar.gz"; - sha256 = "17rvkpq8v7infvbgsi48vnxamhxb3f635nqn0sln7yyvh4i9k8a0"; + src = fetchFromGitHub { + owner = "thp"; + repo = "minidb"; + rev = version; + sha256 = "14y5vf8vhgviczhzy9h3xv99fjvrg975nz4w1fj5c1jv37da1lq3"; }; - checkInputs = [ nose ]; - + # module imports are incompatible with python2 + doCheck = isPy3k; + checkInputs = [ nose pytest ]; checkPhase = '' - nosetests test + pytest ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple SQLite3-based store for Python objects"; - homepage = https://thp.io/2010/minidb/; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.tv ]; + homepage = "https://thp.io/2010/minidb/"; + license = licenses.isc; + maintainers = [ maintainers.tv ]; }; } diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix index 32a759a6a49..bba72ea62bb 100644 --- a/pkgs/development/python-modules/msrplib/default.nix +++ b/pkgs/development/python-modules/msrplib/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "python-msrplib"; - version = "0.19"; + version = "0.19.2"; src = fetchdarcs { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; - sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd"; + sha256 = "0d0krwv4hhspjgppnvh0iz51bvdbz23cjasgrppip7x8b00514gz"; }; propagatedBuildInputs = [ eventlib application gnutls ]; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 69828b2b18f..2f0090b5967 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -44,6 +44,9 @@ buildPythonPackage rec { HOME=$(mktemp -d) py.test -v --ignore="nbconvert/preprocessors/tests/test_execute.py" ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = { description = "Converting Jupyter Notebooks"; homepage = https://jupyter.org/; diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 8b16ffb7e32..fbc71202d28 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -29,6 +29,9 @@ buildPythonPackage rec { export HOME=tmp ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = { description = "The Jupyter Notebook format"; homepage = https://jupyter.org/; diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index 60aa4806e2f..860142f1e94 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -45,6 +45,9 @@ buildPythonPackage rec { pytest tests --ignore tests/test_timeouts.py ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A py.test plugin to validate Jupyter notebooks"; homepage = https://github.com/computationalmodelling/nbval; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 85b53bd9df6..a4c66048953 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -3,6 +3,7 @@ , fetchPypi , nose , decorator +, setuptools }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ decorator ]; + propagatedBuildInputs = [ decorator setuptools ]; meta = { homepage = "https://networkx.github.io/"; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 431d4bb4d56..d081a5a92fb 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -64,6 +64,9 @@ buildPythonPackage rec { else ""} ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; homepage = https://jupyter.org/; diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix index 9523a3e28fa..2d113049009 100644 --- a/pkgs/development/python-modules/percol/default.nix +++ b/pkgs/development/python-modules/percol/default.nix @@ -1,7 +1,5 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k +, six }: buildPythonPackage rec { @@ -14,11 +12,14 @@ buildPythonPackage rec { sha256 = "7a649c6fae61635519d12a6bcacc742241aad1bff3230baef2cedd693ed9cfe8"; }; - meta = with stdenv.lib; { + propagatedBuildInputs = [ six ]; + + meta = with lib; { homepage = https://github.com/mooz/percol; description = "Adds flavor of interactive filtering to the traditional pipe concept of shell"; license = licenses.mit; maintainers = with maintainers; [ koral ]; + broken = true; # missing cmigemo package which is missing libmigemo.so + # also doesn't support python3 }; - } diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index 28ca8a3e498..b09c4a240e5 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -1,12 +1,8 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k , nose , mock -, pyyaml -, unittest2 -, pyev , twisted , tornado }: @@ -20,11 +16,7 @@ buildPythonPackage rec { sha256 = "1gqx9avb9nwgiyw5nz08bf99v9b0hvzr1pmqn9wbhd2hnsj6p9wz"; }; - # Tests require twisted which is only availalble for python-2.x - doCheck = !isPy3k; - - buildInputs = [ nose mock pyyaml unittest2 pyev ] - ++ stdenv.lib.optionals (!isPy3k) [ twisted tornado ]; + checkInputs = [ nose mock twisted tornado ]; meta = with stdenv.lib; { description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 5da7a7941c0..7aa66c2a309 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -24,6 +24,9 @@ buildPythonPackage rec { py.test --deselect=test_portend.py::TestChecker::test_check_port_listening ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = with stdenv.lib; { description = "Monitor TCP ports for bound or unbound states"; homepage = https://github.com/jaraco/portend; diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index 14fa0d2f59d..f19f2dfe265 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -1,22 +1,22 @@ { lib, buildPythonPackage, fetchPypi, - cssselect, cssutils, lxml, mock, nose, requests + cssselect, cssutils, lxml, mock, nose, requests, cachetools }: buildPythonPackage rec { pname = "premailer"; version = "3.3.0"; - meta = { - description = "Turns CSS blocks into style attributes "; - homepage = https://github.com/peterbe/premailer; - license = lib.licenses.bsd3; - }; - src = fetchPypi { inherit pname version; sha256 = "93be4f197e9d2a87a8fe6b5b6a79b64070dbb523108dfaf2a415b4558fc78ec1"; }; buildInputs = [ mock nose ]; - propagatedBuildInputs = [ cssselect cssutils lxml requests ]; + propagatedBuildInputs = [ cachetools cssselect cssutils lxml requests ]; + + meta = { + description = "Turns CSS blocks into style attributes "; + homepage = https://github.com/peterbe/premailer; + license = lib.licenses.bsd3; + }; } diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 44acbe5c7a9..5590337951b 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" ]; + dontUseCmakeConfigure = true; + preBuild = '' export PYARROW_PARALLEL=$NIX_BUILD_CORES ''; diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix deleted file mode 100644 index b5ca0c7ef6c..00000000000 --- a/pkgs/development/python-modules/pyev/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, buildPythonPackage, libev }: - -buildPythonPackage rec { - pname = "pyev"; - version = "0.9.0"; - - src = fetchurl { - url = "mirror://pypi/p/pyev/${pname}-${version}.tar.gz"; - sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx"; - }; - - buildInputs = [ libev ]; - - libEvSharedLibrary = - if !stdenv.isDarwin - then "${libev}/lib/libev.so.4" - else "${libev}/lib/libev.4.dylib"; - - postPatch = '' - test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; } - sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py - ''; - - meta = with stdenv.lib; { - description = "Python bindings for libev"; - homepage = https://code.google.com/p/pyev/; - license = licenses.gpl3; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/development/python-modules/perf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 6c209ba8da0..51a08e1f7ea 100644 --- a/pkgs/development/python-modules/perf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - pname = "perf"; - version = "1.6.0"; + pname = "pyperf"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1vrv83v8rhyl51yaxlqzw567vz5a9qwkymk3vqvcl5sa2yd3mzgp"; + sha256 = "8d0143a22a13ee10c997a648f30b82cdc40175d5a20b11055ae058a82e45d371"; }; checkInputs = [ nose psutil ] ++ @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to generate and modify perf"; - homepage = https://github.com/vstinner/perf; + homepage = "https://pyperf.readthedocs.io/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest/2.nix b/pkgs/development/python-modules/pytest/4.nix index 7a43a2e2517..7a43a2e2517 100644 --- a/pkgs/development/python-modules/pytest/2.nix +++ b/pkgs/development/python-modules/pytest/4.nix diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 506b560e01a..1ddf52a33bd 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -6,6 +6,8 @@ buildPythonPackage rec { version = "5.1.0"; pname = "pytest"; + disabled = !isPy3k; + preCheck = '' # don't test bash builtins rm testing/test_argcomplete.py @@ -19,7 +21,6 @@ buildPythonPackage rec { checkInputs = [ hypothesis mock ]; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] - ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 93dd9fb654f..bf6d4cd2381 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -1,27 +1,25 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, six +{ stdenv, buildPythonPackage, fetchFromGitHub +, aiohttp , eventlet -, mock , iana-etc , libredirect -, aiohttp -, websockets -, websocket_client +, mock , requests +, six , tornado +, websocket_client +, websockets }: buildPythonPackage rec { pname = "python-engineio"; - version = "3.4.3"; + version = "3.9.3"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "0wk81rqigw47z087f5kc7b9iwqggypxc62q8q818qyzqwb93ysxf"; + sha256 = "0rwlj12d37dpw6y3bdn6rxv68xnd9ykj4fr3ly0fa143xci35d9y"; }; propagatedBuildInputs = [ @@ -29,13 +27,13 @@ buildPythonPackage rec { ]; checkInputs = [ + aiohttp eventlet mock - aiohttp - websockets - websocket_client - tornado requests + tornado + websocket_client + websockets ]; # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index dcab96d12a6..40273cce888 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -32,4 +32,7 @@ buildPythonPackage rec { and not test_on_recv_wake \ and not test_monitor" ''; + + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; } diff --git a/pkgs/development/python-modules/scikitlearn/0.20.nix b/pkgs/development/python-modules/scikitlearn/0.20.nix index b1c074faa8f..92977331a84 100644 --- a/pkgs/development/python-modules/scikitlearn/0.20.nix +++ b/pkgs/development/python-modules/scikitlearn/0.20.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.20.3"; + version = "0.20.4"; # UnboundLocalError: local variable 'message' referenced before assignment disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41"; + sha256 = "1z3w2c50dwwa297j88pr16pyrjysagsvdj7vrlq40q8777rs7a6z"; }; buildInputs = [ pillow gfortran glibcLocales ]; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 7eb020bbe60..939782722c6 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchPypi +, fetchpatch , gfortran, glibcLocales , numpy, scipy, pytest, pillow , cython @@ -40,6 +41,15 @@ buildPythonPackage rec { ]; checkInputs = [ pytest ]; + patches = [ + # Fixes tests by changing threshold of a test-case that broke + # with numpy versions >= 1.17. This should be removed for versions > 0.21.2. + ( fetchpatch { + url = "https://github.com/scikit-learn/scikit-learn/commit/b730befc821caec5b984d9ff3aa7bc4bd7f4d9bb.patch"; + sha256 = "0z36m05mv6d494qwq0688rgwa7c4bbnm5s2rcjlrp29fwn3fy1bv"; + }) + ]; + LC_ALL="en_US.UTF-8"; doCheck = !stdenv.isAarch64; diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 82f1315ba3d..5ade47587d1 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , pbr , pytest }: @@ -16,7 +17,9 @@ buildPythonPackage rec { buildInputs = [ pbr ]; checkInputs = [ pytest ]; - propagatedBuildInputs = [ ]; + + # test suite uses new async primitives + doCheck = !isPy27; meta = with stdenv.lib; { homepage = https://github.com/codingjoe/ssdp; diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index e2ba008d3a0..601e49759fd 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -36,6 +36,9 @@ buildPythonPackage rec { pytest ''; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = { description = "High quality TLS certs while you wait, for the discerning tester"; homepage = https://github.com/python-trio/trustme; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 10b25460cef..249ddb4be86 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -11,6 +11,7 @@ , attrs , pyopenssl , service-identity +, setuptools , idna }: buildPythonPackage rec { @@ -23,7 +24,7 @@ buildPythonPackage rec { sha256 = "294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395"; }; - propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs ]; + propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ]; passthru.extras.tls = [ pyopenssl service-identity idna ]; diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index ff0c61c5e07..fc6c2b77794 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -1,24 +1,21 @@ -{ CFNetwork -, Security -, buildPythonPackage +{ lib, buildPythonPackage, fetchPypi, isPy3k , certifi +, CFNetwork , cmake , enum34 -, fetchPypi -, isPy3k -, lib , openssl -, stdenv +, Security , six +, stdenv }: buildPythonPackage rec { pname = "uamqp"; - version = "1.1.0"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "d3d4ff94bf290adb82fe8c19af709a21294bac9b27c821b9110165a34b922015"; + sha256 = "0wmyw2l2pha5s6khih96lkfa90zyfy2mqsg8cx6vplmrmpx2s52i"; }; buildInputs = [ @@ -31,6 +28,8 @@ buildPythonPackage rec { CFNetwork Security ]; + dontUseCmakeConfigure = true; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 1bf0d1c54f0..9f7efef1e84 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -1,23 +1,27 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , click , h11 , httptools , uvloop , websockets , wsproto +, pytest +, requests , isPy27 }: buildPythonPackage rec { pname = "uvicorn"; - version = "0.8.4"; + version = "0.9.0"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "1l8rfm30inx9pma893i7sby9h7y910k58841zqaajksn563b882k"; + src = fetchFromGitHub { + owner = "encode"; + repo = pname; + rev = version; + sha256 = "0z4h04mbkzqgpk698bac6f50jxkf02ils6khzl7zbw7yvi6gkkc8"; }; propagatedBuildInputs = [ @@ -29,11 +33,15 @@ buildPythonPackage rec { wsproto ]; - checkPhase = '' - $out/bin/uvicorn --help + postPatch = '' + substituteInPlace setup.py \ + --replace "h11==0.8.*" "h11" ''; - patches = [ ./setup.patch ]; + checkInputs = [ pytest requests ]; + checkPhase = '' + pytest + ''; meta = with lib; { homepage = https://www.uvicorn.org/; diff --git a/pkgs/development/python-modules/uvicorn/setup.patch b/pkgs/development/python-modules/uvicorn/setup.patch deleted file mode 100644 index f1d974b42d9..00000000000 --- a/pkgs/development/python-modules/uvicorn/setup.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 802cda4..561abf4 100755 ---- a/setup.py -+++ b/setup.py -@@ -42,7 +42,7 @@ env_marker = ( - - requirements = [ - "click==7.*", -- "h11==0.8.*", -+ "h11", - "websockets==7.*", - "httptools==0.0.13 ;" + env_marker, - "uvloop==0.12.* ;" + env_marker, diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 2e0caae4b46..589a8089fca 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -1,24 +1,26 @@ { lib -, fetchPypi +, fetchFromGitHub , buildPythonPackage , pythonOlder +, pytest }: buildPythonPackage rec { pname = "websockets"; - version = "7.0"; + version = "8.0.2"; - src = fetchPypi { - inherit pname version; - sha256 = "17vwr6sa1y3lb24wzfyyc98c5v03di4j8f24qkqa9vsvaghc7qq8"; + src = fetchFromGitHub { + owner = "aaugustin"; + repo = pname; + rev = version; + sha256 = "02fgb8gib4z5fqv30brz3mhxmblw9bw0978fhpjdrkj7wvqrz5h8"; }; disabled = pythonOlder "3.3"; - doCheck = false; # protocol tests fail - meta = { + meta = with lib; { description = "WebSocket implementation in Python 3"; - homepage = https://github.com/aaugustin/websockets; - license = lib.licenses.bsd3; + homepage = "https://github.com/aaugustin/websockets"; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index d8482872bc3..f3d60253ae4 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -30,6 +30,9 @@ buildPythonPackage rec { checkInputs = [ nose mock PasteDeploy wsgiproxy2 pyquery ]; + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; + meta = with stdenv.lib; { description = "Helper to test WSGI applications"; homepage = https://webtest.readthedocs.org/en/latest/; diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix index 7dc67072046..7002c43cf2b 100644 --- a/pkgs/development/python-modules/xcaplib/default.nix +++ b/pkgs/development/python-modules/xcaplib/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-xcaplib"; - version = "1.2.0"; + version = "1.2.1"; disabled = isPy3k; src = fetchdarcs { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; - sha256 = "0vna5r4ihv7z1yx6r93954jqskcxky77znzy1m9dg9vna1dgwfdn"; + sha256 = "15ww8f0a9zh37mypw5s4q1qk44cwf7jlhc9q1z4vjlpvnzimg54v"; }; propagatedBuildInputs = [ eventlib application ]; diff --git a/pkgs/development/python-modules/zake/default.nix b/pkgs/development/python-modules/zake/default.nix index 143f609d833..56fdbe45553 100644 --- a/pkgs/development/python-modules/zake/default.nix +++ b/pkgs/development/python-modules/zake/default.nix @@ -19,6 +19,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ kazoo six ]; buildInputs = [ testtools ]; checkPhase = '' + # Skip test - fails with our new kazoo version + substituteInPlace zake/tests/test_client.py \ + --replace "test_child_watch_no_create" "_test_child_watch_no_create" + ${python.interpreter} -m unittest discover zake/tests ''; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 1aa03983f68..72a6e1ba229 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -1,5 +1,6 @@ { fetchPypi , lib +, fetchpatch , buildPythonPackage , isPy3k , appdirs @@ -33,6 +34,13 @@ buildPythonPackage rec { sha256 = "0e98669cfeb60756231ae185498f9ae21b30b2681786b8de58ed34c3b93e41dd"; }; + patches = [ + ( fetchpatch { + url = "https://github.com/mvantellingen/python-zeep/pull/1006/commits/ba7edd6bf2b31023b31e8f17c161e1d6d5af3d29.patch"; + sha256 = "1j0jd5hmh457im9sbawaqf6pnfy36fhr9wqdim8wk5da9ixr0ajs"; + }) + ]; + propagatedBuildInputs = [ appdirs attrs diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index e9f57d2b85f..a03e40e8097 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -507,7 +507,10 @@ in substituteInPlace lib/sassc/native.rb \ --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")' ''; - }; + } // (if stdenv.isDarwin then { + # https://github.com/NixOS/nixpkgs/issues/19098 + buildFlags = "--disable-lto"; + } else {}); scrypt = attrs: if stdenv.isDarwin then { diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index cd8ae42f20b..41949b0ad42 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -110,17 +110,17 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "22646"; - gittap = "3.8.0"; - gittip = "b4860e4eecad2053202965926f16296864b2f1e5"; - rev = "3.8.0"; - version = "3.8.0"; - sha256 = "0rx6az2vpqy12lvzpxx9pappqj84d88daj8bis3zsffqgmhsafcd"; + version_commit = "22775"; + gittap = "3.9.0"; + gittip = "2afe613741d07f35a5d80bc4e2dade2113ae6a74"; + rev = "3.9.0"; + version = "3.9.0"; + sha256 = "0jzz3fzcr9xm8q6n86mhrf30h6cbh147ss9h993cm34fd4d5z7ah"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "22265"; + version_commit = "22775"; gittap = "3.6.0"; gittip = "ff3bb6e3b2e6a519b4c975d05758c171a5186389"; rev = "ff3bb6e3b2e6a519b4c975d05758c171a5186389"; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 7dca029d557..8c47a8bc069 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tflint"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "wata727"; repo = pname; rev = "v${version}"; - sha256 = "0aff7ckl245cyjs2rbgczkqlp2x6g4g458p4li0k1agk3m9bbq35"; + sha256 = "0aw39xv6jpnhy201gp9jhz6cbz47k7qgxgcwsffak8janbk6bj2a"; }; modSha256 = "1facqppgpmmz2j7j77fa3mnjv2nzjxz4ya6xvyvyy92ma0ybclgh"; diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index 83f87ac9661..d25367c3e57 100644 --- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { --replace "/bin/ls" "ls" substituteInPlace t/110-compile/hello.o.do \ - --replace "/usr/include" "${stdenv.cc.libc.dev}/include" + --replace "/usr/include" "${stdenv.lib.getDev stdenv.cc.libc}/include" substituteInPlace t/200-shell/nonshelltest.do \ --replace "/usr/bin/env perl" "${perl}/bin/perl" diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 4187d062950..754c014ee16 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cue"; - version = "0.0.3"; + version = "0.0.11"; src = fetchgit { url = "https://cue.googlesource.com/cue"; rev = "v${version}"; - sha256 = "1abvvgicr64ssiprkircih2nrbcr1yqxf1qkl21kh0ww1xfp0rw7"; + sha256 = "146h3nxx72n3byxr854lnxj7m33ipbmg6j9dy6dlwvqpa7rndrmp"; }; - modSha256 = "0r5vbplcfq1rsp2jnixq6lfbpcv7grf0q38na76qy7pjb57zikb6"; + modSha256 = "1q0fjm34mbijjxg089v5330vc820nrvwdkhm02zi45rk2fpdgdqd"; subPackages = [ "cmd/cue" ]; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 670e2e1e349..edad5d6276b 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -4,8 +4,8 @@ buildGoPackage rec { pname = "doctl"; version = "${major}.${minor}.${patch}"; major = "1"; - minor = "18"; - patch = "0"; + minor = "31"; + patch = "2"; goPackagePath = "github.com/digitalocean/doctl"; excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)''; @@ -18,10 +18,10 @@ buildGoPackage rec { ''; src = fetchFromGitHub { - owner = "digitalocean"; + owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "1p43q1iyjj597gr47hn589fv7n26mny9niq7yb9hlmslkplsrb0a"; + sha256 = "1q71kfjiav8xfw1bb3dziik1d0jr84hl83d3sx3cak0nd9nmakgs"; }; meta = { diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock index fbfba32814b..28bd27ecc76 100644 --- a/pkgs/development/tools/jazzy/Gemfile.lock +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -1,18 +1,18 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.0) + CFPropertyList (3.0.1) activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) atomos (0.1.3) - claide (1.0.2) - cocoapods (1.7.4) + claide (1.0.3) + cocoapods (1.7.5) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.4) + cocoapods-core (= 1.7.5) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.4) + cocoapods-core (1.7.5) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -38,7 +38,7 @@ GEM nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.3.1) + cocoapods-trunk (1.4.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) @@ -51,13 +51,13 @@ GEM gh_inspector (1.1.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.10.0) + jazzy (0.11.1) cocoapods (~> 1.5) mustache (~> 1.1) open4 redcarpet (~> 3.4) rouge (>= 2.0.6, < 4.0) - sass (~> 3.6) + sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) liferaft (0.0.6) @@ -68,24 +68,18 @@ GEM nap (1.1.0) netrc (0.11.0) open4 (1.3.4) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) - ffi (~> 1.0) - redcarpet (3.4.0) - rouge (3.6.0) + redcarpet (3.5.0) + rouge (3.11.0) ruby-macho (1.4.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.2.1) + ffi (~> 1.9) sqlite3 (1.4.1) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.11.0) + xcodeproj (1.12.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix index ae544229a50..19ec06b6a2b 100644 --- a/pkgs/development/tools/jazzy/gemset.nix +++ b/pkgs/development/tools/jazzy/gemset.nix @@ -25,18 +25,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z"; + sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; claide = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; + sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; cocoapods = { dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; @@ -44,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc"; + sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz"; type = "gem"; }; - version = "1.7.4"; + version = "1.7.5"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -55,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c"; + sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4"; type = "gem"; }; - version = "1.7.4"; + version = "1.7.5"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -113,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1plssgabdv6hcaq1c3gf43kf1d2prx883q8lzdr6chi5byzzs3yl"; + sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; cocoapods-try = { source = { @@ -202,15 +204,15 @@ version = "0.9.5"; }; jazzy = { - dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rouge" "sass" "sqlite3" "xcinvoke"]; + dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rouge" "sassc" "sqlite3" "xcinvoke"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sljk5v4823h7kzf0yag7f1vf6sahpqip62xngvrhm3il9dx3j72"; + sha256 = "0kdja4bhzak79xvfpwwakqsjw07vfg458d62k08a416im7xcfcmc"; type = "gem"; }; - version = "0.10.0"; + version = "0.11.1"; }; liferaft = { source = { @@ -284,44 +286,25 @@ }; version = "1.3.4"; }; - rb-fsevent = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; - type = "gem"; - }; - version = "0.10.3"; - }; - rb-inotify = { - dependencies = ["ffi"]; + redcarpet = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; + sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; type = "gem"; }; - version = "0.10.0"; - }; - redcarpet = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; - type = "gem"; - }; - version = "3.4.0"; + version = "3.5.0"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bxjfg6bgc6zpczc5nsmpd6406b97fg0hldl968rgxkz1m6hblda"; + sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb"; type = "gem"; }; - version = "3.6.0"; + version = "3.11.0"; }; ruby-macho = { groups = ["default"]; @@ -333,25 +316,16 @@ }; version = "1.4.0"; }; - sass = { - dependencies = ["sass-listen"]; + sassc = { + dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; - type = "gem"; - }; - version = "3.7.4"; - }; - sass-listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; + sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz"; type = "gem"; }; - version = "4.0.0"; + version = "2.2.1"; }; sqlite3 = { groups = ["default"]; @@ -397,9 +371,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j"; + sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; }
\ No newline at end of file diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix new file mode 100644 index 00000000000..102f911bf85 --- /dev/null +++ b/pkgs/development/tools/micronaut/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchzip, jdk, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "micronaut"; + version = "1.2.1"; + + src = fetchzip { + url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; + sha256 = "0lfl2hfakpdcfii3a3jr6kws731jamy4fb3dmlnj5ydk0zbnmk6r"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + rm bin/mn.bat + cp -r . $out + wrapProgram $out/bin/mn \ + --prefix JAVA_HOME : ${jdk} + ''; + + meta = with stdenv.lib; { + description = '' + A modern, JVM-based, full-stack framework for building modular, + easily testable microservice and serverless applications. + ''; + longDescription = '' + Reflection-based IoC frameworks load and cache reflection data for + every single field, method, and constructor in your code, whereas with + Micronaut, your application startup time and memory consumption are + not bound to the size of your codebase. + ''; + homepage = https://micronaut.io/; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ moaxcp ]; + }; +} diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index e1b89d07cdf..a590d4a6106 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ stdenv, fetchFromGitHub, buildGoModule }: -let - owner = "CircleCI-Public"; +buildGoModule rec { pname = "circleci-cli"; - version = "0.1.2569"; -in -buildGoPackage { - name = "${pname}-${version}"; - inherit version; + version = "0.1.5879"; - src = fetchFromGitHub { - inherit owner; + src = fetchFromGitHub { + owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0ixiqx8rmia02r44zbhw149p5x9r9cv1fsnlhl8p2x5zd2bdr18x"; + sha256 = "1471g56apaw0c5dpa0jrr7hvzh3kbwfr3yr0m4mz2dlf27d481ac"; }; - goPackagePath = "github.com/${owner}/${pname}"; + modSha256 = "0cvmcsl00jfikpkw3f7k5zw65156z5g5l2b6s5803a2i9d613268"; + + preBuild = '' + substituteInPlace data/data.go \ + --replace 'packr.New("circleci-cli-box", "../_data")' 'packr.New("circleci-cli-box", "${placeholder "out"}/share/circleci-cli")' + ''; + + postInstall = '' + install -Dm644 -t $out/share/circleci-cli _data/data.yml + ''; meta = with stdenv.lib; { # Box blurb edited from the AUR package circleci-cli @@ -25,7 +29,6 @@ buildGoPackage { run jobs as if they were running on the hosted CirleCI application. ''; maintainers = with maintainers; [ synthetica ]; - platforms = platforms.unix; license = licenses.mit; homepage = https://circleci.com/; }; diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index 23c01338f60..cb127906c0b 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -1,17 +1,19 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "elfinfo"; - version = "0.7.5"; + version = "0.7.6"; goPackagePath = "github.com/xyproto/elfinfo"; src = fetchFromGitHub { rev = version; owner = "xyproto"; repo = "elfinfo"; - sha256 = "0b6zyfq0yhpbf03h52q2lgf6ff086gcsbnhm6chx18h0q1g17m96"; + sha256 = "0f6ik4d157assxdfslnyc91mg70kfh396rapikfv473znx2v2pg9"; }; + modSha256 = "1xr0pylaqcb4f4g862120cgqdxp0bpwsk77zd6g7kk91lqdcvsdf"; + meta = with stdenv.lib; { description = "Small utility for showing information about ELF files"; homepage = https://elfinfo.roboticoverlords.org/; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 0d50c772bde..4a65d088834 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,9 +1,9 @@ -{ stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub +{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar -, rpm, dpkg, cdrkit, pixz, lib, fetchpatch, boost, autoreconfHook +, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook }: with stdenv; @@ -67,17 +67,17 @@ let boehmgc ]; }; -in releaseTools.nixBuild rec { +in stdenv.mkDerivation rec { pname = "hydra"; - version = "2019-05-06"; + version = "2019-08-30"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = pname; - rev = "ff64583d07f046e378a6be596ec0ce7a9e2b7472"; - sha256 = "0w88q0saz7si22z3ryim6vdrv9qkwn6l25xfmiapvh5qrnrrdcb9"; + rev = "242b8b7a314759ed33f69205d26a1b7c337511e0"; + sha256 = "167ijcf9qdm10kjvqax3hcvs5mpa4mx2y2i9idwwc6xfvn8fhs84"; }; buildInputs = @@ -97,13 +97,6 @@ in releaseTools.nixBuild rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - patches = [ - (fetchpatch { - url = "https://github.com/NixOS/hydra/pull/648/commits/4171ab4c4fd576c516dc03ba64d1c7945f769af0.patch"; - sha256 = "1fxa2459kdws6qc419dv4084c1ssmys7kqg4ic7n643kybamsgrx"; - }) - ]; - configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; NIX_CFLAGS_COMPILE = [ "-pthread" ]; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index b9a4658d3de..998abe112a6 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }: rustPlatform.buildRustPackage rec { - version = "0.2.10"; + version = "0.2.11"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = version; - sha256 = "13fiifv3bi9shzp30wd7k2nd2j43vzdhk6z5rnfn5a9hmijqpg9n"; + sha256 = "0084ddvzjgdpkwqc38kvzaz8n6av9ml3qqlkjma70hsis8w8gqjz"; }; cargoSha256 = "1bkglgrasyjyzjj9mwm32d3g3mg5yv74jj3zl7jf20dlq3rg3fh6"; diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix index 573575f2d4f..333e413a4c4 100644 --- a/pkgs/development/tools/misc/terraform-lsp/default.nix +++ b/pkgs/development/tools/misc/terraform-lsp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-lsp"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "juliosueiras"; repo = pname; rev = "v${version}"; - sha256 = "018ypvmd9cwys5l7rm1c7b9jf8fljdk0m22id32d88jiw4iwq44m"; + sha256 = "1nalypaw64kdv5zmmb0xgkajhs2gf71ivbxvgwpgvlv2lyidawx5"; }; - modSha256 = "1196fn69nnplj7sz5mffawf58j9n7h211shv795gknvfnwavh344"; + modSha256 = "1mb3169vdlv4h10k15pg88s48s2b6y7v5frk9j9ahg52grygcqb2"; meta = with lib; { description = "Language Server Protocol for Terraform"; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index bad3ecd9241..47aa4917814 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation { platforms = platforms.unix; # universal-ctags is preferred over emacs's ctags priority = 1; - maintainers = [ maintainers.mimadrid ]; + maintainers = [ maintainers.mimame ]; }; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index c1526892312..c449c0f9002 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,35 +1,26 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, dune +{ lib, fetchFromGitHub, buildDunePackage , cmdliner, cppo, yojson }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" -then throw "js_of_ocaml-compiler is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; rev = version; - sha256 = "0bg8x2s3f24c8ia2g293ikd5yg0yjw3hkdgdql59c8k2amqin8f8"; + sha256 = "0c537say0f3197zn8d83nrihabrxyn28xc6d7c9c3l0vvrv6qvfj"; }; - buildInputs = [ ocaml findlib dune cmdliner cppo ]; + buildInputs = [ cmdliner cppo ]; propagatedBuildInputs = [ yojson ]; - buildPhase = "dune build -p js_of_ocaml-compiler"; - - inherit (dune) installPhase; - meta = { description = "Compiler from OCaml bytecode to Javascript"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix new file mode 100644 index 00000000000..5d8376acdb3 --- /dev/null +++ b/pkgs/development/tools/pgformatter/default.nix @@ -0,0 +1,40 @@ +{ stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }: + +perlPackages.buildPerlPackage rec { + pname = "pgformatter"; + version = "4.0"; + + src = fetchFromGitHub { + owner = "darold"; + repo = "pgFormatter"; + rev = "v${version}"; + sha256 = "09p242s406mf469p66zp1jmp9pxcim2vk1v6qsxnrbzicchsn5i2"; + }; + + outputs = [ "out" ]; + + makeMakerFlags = [ "INSTALLDIRS=vendor" ]; + + # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS. + patchPhase = '' + substituteInPlace pg_format \ + --replace "#!/usr/bin/env perl" "#!/usr/bin/perl" + substituteInPlace Makefile.PL \ + --replace "'DESTDIR' => \$DESTDIR," "'DESTDIR' => '$out/'," \ + --replace "'INSTALLDIRS' => \$INSTALLDIRS," "'INSTALLDIRS' => \$INSTALLDIRS, 'INSTALLVENDORLIB' => 'bin/lib', 'INSTALLVENDORBIN' => 'bin', 'INSTALLVENDORSCRIPT' => 'bin', 'INSTALLVENDORMAN1DIR' => 'share/man/man1', 'INSTALLVENDORMAN3DIR' => 'share/man/man3'," + ''; + + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/pg_format + ''; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI"; + homepage = "https://github.com/darold/pgFormatter"; + maintainers = [ maintainers.marsam ]; + license = [ licenses.postgresql licenses.artistic2 ]; + }; +} diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index c8f7ccb18d5..7e592bf060a 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, fetchgit, fetchpatch, makeWrapper +{ mkDerivation, lib, fetchurl, fetchgit, fetchpatch , qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8 , withDocumentation ? false }: -with stdenv.lib; +with lib; let baseVersion = "4.9"; @@ -21,7 +21,7 @@ let }); in -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qtcreator"; version = "${baseVersion}.${revision}"; diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index ec2325fc625..79b1214de65 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-inspect"; @@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0rjy8jlar939fkl7wi8a6zxsrl4axz2nrhv745ny8x38ii4sfbzr"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + cargoSha256 = "1pxvcf991w0jfxdissvwal5slrx7vpk3rqkzwk4hxfv0mjiqxsg5"; meta = with lib; { diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index bfc30193eed..fab0dc05c45 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }: +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper , Security }: with rustPlatform; @@ -19,7 +19,8 @@ buildRustPackage rec { cargoSha256 = "15894qr0kpp5kivx0p71zmmfhfh8in0ydkvfirxh2r12x0r2jhdd"; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper ] + ++ stdenv.lib.optional stdenv.isDarwin Security; RUST_SRC_PATH = rustPlatform.rustcSrc; diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch index 74da8d6102e..d46ad59109e 100644 --- a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch +++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch @@ -1,8 +1,8 @@ diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs -index e0fdea28..38d9d0e4 100644 +index 4b432785..fa45e87e 100644 --- a/src/dist/component/package.rs +++ b/src/dist/component/package.rs -@@ -104,10 +104,11 @@ impl Package for DirectoryPackage { +@@ -109,10 +109,11 @@ impl Package for DirectoryPackage { match &*part.0 { "file" => { if self.copy { @@ -16,10 +16,10 @@ index e0fdea28..38d9d0e4 100644 } "dir" => { if self.copy { -@@ -132,6 +133,22 @@ impl Package for DirectoryPackage { +@@ -135,6 +136,22 @@ impl Package for DirectoryPackage { } } - + +fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) { + let is_bin = if let Some(p) = src_path.parent() { + p.ends_with("bin") @@ -36,6 +36,6 @@ index e0fdea28..38d9d0e4 100644 + } +} + - // On Unix we need to set up the file permissions correctly so - // binaries are executable and directories readable. This shouldn't be - // necessary: the source files *should* have the right permissions, + #[derive(Debug)] + pub struct TarPackage<'a>(DirectoryPackage, temp::Dir<'a>); + diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 0bf1c61c959..ec0eb08bf23 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.18.3"; + version = "1.19.0"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup.rs"; rev = version; - sha256 = "062l893i9czm1lm0x3arj3vfnjg3fg8q8xvq3y4adakmk6yrcc4x"; + sha256 = "1c0qz9s09ikgy23yssd57v7b5s005y128sldmq0xd9i1fryp129z"; }; - cargoSha256 = "1zwlr0zxc97m6xr28ryq5hkrvcns6qg68h7w09sga23xinm3fr11"; + cargoSha256 = "0rjm01pnb2w39c0jrscmhhsx9gsi3sl9cxd838m77h9pzwsp1h40"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 5743868d5d9..939b065a55c 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.16.0"; - sha256 = "0236jlb1hxhzqjlmmlxipcycrndiq92c8434iyy7zshh3n4pzqqq"; + version = "10.16.3"; + sha256 = "1gbblbmvx7a0wkgp3fs2pf5c1hymdpnfc7zqp1slg5hmfhyi5wbv"; } diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index a625a815603..c48d16fcae9 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "valum"; - version = "0.3.15"; + version = "0.3.16"; src = fetchFromGitHub { owner = "valum-framework"; repo = "valum"; rev = "v${version}"; - sha256 = "1wk23aq5lxsqns58s4g9jrwx6wrk7k9hq9rg8jcs42rxn2pckaxw"; + sha256 = "15lnk91gykm60rv31x3r1swp2bhzl3gwp12mf39smzi4bmf7h38f"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix new file mode 100644 index 00000000000..7a9ac7d381c --- /dev/null +++ b/pkgs/games/chiaki/default.nix @@ -0,0 +1,31 @@ +{ lib, mkDerivation, fetchFromGitHub +, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf +, python3Packages, SDL2 }: + +mkDerivation rec { + pname = "chiaki"; + version = "1.0.3"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "thestr4ng3r"; + repo = "chiaki"; + fetchSubmodules = true; + sha256 = "09c6izprqqvhn1vbr2897ql05w5c7iqakm6jn795a5faghjm1mah"; + }; + + nativeBuildInputs = [ + cmake pkgconfig protobuf python3Packages.python python3Packages.protobuf + ]; + buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/thestr4ng3r/chiaki"; + description = "Free and Open Source PS4 Remote Play Client"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ delroth ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index e2a4cff291b..f58f86cd8fb 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://klavaro.sourceforge.net/; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [stdenv.lib.maintainers.mimadrid]; + maintainers = [stdenv.lib.maintainers.mimame]; }; } diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 32830d6f3d0..7abd6c162e0 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,51 +1,137 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper -, jdk, jre, libpulseaudio, libXxf86vm +{ stdenv +, fetchurl +, makeDesktopItem +, makeWrapper +, jre # old or modded versions of the game may require Java 8 (https://aur.archlinux.org/packages/minecraft-launcher/#pinned-674960) +, xorg +, zlib +, nss +, nspr +, fontconfig +, gnome2 +, cairo +, expat +, alsaLib +, cups +, dbus +, atk +, gtk2-x11 +, gdk-pixbuf +, glib +, curl +, freetype +, libpulseaudio +, systemd +, flite ? null +, libXxf86vm ? null }: let desktopItem = makeDesktopItem { - name = "minecraft"; - exec = "minecraft"; - icon = "minecraft"; - comment = "A sandbox-building game"; - desktopName = "Minecraft"; - genericName = "minecraft"; - categories = "Game;"; + name = "minecraft-launcher"; + exec = "minecraft-launcher"; + icon = "minecraft-launcher"; + comment = "Official launcher for Minecraft, a sandbox-building game"; + desktopName = "Minecraft Launcher"; + categories = "Game;Application;"; }; - libPath = stdenv.lib.makeLibraryPath [ - libpulseaudio - libXxf86vm # Needed only for versions <1.13 - ]; + envLibPath = stdenv.lib.makeLibraryPath [ + curl + libpulseaudio + systemd + alsaLib # needed for narrator + flite # needed for narrator + libXxf86vm # needed only for versions <1.13 + ]; -in stdenv.mkDerivation { - name = "minecraft-2015-07-24"; + libPath = stdenv.lib.makeLibraryPath ([ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gnome2.GConf + gnome2.pango + gtk2-x11 + nspr + nss + stdenv.cc.cc + zlib + ] ++ + (with xorg; [ + libX11 + libxcb + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libXScrnSaver + ])); +in + stdenv.mkDerivation rec { + pname = "minecraft-launcher"; + + version = "2.1.5965"; src = fetchurl { - url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar"; - sha256 = "04pj4l5q0a64jncm2kk45r7nxnxa2z9n110dcxbbahdi6wk0png8"; + url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; + sha256 = "0wlc49s541li4cbxdmlw8fp34hp1q9m6ngr7l5hfdhv1i13s5845"; + }; + + icon = fetchurl { + url = "https://launcher.mojang.com/download/minecraft-launcher.svg"; + sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim"; }; nativeBuildInputs = [ makeWrapper ]; - unpackPhase = "${jdk}/bin/jar xf $src favicon.png"; + sourceRoot = "."; + + dontConfigure = true; + dontBuild = true; installPhase = '' - mkdir -p $out/bin $out/share/minecraft + mkdir -p $out/opt + mv minecraft-launcher $out/opt - makeWrapper ${jre}/bin/java $out/bin/minecraft \ - --add-flags "-jar $out/share/minecraft/minecraft.jar" \ - --suffix LD_LIBRARY_PATH : ${libPath} + ${desktopItem.buildCommand} + install -D $icon $out/share/icons/hicolor/symbolic/apps/minecraft-launcher.svg - cp $src $out/share/minecraft/minecraft.jar - cp -r ${desktopItem}/share/applications $out/share - install -D favicon.png $out/share/icons/hicolor/32x32/apps/minecraft.png + makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \ + --prefix LD_LIBRARY_PATH : ${envLibPath} \ + --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} + ''; + + preFixup = '' + patchelf \ + --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ + --set-rpath '$ORIGIN/'":${libPath}" \ + $out/opt/minecraft-launcher/minecraft-launcher + patchelf \ + --set-rpath '$ORIGIN/'":${libPath}" \ + $out/opt/minecraft-launcher/libcef.so + patchelf \ + --set-rpath '$ORIGIN/'":${libPath}" \ + $out/opt/minecraft-launcher/liblauncher.so ''; meta = with stdenv.lib; { - description = "A sandbox-building game"; - homepage = https://minecraft.net; + description = "Official launcher for Minecraft, a sandbox-building game"; + homepage = "https://minecraft.net"; maintainers = with maintainers; [ cpages ryantm infinisil ]; - license = licenses.unfreeRedistributable; + license = licenses.unfree; }; + + passthru.updateScript = ./update.sh; } diff --git a/pkgs/games/minecraft/update.sh b/pkgs/games/minecraft/update.sh new file mode 100755 index 00000000000..02b362e839b --- /dev/null +++ b/pkgs/games/minecraft/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq gnugrep common-updater-scripts + +set -eu -o pipefail + +version=$(curl -s 'https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=minecraft-launcher' | jq '.results[0].Version' | grep -Po '[.\d]*(?=-)') +update-source-version minecraft "$version" diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index e3c23ad2671..d0828b8811b 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - sha256 = "0jjnnzp1a2l8j1cla28pr460lx6cg4ql3acqfxhxv8a5a4jqrzzr"; + sha256 = "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix index 136bac8800e..f0a89adab57 100644 --- a/pkgs/games/tdm/default.nix +++ b/pkgs/games/tdm/default.nix @@ -96,7 +96,7 @@ EOF description = "The Dark Mod - stealth FPS inspired by the Thief series"; homepage = "http://www.thedarkmod.com"; license = licenses.gpl3; - maintainers = with maintainers; [ cf6b88f ]; + maintainers = with maintainers; [ cizra ]; platforms = with platforms; [ "x86_64-linux" ]; # tdm also supports x86, but I don't have a x86 install at hand to test. }; } diff --git a/pkgs/games/tome2/default.nix b/pkgs/games/tome2/default.nix new file mode 100644 index 00000000000..a632e523aaa --- /dev/null +++ b/pkgs/games/tome2/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, makeDesktopItem, ncurses, libX11, boost, cmake }: + +let + pname = "tome2"; + description = "A dungeon crawler similar to Angband, based on the works of Tolkien"; + + desktopItem = makeDesktopItem { + desktopName = pname; + name = pname; + exec = "${pname}-x11"; + icon = pname; + terminal = "False"; + comment = description; + type = "Application"; + categories = "Game;RolePlaying;"; + genericName = pname; + }; + +in stdenv.mkDerivation { + inherit pname; + version = "2.4"; + + src = fetchFromGitHub { + owner = "tome2"; + repo = "tome2"; + rev = "4e6a906c80ff07b75a6acf4ff585b47303805e46"; + sha256 = "06bddj55y673d7bnzblk8n01z32l6k2rad3bpzr8dmw464hx4wwf"; + }; + + buildInputs = [ ncurses libX11 boost ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DSYSTEM_INSTALL=ON" + ]; + + postInstall = '' + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/*.desktop $out/share/applications + ''; + + meta = with stdenv.lib; { + inherit description; + license = licenses.unfree; + maintainers = with maintainers; [ cizra ]; + platforms = platforms.all; + homepage = "https://github.com/tome2/tome2"; + }; +} diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index c04920d7aa2..c4d5dcb41e7 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -25,6 +25,11 @@ in stdenv.mkDerivation rec { sha256 = "0mc5dgh2x9nbili7gy6srjhb23ckalf08wqq2amyjr5rq392jvd7"; }; + prePatch = '' + # http://forums.te4.org/viewtopic.php?f=42&t=49478&view=next#p234354 + sed -i 's|#include <GL/glext.h>||' src/tgl.h + ''; + nativeBuildInputs = [ makeWrapper unzip premake4 ]; # tome4 vendors quite a few libraries so someone might want to look diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 023e48fc991..7b26bf44cdc 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "4.14"; + version = "4.16"; url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz"; - sha256 = "1rl1a3k5sr0hyxc61d68kwandhxcnxwv6b77vh7x2rkl1h4nxmfs"; + sha256 = "17qxbddv23ibbayw1ai984m0dlq63cgplms2jhsc09incjhafywd"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "1s17hcrp1aa0v99y5iav2s0lxdx2rzgm7z0c4zhxyydqxj399f5j"; + sha256 = "0zkvwl6rxr6xcqk4a3h43cak67w6bcyqqnajz6azif07ir3z1c61"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -56,8 +56,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20190615"; - sha256 = "1bdvj363yjn7agqq1fxdfz31j1rrs2wc02v874jjx5sw1bfq5qsa"; + version = "20190912"; + sha256 = "08my9crgpj5ai77bm64v99x4kmdb9dl8fw14581n69id449v7gzv"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/themes/clearlooks-phenix/default.nix b/pkgs/misc/themes/clearlooks-phenix/default.nix index 04929a4cb4d..7c1eb54f92f 100644 --- a/pkgs/misc/themes/clearlooks-phenix/default.nix +++ b/pkgs/misc/themes/clearlooks-phenix/default.nix @@ -23,9 +23,6 @@ stdenv.mkDerivation rec { The Clearlooks-Phénix project aims at creating a GTK3 port of Clearlooks, the default theme for Gnome 2. Style is also included for GTK2, Unity and for Metacity, Openbox and Xfwm4 window managers. - - You should install this theme into your user profile and then set - GTK_DATA_PREFIX to `~/.nix-profile`. ''; homepage = https://github.com/jpfleury/clearlooks-phenix; downloadPage = https://github.com/jpfleury/clearlooks-phenix/releases; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 8d885cbf516..0fa80322d7b 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -225,6 +225,16 @@ in rec { }; }; + sysstat = mkDerivation { + pluginName = "sysstat"; + src = fetchFromGitHub { + owner = "samoshkin"; + repo = "tmux-plugin-sysstat"; + rev = "29e150f403151f2341f3abcb2b2487a5f011dd23"; + sha256 = "013mv9p6r2r0ls3p60l8hdad4hm8niv3wr27vgm925gxmibi4hyq"; + }; + }; + tmux-colors-solarized = mkDerivation { pluginName = "tmuxcolors"; src = fetchFromGitHub { diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index f3b46348e75..c82e7dcf8d4 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-09-01"; + version = "2019-09-12"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "6e18c03d80c323e740f87103fc05955b5c61b54e"; - sha256 = "0jgqmliy48fqdhc1lnsbvkgg24z85n7dv8z6k6xxnilcsrhfzds2"; + rev = "61cfb3fefb0ebd8654be452046bd2ba24025311f"; + sha256 = "11i5jr5zgvkl7wr99jjldyypbd5xsnyj8q9j379gl2xk5brjwbaf"; }; }; @@ -292,34 +292,34 @@ let coc-eslint = buildVimPluginFrom2Nix { pname = "coc-eslint"; - version = "2019-06-17"; + version = "2019-09-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-eslint"; - rev = "c8f1639146748b46f871144ed471c44741492c97"; - sha256 = "0adz0wv0kmyhgz5ahqrdkp8lp2nrxh06b6rri2z7jbgplyksa0qc"; + rev = "943f22365e2b50e7372058c39e5b85d4d5254beb"; + sha256 = "1p9gn5y9sk7jl6j1nfxhqk1h1xs1lhq2cg5pbilwsb42q5dzr79s"; }; }; coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2019-09-09"; + version = "2019-09-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "67d6df228ffca7e6247139184fcb53003ccf7810"; - sha256 = "1xmm07k9c3kzyx4wrkamdpfh1pykihlrs35qcgy8wgqr9msqj9bq"; + rev = "c463de323cb7f162747e545bff694d6293a9be60"; + sha256 = "15r8gwsk69gg1p68jgi3gw0m29lbfs7iddcmhgr5qkrvk8rhhi1j"; }; }; coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2019-09-07"; + version = "2019-09-13"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "16005f9249196c54cd85f0407152d04a4c487b30"; - sha256 = "06jky64f2l4j5sn4v8ij5594afc85d4gk2mxd315j5b16sy661l3"; + rev = "059f6ecae0849024d299d9e744622d439c73ddca"; + sha256 = "0n9ffsk9qds5ap3049kw05v167ialhmix28mwygdxgzjvr9qpd4q"; }; }; @@ -380,12 +380,12 @@ let coc-json = buildVimPluginFrom2Nix { pname = "coc-json"; - version = "2019-07-09"; + version = "2019-09-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-json"; - rev = "ed9743a6cfe1db5139e3a42f6aea01d3004be01b"; - sha256 = "0h3dwcv931xs5y87kqyq2my5z85xv904cbmr41bj8mn1myw8chsf"; + rev = "ad75187c954f55ec3f92ca9ac5d9f77347b0bbfe"; + sha256 = "0hwv394498qz6bb5zl2i57d18dbl4faxmh3g2d8mfggmx16pv41n"; }; }; @@ -413,23 +413,23 @@ let coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; - version = "2019-09-09"; + version = "2019-09-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-pairs"; - rev = "318e8123b11d231ceb48c0e7dd9864881115d873"; - sha256 = "0r9cnqn6mr6b9g7ahjhfxr7s82a6wcwxhwm22s6vparaa45k4mk0"; + rev = "26b1be159c2f24d74c6f175e91b6a8fbd3868e9a"; + sha256 = "16g2wz87l1pskn6ri71sdm1j5r4h8z1vjdg3ksqs6mz9x2vzy2zz"; }; }; coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2019-07-28"; + version = "2019-09-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "79ebb637c533dbddd774be8d87ff80b27650dcc9"; - sha256 = "16ggli5ixxaa03f60j66my3zw64ciyi7pgqnf5i2k94yk35bi0d6"; + rev = "b78dcb1000841a428d23d457ac93c190b98f7b35"; + sha256 = "0krc9dnzglh8rff68xyp27qjdgmqhxvl94jy1x4asl5a5srzz7v7"; }; }; @@ -457,12 +457,12 @@ let coc-rls = buildVimPluginFrom2Nix { pname = "coc-rls"; - version = "2019-07-13"; + version = "2019-09-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-rls"; - rev = "0c005a817016412e6fba56ab81d20a949c42fbd1"; - sha256 = "0h5a1a9s9rarafmfy2i77rrsmg9393hdk53v3hfzs0f00q9qk7wn"; + rev = "6d6cbb2768304bca987f83d23e7fe56b7fe66c2b"; + sha256 = "18jz9qjxkb6626pnc5gmcfxq7yyyqnvalcllapsrk19ji6ykfi7k"; }; }; @@ -512,12 +512,12 @@ let coc-tabnine = buildVimPluginFrom2Nix { pname = "coc-tabnine"; - version = "2019-08-23"; + version = "2019-09-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tabnine"; - rev = "d6617d0ae2b2ba0f415961fed1ffc3827d06db54"; - sha256 = "1drxhjr6yv4qja0z9pypq14lj18rkw0hpwcg0ji2fgiqrf2l9ywj"; + rev = "cb787892b860a53fea65954b4afa32331ab17851"; + sha256 = "0c7hk8alggvz837w48fqiz3d01z56pxg2qss13qpp01kvvw12np6"; }; }; @@ -609,6 +609,17 @@ let }; }; + colorizer = buildVimPluginFrom2Nix { + pname = "colorizer"; + version = "2018-06-16"; + src = fetchFromGitHub { + owner = "lilydjwg"; + repo = "colorizer"; + rev = "afc1491e5b9c36305ce710bdad2b48f069141183"; + sha256 = "1dpiv9z8h6196acncyjhzd1qa56y17468fpxbfzrx5q2266sajc7"; + }; + }; + Colour-Sampler-Pack = buildVimPluginFrom2Nix { pname = "Colour-Sampler-Pack"; version = "2012-11-30"; @@ -890,12 +901,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2019-09-09"; + version = "2019-09-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "9e5ab5d5ea955711bce2a64535ec42d9e76aa3fe"; - sha256 = "1552fr18drc8q7qha8gbfckp906fihx8xdpj7z7y0yiw20bc4kk3"; + rev = "28b15222852a0668b25ce04b66302275ea8cd4c5"; + sha256 = "05n1smyjlzzq428h5hfs0drifxwjbshc9csv8jx7yjwpm4gqy2md"; }; }; @@ -923,12 +934,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-09-09"; + version = "2019-09-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "48b1643509e4ef3a4af6cf57df35e6c6ac1275ce"; - sha256 = "192lph0kbs4mmbsz1jsjmrmy3an53bkd4lzyvn615r24qfbpcz14"; + rev = "8df5ca1a9db11d919f3426f4d05b281be8913c89"; + sha256 = "0c0g9h8fajmwb2snkqj093jwc8d1ypxcvmv7s80c90l635bks1yj"; }; }; @@ -1035,12 +1046,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-09-09"; + version = "2019-09-12"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "96eace33dd16d553a9318f08209f108ec69c5cd7"; - sha256 = "09q9rk69xrj30knfdq5s4xxmiwnazs1l7lrsqwxpn0ggq8ryk5qd"; + rev = "3ba858de194fc53b301fb640ab71b4263bc66175"; + sha256 = "1vbzlq7k2l0yqhdcnldkliwyzqskf1bqjgxl2l4c0nj8rcjm5bw3"; }; }; @@ -1752,12 +1763,12 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2019-05-26"; + version = "2019-09-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "ed80ae8cee732d52eb841d509a95aca9c27ece7a"; - sha256 = "1xkq4w8mz9rfh6xpiqa1rnzd9id59d1bn58pw2fhcrm04cr3rk49"; + rev = "3838f45930e8d6c05807c925350585c48bd21a4b"; + sha256 = "1m6skrdjr6d1waxarxch2hn7416q9r13yan1bd7qx2w5gika606a"; }; }; @@ -1774,12 +1785,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2019-09-01"; + version = "2019-09-12"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "f53fa5177c01180ea538290657721e1accbb02fe"; - sha256 = "0v162hpl881dhb61vkyi4bvny5zn74pknlyh1liyhw6jy5hgc9b8"; + rev = "511f6c64ca2530f4356e0b301ee0f34b956ac7aa"; + sha256 = "1645q70jg81jy7gxdd8kr7i5pgkr2k7i71ijk4k23lxj0yd4fsim"; }; }; @@ -1807,23 +1818,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-08-27"; + version = "2019-09-13"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "2504a3d84e97be144019ef184f0c2aed42f3152d"; - sha256 = "0djfm8k4yqaycydg4hpvnapyh2d5k0r3alhlk09rj1arsw2kzh38"; + rev = "8228c7b0a7aa46b7846f7bf21bcb89ce24b9c20e"; + sha256 = "098alydvc9calcxkv77c8wkxw41p2az2dk70bx279ngz648i150c"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-09-09"; + version = "2019-09-13"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "51fc75efdb8ac58c853492c3f61d854f65ed78ec"; - sha256 = "098g4qq3h8nklynj4qnj02f6ivw10q07c69ssdrhgjwilpgv4nrk"; + rev = "60ec10b477eefc81eeafafa2a8c1b00046ee48fb"; + sha256 = "1l9lz56cdkifp4arf05z298jg0yfvr2wvfbnzaff62yc38n4hb4b"; }; }; @@ -2137,12 +2148,12 @@ let riv-vim = buildVimPluginFrom2Nix { pname = "riv-vim"; - version = "2019-02-18"; + version = "2019-09-14"; src = fetchFromGitHub { owner = "Rykka"; repo = "riv.vim"; - rev = "ac64a8c8daaa862b83d27432fe87c79ad2a0c845"; - sha256 = "0vvpp04n7ndcljrfa0m4hwvv9h20abgwr29fzv5qnasvcxcsawcq"; + rev = "87a1f2c1e487ee0021855fd0c65c3f3244f4fc61"; + sha256 = "13430czv87r16wcyb2f8izfihkhm2q6k1ki5bhzpbakzk7vwxwms"; }; }; @@ -2192,12 +2203,12 @@ let semshi = buildVimPluginFrom2Nix { pname = "semshi"; - version = "2019-07-02"; + version = "2019-09-12"; src = fetchFromGitHub { owner = "numirias"; repo = "semshi"; - rev = "527ebc5a0465dbf6313a791c1c78a37420114799"; - sha256 = "0ys1hnvk5mq4cigrrqx70ivlgwc7kblvbv3ncqlqihvxs2hhan4i"; + rev = "741916c472adc40f82d191ec48e668e88251e626"; + sha256 = "0ld4fk8a8k2mf8q32zjq3lbb8nhdg214n5kp221z0vw2a72zgkjn"; }; }; @@ -2830,12 +2841,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-09-09"; + version = "2019-09-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "63d8764f9d19def6d279b91e690ac2aa5662828d"; - sha256 = "0sxjw1dmidw242m1ma607g957hz2w080ln4m4ac90wi1qssp8132"; + rev = "89d1d43165c8ef6c029ee0e9590a0d67978a7c97"; + sha256 = "0nkq6a5r2dx0jqp6ikbzbrvlfgpcn28y5l9b41bfpxkqplh03bhn"; }; }; @@ -3116,12 +3127,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2019-08-18"; + version = "2019-09-14"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "830f0fe48a337ed26384c43929032786f05c8d24"; - sha256 = "06lsb8lwdbb6l0nznmxb9akd4ss9cw76d03z9h4q9yfjydyqf5kn"; + rev = "3e67b21c6e6f955ee5051608c559c2e91c2ce3e5"; + sha256 = "0105s1d1pn1ga2zpqi1lgjnx36plgfsniqx1b560dvmg8wglzpwx"; }; }; @@ -3246,6 +3257,17 @@ let }; }; + vim-exchange = buildVimPluginFrom2Nix { + pname = "vim-exchange"; + version = "2017-01-27"; + src = fetchFromGitHub { + owner = "tommcdo"; + repo = "vim-exchange"; + rev = "05d82b87711c6c8b9b7389bfb91c24bc4f62aa87"; + sha256 = "09fa156y8pxpzdbngifa7yzg1vjg1fjsgp1h9inj818zbig8mamb"; + }; + }; + vim-expand-region = buildVimPluginFrom2Nix { pname = "vim-expand-region"; version = "2013-08-19"; @@ -3336,12 +3358,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-09-09"; + version = "2019-09-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "35f1095f9b3ce70768bdd75dae76437cfa69dd02"; - sha256 = "0d806k1prgsa0mgc779p3ngqjyd8shrf2i18xi58vsndrvsgn96v"; + rev = "26f6037de68254376cd062286aeeaa7db804a973"; + sha256 = "0cza5v99493llr02all1zwjy3gk19hypngk6j3kcrg7530c9sq6n"; }; }; @@ -3413,12 +3435,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-09-08"; + version = "2019-09-13"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "925d29a73db14133d11361792a2e0393e1e2b457"; - sha256 = "167s9dadk1nl0kw14p0mq7pkwhxg9xb5gkmhqh96rpz1z2730jw7"; + rev = "041ca9669bbbe4a50b382d8972a7191edf873f55"; + sha256 = "1q3sca1gpxc7iqdk6wkdzndwpf8i8z69is4jwmnhr0sk0jrjby6q"; }; }; @@ -3587,6 +3609,17 @@ let }; }; + vim-illuminate = buildVimPluginFrom2Nix { + pname = "vim-illuminate"; + version = "2019-08-04"; + src = fetchFromGitHub { + owner = "RRethy"; + repo = "vim-illuminate"; + rev = "0c37ddf0dfbe069b9f2cf1d4a341efe7b373f133"; + sha256 = "11zjm9a6x57s5rs080p1gcj86l01765ayn3k9yx6mx8d48n8zr3k"; + }; + }; + vim-indent-guides = buildVimPluginFrom2Nix { pname = "vim-indent-guides"; version = "2018-05-14"; @@ -3929,6 +3962,17 @@ let }; }; + vim-mucomplete = buildVimPluginFrom2Nix { + pname = "vim-mucomplete"; + version = "2019-07-30"; + src = fetchFromGitHub { + owner = "lifepillar"; + repo = "vim-mucomplete"; + rev = "eede692d8e8ee847de5c59d760f77fa27ea5ff47"; + sha256 = "0c8rjqz0mzi9c69qjd9arljkwdckjp8x5d3ks570xhlcmp17qzn8"; + }; + }; + vim-multiple-cursors = buildVimPluginFrom2Nix { pname = "vim-multiple-cursors"; version = "2019-07-11"; @@ -3962,6 +4006,17 @@ let }; }; + vim-ninja-feet = buildVimPluginFrom2Nix { + pname = "vim-ninja-feet"; + version = "2019-05-12"; + src = fetchFromGitHub { + owner = "tommcdo"; + repo = "vim-ninja-feet"; + rev = "5b48f97bf4865a25f5f4568c45cdfd08f946ec4f"; + sha256 = "1i3n5nlwyg65k0f0qrimbfs67l2xx39cqp4gyrycw4vzp6hs0lsc"; + }; + }; + vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; version = "2019-06-03"; @@ -4030,12 +4085,12 @@ let vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2019-08-05"; + version = "2019-09-13"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "10b5ddf57f9416ed5a33419e1095dba7d239b297"; - sha256 = "1hik7bkk1rfxwwn77w1p7c6m1dz7ifpvnnfs8yizhlp9rgs0wjch"; + rev = "2848ab2db5a2862d43d77acee04faf981f643dd0"; + sha256 = "06cgb7zb239yk3rkym3nxy26ihm9b2ibqyvjyjgj43w1bm6jfwg5"; }; }; @@ -4151,12 +4206,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-09-06"; + version = "2019-09-12"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "fbc2af9e820d85e17cd08023f4dcc66545735d58"; - sha256 = "03lrnrhhhxmz5dbbsxhnnrff8myc21qrxsskfd2k6yh1hr9wwa5p"; + rev = "4f3df59be709bf0d5c5c67dc804fde49abdc2700"; + sha256 = "0rknm6bj75ax2a81bkw96nqakn2gb1mjfb6lgg8kwvcjzddfvmb9"; }; }; @@ -4259,6 +4314,17 @@ let }; }; + vim-rooter = buildVimPluginFrom2Nix { + pname = "vim-rooter"; + version = "2019-05-18"; + src = fetchFromGitHub { + owner = "airblade"; + repo = "vim-rooter"; + rev = "eef98131fef264d0f4e4f95c42e0de476c78009c"; + sha256 = "144wwvi295q387w6cy9mv2inzla8ngd735gmf65lf33llp8hga59"; + }; + }; + vim-rsi = buildVimPluginFrom2Nix { pname = "vim-rsi"; version = "2019-03-15"; @@ -4415,12 +4481,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-09-03"; + version = "2019-09-13"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "55b29ff83e9f5b43a138fb42100be6d7b5777d0d"; - sha256 = "0zkxmj3l1jj1q9qigm13xksc7f3a7n7ik5yxgn4gxdpi9z79as4d"; + rev = "2221222df8cbc1a99c29f3e55a7c340f4d16b1ff"; + sha256 = "0vjgxxg7aq5j7lxc0pn0fral5gjb4fpc42442q8mkik6cpkd92h0"; }; }; @@ -4512,6 +4578,17 @@ let }; }; + vim-swap = buildVimPluginFrom2Nix { + pname = "vim-swap"; + version = "2019-06-07"; + src = fetchFromGitHub { + owner = "machakann"; + repo = "vim-swap"; + rev = "e52ff679c88f4aa7a7afe77fb42af78c93ed33c8"; + sha256 = "0rqvxqqk961syawmyc2qdfb4w9ilb1r3mxxij2ja1jbhl1f3w4vq"; + }; + }; + vim-SyntaxRange = buildVimPluginFrom2Nix { pname = "vim-SyntaxRange"; version = "2018-03-09"; @@ -4723,12 +4800,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-09-01"; + version = "2019-09-12"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "d55e496786f064c022861c944cf38562006a4e9a"; - sha256 = "1c049z9qgbc0g80zvixz0cqglq2qcg2pfmzjvp4gg5yq4k27r25y"; + rev = "6ff6e336ac3df959c8d0462be277b4fff8661421"; + sha256 = "1drp53cvbflr6x94vy0f57fg9nb3kxlaxvrc5w71id4mv0pr7bb2"; }; }; @@ -4767,12 +4844,12 @@ let vim-watchdogs = buildVimPluginFrom2Nix { pname = "vim-watchdogs"; - version = "2019-04-03"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "osyo-manga"; repo = "vim-watchdogs"; - rev = "33d74aaeb1ef71512baff9eea20a42e06f4f0bc4"; - sha256 = "0jkkrlw9x524vvsggq51z0yyvys75dv2h21ijxzdqni49kf4vyhk"; + rev = "8ee2af37095af08376ba2409da152c2a36a4ee90"; + sha256 = "1hvgqdcnnz09afbas5brwls2sifs8y78jmq44ldgsjny9l445df4"; }; }; @@ -4877,12 +4954,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-09-09"; + version = "2019-09-13"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "cb90d583b7d584d87d306b2b99abdbb097588196"; - sha256 = "06308ji2r3733w9rgwphqdqkharf7hc3xliylzbl9hh6fmk3hj55"; + rev = "365e3d27d922036d5770a2591a3670cc5a3db777"; + sha256 = "1rgafa05lfvyzznlq1y7cb3b3q3m2df5j82ggjwds7wfl4pm4zcz"; }; }; @@ -5066,12 +5143,12 @@ let zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; - version = "2018-04-29"; + version = "2019-09-13"; src = fetchFromGitHub { owner = "jnurmine"; repo = "zenburn"; - rev = "2cacfcb222d9db34a8d1a13bb8bb814f039b98cd"; - sha256 = "0m5d5sjckirfpdhg9sf1nl5xywvzdx6y04r13m47jlavf79hhimi"; + rev = "13254888f5ebe53c3d9276c8afc18efe6addec8e"; + sha256 = "1xdi8q4cggv16bv71ap8y8xrmzb7pjvknrymrnab55fgbpkxhzaj"; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index d5a1ed67665..5fff24e9e5f 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -49,16 +49,16 @@ self: super: { }; LanguageClient-neovim = let - version = "0.1.146"; + version = "0.1.154"; LanguageClient-neovim-src = fetchurl { url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz"; - sha256 = "1xm98pyzf2dlh04ijjf3nkh37lyqspbbjddkjny1g06xxb4kfxnk"; + sha256 = "03sp643nihj9p2s9cx2dcazhz68s30qx7igqprgsmr1040rhg2py"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - cargoSha256 = "0dixvmwq611wg2g3rp1n1gqali46904fnhb90gcpl9a1diqb34sh"; + cargoSha256 = "1bvbls2l1xa0s3k11crvd98il4i20z5sn0hqmsc1b915k03qq4zj"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a919e17afa5..67dd2db4a9f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,5 +1,6 @@ 907th/vim-auto-save airblade/vim-gitgutter +airblade/vim-rooter ajh17/Spacegray.vim albfan/nerdtree-git-plugin altercation/vim-colors-solarized @@ -172,6 +173,8 @@ ledger/vim-ledger lepture/vim-jinja lervag/vimtex lfilho/cosco.vim +lifepillar/vim-mucomplete +lilydjwg/colorizer LnL7/vim-nix LucHermitte/lh-brackets LucHermitte/lh-vim-lib @@ -182,6 +185,7 @@ lumiliet/vim-twig luochen1990/rainbow lyokha/vim-xkbswitch machakann/vim-highlightedyank +machakann/vim-swap majutsushi/tagbar maksimr/vim-jsbeautify MarcWeber/vim-addon-actions @@ -321,6 +325,7 @@ rodjek/vim-puppet roxma/nvim-cm-racer roxma/nvim-completion-manager roxma/nvim-yarp +RRethy/vim-illuminate rust-lang/rust.vim ryanoasis/vim-devicons Rykka/riv.vim @@ -376,7 +381,9 @@ tikhomirov/vim-glsl tmux-plugins/vim-tmux tomasr/molokai tomlion/vim-solidity +tommcdo/vim-exchange tommcdo/vim-lion +tommcdo/vim-ninja-feet tomtom/tcomment_vim tomtom/tlib_vim tpope/vim-abolish diff --git a/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch b/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch new file mode 100644 index 00000000000..efa41075644 --- /dev/null +++ b/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch @@ -0,0 +1,25 @@ +diff --git a/configure.in b/configure.in +index 5e3f89b..19be6d9 100644 +--- a/configure.in ++++ b/configure.in +@@ -9,6 +9,7 @@ dnl Checks for programs. + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_RANLIB ++AC_CHECK_TOOL([AR], [ar]) + + dnl Checks for header files. + AC_HEADER_STDC +diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in +index 20512c4..83c802b 100644 +--- a/libbridge/Makefile.in ++++ b/libbridge/Makefile.in +@@ -1,7 +1,7 @@ + + KERNEL_HEADERS=-I@KERNEL_HEADERS@ + +-AR=ar ++AR=@AR@ + RANLIB=@RANLIB@ + + CC=@CC@ diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index 2725a5909b7..e3207fdf37d 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -8,11 +8,12 @@ stdenv.mkDerivation rec { sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"; }; - # Remove patch once the kernel headers are updated - patches = [ ./add-ip6-header.patch ]; + patches = [ + ./autoconf-ar.patch + ./add-ip6-header.patch # Remove patch once the kernel headers are updated + ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; postInstall = '' # The bridge utils build does not fail even if the brctl binary diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/os-specific/linux/cpustat/default.nix new file mode 100644 index 00000000000..23ed2b07c96 --- /dev/null +++ b/pkgs/os-specific/linux/cpustat/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + pname = "cpustat"; + version = "0.02.09"; + + src = fetchurl { + url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; + sha256 = "12xahv65yrhs5r830clkl1qnwg3dnrk5qn3zsznzbv1iy2f3cj7y"; + }; + + buildInputs = [ ncurses ]; + + installFlags = [ + "BINDIR=${placeholder "out"}/bin" + "MANDIR=${placeholder "out"}/share/man/man8" + ]; + + meta = with lib; { + description = "CPU usage monitoring tool"; + homepage = "https://kernel.ubuntu.com/~cking/cpustat/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 5e990511eed..0e35f45f042 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { patches = [ ./pass-force.patch ]; - buildInputs = [ flex perl ]; + nativeBuildInputs = [ flex ]; + buildInputs = [ perl ]; configureFlags = [ "--without-distro" diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index b10d45d8a4b..223a9b7bf79 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.21"; + version = "0.22"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "0m7fk2xgzsz7am0wjw98sqa42zpw3cz3hz399niw5rj8dbqh0zpy"; + sha256 = "0dk4j1b8sy4j6w91cq5ga99f3hln9fgh79ayi9kvn8xgzksmhjdp"; }; patches = [ diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 380444f0269..a6e3ccad501 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2019-07-17"; + version = "2019-08-15"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "20190717"; - sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; + rev = "20190815"; + sha256 = "06p6scpmhdifzi3yhg5n4f2kqp4pl20xhh0k2kw70p10zgxg2l4r"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1q3zqa3xxg4679p893xzwpa43afvdnnkg5xb0qs6mac75sizngid"; + outputHash = "1dgclb44li70z0vkk9qxlbsj2jnqwx97gd7c429i2nv9lhgm14vx"; meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index cdd42e98f06..92594ea99de 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,17 +4,15 @@ buildGoPackage rec { pname = "fscrypt"; - version = "unstable-2019-08-29"; + version = "0.2.5"; goPackagePath = "github.com/google/fscrypt"; - goDeps = ./deps.nix; - src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; - rev = "8a3acda2011e9a080ee792c1e11646e6118a4930"; - sha256 = "17h6r5lqiz0cw9vsixv48a1p78nd7bs1kncg6p4lfagl7kr5hpls"; + rev = "v${version}"; + sha256 = "1jf6363kc9id3ar93znlcglx3llgv01ccp3nlbamm98rm9dps4qk"; }; buildInputs = [ pam ]; diff --git a/pkgs/os-specific/linux/fscrypt/deps.nix b/pkgs/os-specific/linux/fscrypt/deps.nix deleted file mode 100644 index 5d3e8a89a91..00000000000 --- a/pkgs/os-specific/linux/fscrypt/deps.nix +++ /dev/null @@ -1,66 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "614d502a4dac"; - sha256 = "1rcyvsl8b8pk7h8lwl0fpiflrx8zs121wi5490ln0qnvkk8d4bwy"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "8a410e7b638d"; - sha256 = "0hp0l8f6fir5gmgrjq0mhh5ikc0rlrm72774228800kfwqjrxxny"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d99a578cf41b"; - sha256 = "10q9xx4pmnq92qn6ff4xp7n1hx766wvw2rf7pqcd6rx5plgwz8cm"; - }; - } -] diff --git a/pkgs/os-specific/linux/intel-speed-select/default.nix b/pkgs/os-specific/linux/intel-speed-select/default.nix new file mode 100644 index 00000000000..cf0dd75a8a4 --- /dev/null +++ b/pkgs/os-specific/linux/intel-speed-select/default.nix @@ -0,0 +1,20 @@ +{ stdenv, kernel }: + +stdenv.mkDerivation { + pname = "intel-speed-select"; + inherit (kernel) src version; + + makeFlags = [ "bindir=${placeholder "out"}/bin" ]; + + postPatch = '' + cd tools/power/x86/intel-speed-select + sed -i 's,/usr,,g' Makefile + ''; + + meta = with stdenv.lib; { + description = "Tool to enumerate and control the Intel Speed Select Technology features"; + homepage = https://www.kernel.org/; + license = licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; # x86-specific + }; +} diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index a1bb98b8297..59d41412f55 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -1,16 +1,34 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, ell, coreutils, readline, python3Packages }: +{ stdenv +, fetchgit +, fetchpatch +, autoreconfHook +, pkgconfig +, ell +, coreutils +, readline +, python3Packages +}: stdenv.mkDerivation rec { pname = "iwd"; - - version = "0.19"; + version = "0.20"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "0848r06bnx5k6wlmy425hljc3f03x9xx0r83vdvf630jryc9llmz"; + sha256 = "03ca47d4hn28vkf5fr6ck1gz5py4lm1pw3nw9s1ckw7cqxw961sf"; }; + patches = [ + # Undo creating ReadWritePaths as instalation target. + (fetchpatch { + name = "revert-create-dirs-on-install.patch"; + url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=5a96c11664eb553bc28a2142af382b190254edbb"; + sha256 = "08gkz3ia1l5xsh3pbx4abimgf7m88wygfpfyg77yi6dwavjqm6cx"; + revert = true; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkgconfig @@ -19,8 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ ell - readline python3Packages.python + readline ]; pythonPath = [ @@ -29,13 +47,13 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-dbus-datadir=${placeholder "out"}/etc/" + "--enable-external-ell" + "--enable-wired" + "--localstatedir=/var/" "--with-dbus-busdir=${placeholder "out"}/share/dbus-1/system-services/" - "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/" + "--with-dbus-datadir=${placeholder "out"}/share/" "--with-systemd-modloaddir=${placeholder "out"}/etc/modules-load.d/" # maybe - "--localstatedir=/var/" - "--enable-wired" - "--enable-external-ell" + "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/" ]; postUnpack = '' @@ -55,16 +73,18 @@ stdenv.mkDerivation rec { postFixup = '' substituteInPlace $out/share/dbus-1/system-services/net.connman.ead.service \ - --replace /bin/false ${coreutils}/bin/false + --replace /bin/false ${coreutils}/bin/false substituteInPlace $out/share/dbus-1/system-services/net.connman.iwd.service \ - --replace /bin/false ${coreutils}/bin/false + --replace /bin/false ${coreutils}/bin/false ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git; description = "Wireless daemon for Linux"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 0a0ccaffa7d..c5931f2da11 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.143"; + version = "4.14.145"; # 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 = "14rxck0dd0rirj09aj4xsbylcvvfrgqxr1fx0c570dxr7kqg4d15"; + sha256 = "0aa9b7ni6wadm43260vidqy4ngvws25027psbdnkl9hkcy0ba1gb"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 16277e6c85f..5e0e5f882e4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.72"; + version = "4.19.74"; # 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 = "0v8zypwyc9bcmm16hbvk092h9qnwqc0f6m61bz2ml499pnrvdz7r"; + sha256 = "10pfg5sijw9sx66ybrb06nlmlvj0sxxa1yjhg6qwdhi9sgm2yp29"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9f03e200f1b..a256d406bbf 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.192"; + version = "4.4.193"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0fwak1hrahcky1hdk4h8693rjpx65c2sqzfm1x71nhhysa6r3fig"; + sha256 = "13iy0xyrqqagnrk7msp1qfw6xsc0dlc74dpdzki9rfsxcildxz3a"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 9b91ced27d0..b43af36bca0 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.192"; + version = "4.9.193"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0m4d6b5sfcx3iv0agia080fbcn9icyqzgzxp946zv93hrq6306ks"; + sha256 = "00gx2sg0zc1xz6gs1kdkkd35gn7kjq1bjp1ydc774szsq0f0ircv"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index 47e57b8bb0a..69cfada3422 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.14"; + version = "5.2.16"; # 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/v5.x/linux-${version}.tar.xz"; - sha256 = "136fs0pn5acg40rlq51zl5001rk8fx01gi2ffd58cspfgx3kckf6"; + sha256 = "0xg5jnkmc7b552jrhi200ck7q4hql3az2fpjfwxj3ay8xp4n280c"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix new file mode 100644 index 00000000000..e9cb412d8db --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.3"; + + # 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; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1ck70ns130nqf6xy02bwm67y00yh46lhjzdajq7zzx1wa6bw7wvq"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index e4a4e40f370..d29a2382c2a 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { - url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/"; + url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; # Update this if linux_latest-libre fails to build. - # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+' - rev = "16604"; - sha256 = "0d2dh52zv073zr74ilspy0fy3ivys5pq32j7fljs4fwi2bcljf51"; + # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/ | grep -Eo 'Revision [0-9]+' + rev = "16794"; + sha256 = "1lpaka4hs7yrpnrzfybd6radjylwvw2p4aly68pypykqs2srvm7j"; } , ... }: @@ -25,7 +25,7 @@ in linux.override { name = "${linux.name}-libre-src"; src = linux.src; buildPhase = '' - ${scripts}/${majorMinor}-gnu/deblob-${majorMinor} \ + ${scripts}/${majorMinor}/deblob-${majorMinor} \ ${major} ${minor} ${patch} ''; checkPhase = '' diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 3d3215e6b4b..d6fd7346f4f 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, zlib }: +{ stdenv, buildPackages, fetchurl, zlib, fetchpatch }: stdenv.mkDerivation rec { pname = "kexec-tools"; @@ -18,6 +18,16 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ zlib ]; + patches = stdenv.lib.optionals stdenv.hostPlatform.isi686 [ + # fix build on i686 + # See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298 + (fetchpatch { + name = "kexec-tools-2.0.20-fix-broken-multiboot2-buliding-for-i386.patch"; + url = "https://src.fedoraproject.org/rpms/kexec-tools/raw/cb1e5463b5298b064e9b6c86ad6fe3505fec9298/f/kexec-tools-2.0.20-fix-broken-multiboot2-buliding-for-i386.patch"; + sha256 = "1kzmcsbhwfdgxlc5s88ir0n494phww1j16yk0z42x09qlkxxkg0l"; + }) + ]; + meta = with stdenv.lib; { homepage = http://horms.net/projects/kexec/kexec-tools; description = "Tools related to the kexec Linux feature"; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 5aa9e9b43da..8638ac9f798 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's@/lib/udev@''${out}/lib/udev@' \ -e 's@ -Werror @ @' \ - -e 's@/usr/sbin/sendmail@${system-sendmail}@' -i Makefile + -e 's@/usr/sbin/sendmail@${system-sendmail}/bin/sendmail@' -i Makefile sed -i \ -e 's@/usr/bin/basename@${coreutils}/bin/basename@g' \ -e 's@BINDIR/blkid@${utillinux}/bin/blkid@g' \ diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 07d6dcb4a5f..0196718cfd0 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20190618"; + version = "20190918"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "0fdhrpxvsq0rm5mzj82gvmfb3lm7mhc9hwvimv7dl1jaidbp6lvs"; + sha256 = "0v668mfqxn6wzyng68aqaffh75gc215k13n6d5g7zisivvv2bgdp"; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 1e82c492159..138b54b0224 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bison, flex, python3 , swig +{ stdenv, fetchFromGitHub, python3 , libsepol, libselinux, checkpolicy , withGraphics ? false }: @@ -8,16 +8,16 @@ with python3.pkgs; buildPythonApplication rec { pname = "setools"; - version = "4.2.0"; + version = "4.2.2"; src = fetchFromGitHub { owner = "SELinuxProject"; repo = pname; rev = version; - sha256 = "1bjwcvr6rjx79cdcvaxn68bdrnl4f2a8gnnqsngdxhkhwpddksjy"; + sha256 = "18kklv26dwm2fdjjzfflvxsq83b2svnwf4g18xq7wsfsri121a90"; }; - nativeBuildInputs = [ bison flex swig ]; + nativeBuildInputs = [ cython ]; buildInputs = [ libsepol ]; propagatedBuildInputs = [ enum34 libselinux networkx ] ++ optionals withGraphics [ pyqt5 ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 90b33e183ce..083166848f2 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -223,7 +223,7 @@ in stdenv.mkDerivation { # in a backwards-incompatible way. If the interface version of two # systemd builds is the same, then we can switch between them at # runtime; otherwise we can't and we need to reboot. - passthru.interfaceVersion = 3; + passthru.interfaceVersion = 2; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/systemd; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index e99e9e37d82..1d967b38eb9 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "01wx2x8xyal595dhdih7rva2bz7gqzgwdp56gi0ikjdzayx17wcf"; }; - outputs = [ "out" "man" "dev" "devdoc" ]; + outputs = [ "out" "man" "dev" ] ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc"; patches = [ (substituteAll { @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ - "--enable-gtk-doc" + (stdenv.lib.enableFeature (stdenv.buildPlatform == stdenv.hostPlatform) "gtk-doc") "--localstatedir=/var" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-udevdir=$(out)/lib/udev" diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 1b9b5a3ba51..d02a01fc93f 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -151,7 +151,7 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - # incompatibleKernelVersion = "4.20"; + incompatibleKernelVersion = "5.3"; # this package should point to the latest release. version = "0.8.1"; @@ -165,7 +165,7 @@ in { zfsUnstable = common { # comment/uncomment if breaking kernel versions are known - # incompatibleKernelVersion = "4.19"; + incompatibleKernelVersion = "5.3"; # this package should point to a version / git revision compatible with the latest kernel release version = "0.8.1"; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index 65690af9869..2764c4232c1 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -31,5 +31,7 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.windows; + + broken = true; }; } diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index af914ae6cd7..31e1ac50942 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,15 +8,13 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.14.4"; in - stdenv.mkDerivation rec { pname = "bind"; - inherit version; + version = "9.14.6"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; - sha256 = "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii"; + sha256 = "1zpd47ckn5lf4qbscfkj7krngwn2gwsp961v5401h3lhxm0a0rw9"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 317783e4f8f..f06315b899d 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "documize-community"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "13r0x1mbprhk19a1cikq8cl553xdrxin9arw90am69iv6rcps3w3"; + sha256 = "1qkc82bvpmgcil88630pnp1irc2w8rzlh702vl0v67vfmawpxpjq"; }; goPackagePath = "github.com/documize/community"; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 30e4b99ccbc..c36388b26fc 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -120,7 +120,7 @@ in with py.pkgs; buildPythonApplication rec { # From setup.py aiohttp astral async-timeout attrs bcrypt certifi importlib-metadata jinja2 pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml - voluptuous voluptuous-serialize + setuptools voluptuous voluptuous-serialize # From http, frontend and recorder components and auth.mfa_modules.totp sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ] ++ componentBuildInputs ++ extraBuildInputs; diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index 26c320499e5..a8de0d7e084 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -1,39 +1,30 @@ { stdenv, fetchFromGitHub -, pkgconfig, cmake +, pkgconfig, cmake, ninja , libressl, libuv, zlib }: -with builtins; - stdenv.mkDerivation rec { - pname = "h2o"; - version = "2.2.6"; + pname = "h2o"; + version = "2.3.0-beta2"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; rev = "refs/tags/v${version}"; - sha256 = "0qni676wqvxx0sl0pw9j0ph7zf2krrzqc1zwj73mgpdnsr8rsib7"; + sha256 = "0lwg5sfsr7fw7cfy0hrhadgixm35b5cgcvlhwhbk89j72y1bqi6n"; }; - # We have to fix up some function prototypes, because despite upstream h2o - # issue #1705 (https://github.com/h2o/h2o/issues/1706), libressl 2.7+ doesn't - # seem to work - patchPhase = '' - substituteInPlace ./deps/neverbleed/neverbleed.c \ - --replace 'static void RSA_' 'void RSA_' \ - --replace 'static int RSA_' 'int RSA_' - ''; + outputs = [ "out" "man" "dev" "lib" ]; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ libressl libuv zlib ]; enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig cmake ninja ]; + buildInputs = [ libressl libuv zlib ]; - meta = { + meta = with stdenv.lib; { description = "Optimized HTTP/1 and HTTP/2 server"; homepage = https://h2o.examp1e.net; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 0299c028148..6aaae932906 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -1,30 +1,40 @@ -{ stdenv, fetchurl, mono, curl, makeWrapper }: +{ lib, stdenv, fetchurl, makeWrapper, curl, icu60, openssl, zlib }: stdenv.mkDerivation rec { pname = "jackett"; - version = "0.11.589"; + version = "0.11.687"; src = fetchurl { - url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "14lj33xmhf35pq781wvzyw983yff447mc253x0ppi3b5rwkrgkyz"; + url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz"; + sha256 = "0wq6rc12dn5yxa6yyabv234xw5nrsbvlrpgfjppvw3i4vy2cfzh9"; }; buildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/{bin,share/${pname}-${version}} - cp -r * $out/share/${pname}-${version} + mkdir -p $out/{bin,opt/${pname}-${version}} + cp -r * $out/opt/${pname}-${version} - makeWrapper "${mono}/bin/mono" $out/bin/Jackett \ - --add-flags "$out/share/${pname}-${version}/JackettConsole.exe" \ - --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib" + makeWrapper "$out/opt/${pname}-${version}/jackett" $out/bin/Jackett \ + --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib:${icu60.out}/lib:${openssl.out}/lib:${zlib.out}/lib" + ''; + + preFixup = let + libPath = lib.makeLibraryPath [ + stdenv.cc.cc.lib # libstdc++.so.6 + ]; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + $out/opt/${pname}-${version}/jackett ''; meta = with stdenv.lib; { description = "API Support for your favorite torrent trackers."; homepage = https://github.com/Jackett/Jackett/; license = licenses.gpl2; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo nyanloutre ]; platforms = platforms.all; }; } diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 43ddc5f7b0f..e70fc685161 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lidarr"; - version = "0.6.2.883"; + version = "0.7.1.1381"; src = fetchurl { - url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz"; - sha256 = "0096j2vph739h288vnz481nrwaq540faplir394xqfz7ik0krg4v"; + url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.linux.tar.gz"; + sha256 = "1vk1rlsb48ckdc4421a2qs0v5gy7kc4fad24dm3k14znh7llwypr"; }; buildInputs = [ @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r * $out/bin/ - # Mark all executable files as non-executable - find $out/bin -type f -executable | xargs chmod -x + # Mark main executable as executable + chmod +x $out/bin/Lidarr.exe makeWrapper "${mono}/bin/mono" $out/bin/Lidarr \ --add-flags "$out/bin/Lidarr.exe" \ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Usenet/BitTorrent music downloader"; - homepage = https://lidarr.audio/; + homepage = "https://lidarr.audio/"; license = licenses.gpl3; maintainers = [ maintainers.etu ]; platforms = platforms.all; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 183cc3a2b95..d978cb003c7 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -96,10 +96,10 @@ stdenv.mkDerivation rec { PREFIX=$(out) DESTDIR=$(out) PERLLIB=$(out)/${perlPackages.perl.libPrefix} - PERL=${perlPackages.perl}/bin/perl - PYTHON=${python}/bin/python - RUBY=${ruby}/bin/ruby - JAVARUN=${jre}/bin/java + PERL=${perlPackages.perl.outPath}/bin/perl + PYTHON=${python.outPath}/bin/python + RUBY=${ruby.outPath}/bin/ruby + JAVARUN=${jre.outPath}/bin/java PLUGINUSER=munin ''; diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix new file mode 100644 index 00000000000..c1d7f792830 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "apcupsd-exporter"; + version = "unstable-2019-03-14"; + + goPackagePath = "github.com/mdlayher/apcupsd_exporter"; + + goDeps = ./apcupsd-exporter_deps.nix; + + src = fetchFromGitHub { + owner = "mdlayher"; + repo = "apcupsd_exporter"; + rev = "cbd49be"; + sha256 = "1h5z295m9bddch5bc8fppn02b31h370yns6026a1d4ygfy3w46y0"; + }; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Provides a Prometheus exporter for the apcupsd Network Information Server (NIS)"; + homepage = "https://github.com/mdlayher/apcupsd_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ maintainers."1000101" ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix new file mode 100644 index 00000000000..3950ae89bf2 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter_deps.nix @@ -0,0 +1,93 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/mdlayher/apcupsd"; + fetch = { + type = "git"; + url = "https://github.com/mdlayher/apcupsd"; + rev = "eb3dd99a75fe"; + sha256 = "0s1m6l4pnazqiymb8y89ajbxfl2cn0ahvhws10nvxvc4jjivlbbq"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v0.9.2"; + sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "5c3871d89910"; + sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "4724e9255275"; + sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "1dc9a6cbc91a"; + sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "351d144fa1fc"; + sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "42b317875d0f"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 983eb6bf6c8..e15dce8ae45 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "blackbox_exporter"; - version = "0.15.0"; + version = "0.15.1"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "06llb37xpn5zjnqkw526vbk4mfdiwrv3yg7aw4365p3gz5dk085i"; + sha256 = "14z4xkkh9jb6ylclzsyj6gyqrb67lxs5cxd7lrs70qli567gzqwc"; }; doCheck = true; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index bf2a5935d1d..eb95077dc24 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "telegraf"; - version = "1.10.2"; + version = "1.12.1"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,20 +14,19 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = version; - sha256 = "0g27yczb49xf8nbhkzx7lv8378613afq9qx1gr5yhlpfrl4sgb69"; + sha256 = "00cd4kskdswcinv5bhwimggi0vbznq3sb2dllkhidx0bird3wdiw"; }; buildFlagsArray = [ ''-ldflags= - -X main.version=${version} + -w -s -X main.version=${version} '' ]; - goDeps = ./. + "/deps-${version}.nix"; + goDeps = ./deps.nix; meta = with lib; { description = "The plugin-driven server agent for collecting & reporting metrics."; license = licenses.mit; homepage = https://www.influxdata.com/time-series-platform/telegraf/; maintainers = with maintainers; [ mic92 roblabla ]; - platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix b/pkgs/servers/monitoring/telegraf/deps.nix index 2655595ee69..952d78980b0 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix +++ b/pkgs/servers/monitoring/telegraf/deps.nix @@ -67,9 +67,9 @@ goPackagePath = "github.com/Shopify/sarama"; fetch = { type = "git"; - url = "https://github.com/Shopify/sarama"; - rev = "a6144ae922fd99dd0ea5046c8137acfb7fab0914"; - sha256 = "13x23kmjg7milzc34a0acll5b6q6yh9jfh7qjh6zran1inp9lnba"; + url = "https://github.com/influxdata/sarama.git"; + rev = "b12709e6ca29240128c89fe0b30b6a76be42b457"; + sha256 = "0hp8g1qwcir2356y48a1qsbhc8qvb44lswhlrc5vgnzscq54zj35"; }; } { @@ -122,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "bf8067ceb6e7f51e150c218972dccfeeed892b85"; - sha256 = "0kxw0blzxr5vc5c0il7hh178vv86ib7af3j9pnzsfzhm3byw0ccx"; + rev = "5312c8dac9067d339c4e68d7e0dd5507b2f01849"; + sha256 = "1ddm89qbnmnr6dh040m7093mn2zk15ncvdnw9w1ifj75sn5q69pn"; }; } { @@ -136,15 +136,6 @@ }; } { - goPackagePath = "github.com/bsm/sarama-cluster"; - fetch = { - type = "git"; - url = "https://github.com/bsm/sarama-cluster"; - rev = "cf455bc755fe41ac9bb2861e7a961833d9c2ecc3"; - sha256 = "000rklq9jx66bbbdklsvm7l9fd9r8d6k3qxx18xfjklblk1v9y19"; - }; - } - { goPackagePath = "github.com/caio/go-tdigest"; fetch = { type = "git"; @@ -163,6 +154,15 @@ }; } { + goPackagePath = "github.com/cisco-ie/nx-telemetry-proto"; + fetch = { + type = "git"; + url = "https://github.com/cisco-ie/nx-telemetry-proto"; + rev = "82441e232cf6af9be0f808bf0c6421ee8519880e"; + sha256 = "15l4a71hmw6w9pkq2dh1lpjb7sjq0v57qn8wkdhsyls3f2bczw9p"; + }; + } + { goPackagePath = "github.com/couchbase/go-couchbase"; fetch = { type = "git"; @@ -203,8 +203,8 @@ fetch = { type = "git"; url = "https://github.com/denisenkom/go-mssqldb"; - rev = "1eb28afdf9b6e56cf673badd47545f844fe81103"; - sha256 = "1p2x2k7azbp4cwdjn1nv0zzaf0fvxaysnjrlyxskqlm2cq5vp5ab"; + rev = "2be1aa521ff4499e74b7861a2779ba1e96e3e2c5"; + sha256 = "0c502ycxg7sdnpvwky5wm2xbxw03lspsjxbmvpabp78dlf3gnmhb"; }; } { @@ -302,8 +302,8 @@ fetch = { type = "git"; url = "https://github.com/eclipse/paho.mqtt.golang"; - rev = "36d01c2b4cbeb3d2a12063e4880ce30800af9560"; - sha256 = "1vgxdv4f1g92jx5sj143y3jc18sfd712il4rbaxckgrpsb7gq8ch"; + rev = "adca289fdcf8c883800aafa545bc263452290bae"; + sha256 = "1f81ia8pkfz2084bla4kirrh7yrfg8dy11gsi84m75j25nf762zn"; }; } { @@ -325,12 +325,12 @@ }; } { - goPackagePath = "github.com/go-ini/ini"; + goPackagePath = "github.com/glinton/ping"; fetch = { type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "358ee7663966325963d4e8b2e1fbd570c5195153"; - sha256 = "1zr51xaka7px1pmfndm12fvg6a3cr24kg77j28zczbfcc6h339gy"; + url = "https://github.com/glinton/ping"; + rev = "1983bc2fd5de3ea00aa5457bbc8774300e889db9"; + sha256 = "0ixxdwknb2pr1gsp9ay41pl6lhbzz487h43hnynix3gxl38lg6rc"; }; } { @@ -365,8 +365,8 @@ fetch = { type = "git"; url = "https://github.com/go-sql-driver/mysql"; - rev = "d523deb1b23d913de5bdada721a6071e71283618"; - sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n"; + rev = "72cd26f257d44c1114970e19afddcd812016007e"; + sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; }; } { @@ -415,6 +415,24 @@ }; } { + goPackagePath = "github.com/google/go-github"; + fetch = { + type = "git"; + url = "https://github.com/google/go-github"; + rev = "7462feb2032c2da9e3b85e9b04e6853a6e9e14ca"; + sha256 = "1sk43llk5fgb00l99rmrmfrk81da2gsvjl1m6r1k1chpjaghxj11"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "44c6ddd0a2342c386950e880b658017258da92fc"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + { goPackagePath = "github.com/google/uuid"; fetch = { type = "git"; @@ -496,6 +514,15 @@ }; } { + goPackagePath = "github.com/hashicorp/go-uuid"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-uuid"; + rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"; + sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; + }; + } + { goPackagePath = "github.com/hashicorp/serf"; fetch = { type = "git"; @@ -527,8 +554,8 @@ fetch = { type = "git"; url = "https://github.com/influxdata/toml"; - rev = "2a2e3012f7cfbef64091cc79776311e65dfa211b"; - sha256 = "1dyzsg79rgl5bcvq7i7cnwhxr7racyhfhmqdq2701zgv77v3rab3"; + rev = "270119a8ce653b297f12189c9099ef1409979f2b"; + sha256 = "1dprq2nx1kh78fqr6awir27ankjkbsjw2rza07ri5m2pxd3kxhsv"; }; } { @@ -545,8 +572,17 @@ fetch = { type = "git"; url = "https://github.com/jackc/pgx"; - rev = "89f1e6ac7276b61d885db5e5aed6fcbedd1c7e31"; - sha256 = "0qln29f443m9sw6yf0xy8m45wag9jg87hbwiplb511d5783l7jwk"; + rev = "8faa4453fc7051d1076053f8854077753ab912f2"; + sha256 = "0zx52pidklrmxkxja0i38zn4yq6z909jvyb30xr48qlsbjn5y6zx"; + }; + } + { + goPackagePath = "github.com/jcmturner/gofork"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/gofork"; + rev = "dc7c13fece037a4a36e2b3c69db4991498d30692"; + sha256 = "0xzsnjqv3d59w9pgqzf6550wdwaqnac7zcdgqfd25w65yhcffzhr"; }; } { @@ -554,8 +590,8 @@ fetch = { type = "git"; url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + rev = "c2b33e84"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; }; } { @@ -640,6 +676,15 @@ }; } { + goPackagePath = "github.com/mdlayher/apcupsd"; + fetch = { + type = "git"; + url = "https://github.com/mdlayher/apcupsd"; + rev = "2fe55d9e1d0704d3c6f03f69a1fd9ebe2aef9df1"; + sha256 = "1y8wabqln92h2g71aglgf0cp66b7zj8zb2wb03jhpfm75ssv1yyb"; + }; + } + { goPackagePath = "github.com/miekg/dns"; fetch = { type = "git"; @@ -721,6 +766,15 @@ }; } { + goPackagePath = "github.com/openconfig/gnmi"; + fetch = { + type = "git"; + url = "https://github.com/openconfig/gnmi"; + rev = "33a1865c302903e7a2e06f35960e6bc31e84b9f6"; + sha256 = "0yzsda16k9kwhq4kvsixsg6cb67vyn177x0h5n1s9zrrdxbvm05c"; + }; + } + { goPackagePath = "github.com/opencontainers/go-digest"; fetch = { type = "git"; @@ -860,8 +914,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "071446942108a03a13cf0717275ad3bdbcb691b4"; - sha256 = "0ai246kqsfm3xlnp4pp4d197djh6jrbjja832f355zhg3l9fqwfp"; + rev = "d80c43f9c984a48783daf22f4bd9278006ae483a"; + sha256 = "0zqcdvf0ym6nylz9ac1z38d3src8yws34n7gkvhpn52ikp801asn"; }; } { @@ -923,8 +977,8 @@ fetch = { type = "git"; url = "https://github.com/tidwall/gjson"; - rev = "f123b340873a0084cb27267eddd8ff615115fbff"; - sha256 = "1axph65dv3l0mmr2iis4r5jk2qy5ffdvh4gdxz4pv92jyincf5fj"; + rev = "d7c940e59395fdcaff4584cb442b2e7808f6711e"; + sha256 = "14x1g5gnziyh3vpr5mxpw2r5h65mncn548xdvamrpzngjm1idzhi"; }; } { @@ -937,6 +991,15 @@ }; } { + goPackagePath = "github.com/tidwall/pretty"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/pretty"; + rev = "1166b9ac2b65e46a43d8618d30d1554f4652d49b"; + sha256 = "1jwpj5903lh8hsj9apm2gwd70809zq0gjgmivkxaq4iq29wnv0n9"; + }; + } + { goPackagePath = "github.com/vishvananda/netlink"; fetch = { type = "git"; @@ -1030,7 +1093,7 @@ goPackagePath = "golang.org/x/net"; fetch = { type = "git"; - url = "https://go.googlesource.com/net"; + url = "https://github.com/golang/net.git"; rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"; sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp"; }; @@ -1039,7 +1102,7 @@ goPackagePath = "golang.org/x/oauth2"; fetch = { type = "git"; - url = "https://go.googlesource.com/oauth2"; + url = "https://github.com/golang/oauth2.git"; rev = "d2e6202438beef2727060aa7cabdd924d92ebfd9"; sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; }; @@ -1057,9 +1120,9 @@ goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "7c4c994c65f702f41ed7d6620a2cb34107576a77"; - sha256 = "19ss1k6id7dc0i61vw9arz03vpvwc2mxwdn99qq2galy0z3b8hbi"; + url = "https://github.com/golang/sys.git"; + rev = "51ab0e2deafac1f46c46ad59cf0921be2f180c3d"; + sha256 = "0xdhpckbql3bsqkpc2k5b1cpnq3q1qjqjjq2j3p707rfwb8nm91a"; }; } { @@ -1153,6 +1216,42 @@ }; } { + goPackagePath = "gopkg.in/jcmturner/aescts.v1"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/aescts"; + rev = "f6abebb3171c4c1b1fea279cb7c7325020a26290"; + sha256 = "0rbq4zf3db48xa2gqdp2swws7wizmbwagigqkr1zxzd1ramps6rv"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/dnsutils.v1"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/dnsutils"; + rev = "13eeb8d49ffb74d7a75784c35e4d900607a3943c"; + sha256 = "0l543c64pyzbnrc00jspg21672l3a0kjjw9pbdxwna93w8d8m927"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/gokrb5.v7"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/gokrb5"; + rev = "363118e62befa8a14ff01031c025026077fe5d6d"; + sha256 = "08mbag2283q1pyfi696g80521r9n1id3804r6sssrhf3kxzkfhnv"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/rpc.v1"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/rpc"; + rev = "99a8ce2fbf8b8087b6ed12a37c61b10f04070043"; + sha256 = "0hkmvf8qdcifnzym8kv1xhq7lq0wpr0i6gzff159lh9xn0wfg175"; + }; + } + { goPackagePath = "gopkg.in/ldap.v2"; fetch = { type = "git"; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index a1799839b64..248c05aab4f 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,12 +1,12 @@ generic: { v42 = generic { - version = "4.2.5"; - sha256 = "135bfafydmd66q97za84micymgf38s9zydp6jssrf7azik699fjd"; + version = "4.2.6"; + sha256 = "0r08v9ka0v8d7w133yr09vaxzl5lhbrsvbx900x15qv8lwliysv4"; }; v40 = generic { - version = "4.0.11"; - sha256 = "02c4c82vbc27v09rci7flvwvjyb5sx0mknw0fz5i8bb23k1jbbxh"; + version = "4.0.12"; + sha256 = "1jlbzlz0rzcjixicdcd7xcjhfqwr82hngpazx85f40r9dy574pjw"; }; v30 = generic { diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 3357f7a16c1..5ecf34282d7 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, fetchFromGitHub, cmake, docbook_xsl, libxslt -, openssl, libuuid, libwebsockets, c-ares, libuv +, openssl, libuuid, libwebsockets_3_1, c-ares, libuv , systemd ? null, withSystemd ? stdenv.isLinux }: stdenv.mkDerivation rec { pname = "mosquitto"; - version = "1.6.4"; + version = "1.6.6"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "1kr1dgc4nzhyg3rzymbv4rka3rpb30rwsy6binb7apnw3n3ff58l"; + sha256 = "01a1vf0rgncmhk7v9vnj4gdx0j8jfiy95f2hr4iwqdch7jy5q367"; }; postPatch = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - openssl libuuid libwebsockets c-ares libuv + openssl libuuid libwebsockets_3_1 c-ares libuv ] ++ lib.optional withSystemd systemd; nativeBuildInputs = [ cmake docbook_xsl libxslt ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source MQTT v3.1/3.1.1 broker"; - homepage = http://mosquitto.org/; + homepage = "https://mosquitto.org/"; license = licenses.epl10; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 95084458f47..d58d2bff813 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, autoconf, automake, flex, yacc -, kernel, glibc, perl, libtool_2, kerberos }: +, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: with (import ./srcs.nix { inherit fetchurl; }); @@ -11,6 +11,20 @@ in stdenv.mkDerivation { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; + patches = [ + # Linux 5.3 + (fetchpatch { + name = "openafs_1_8-recurse-keyring_search.patch"; + url = "http://git.openafs.org/?p=openafs.git;a=patch;h=02d82275c17284d04629282aa374bb39f511c989"; + sha256 = "03pkldwf6i67yf6i1705qp18rx5b0b342ryda8vfjw9lnvpinygs"; + }) + (fetchpatch { + name = "openafs_1_8-send-sig.patch"; + url = "http://git.openafs.org/?p=openafs.git;a=patch;h=2b7af1243f46496c0b5973b3fa2a6396243f7613"; + sha256 = "13gyh5ncpp15dl7056gdzl5xhp2bmafc557bd2a4bwx9nyj53bag"; + }) + ]; + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index cbe0dae3e14..b617fe6fa0e 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.16.5.1554-1e5ff713d"; + version = "1.16.6.1592-b9d49bdb7"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "1h2f8dgwz9bnvj7h4nk61a5rpl62918nwq6v85d97miwjfc1mv6n"; + sha256 = "12wff06nlvcssa6sf6vhxajfd1dnr9870xn9fac4q7gf0yayj27j"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index 90e27b2907e..da55131773b 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec { vobject python-dateutil passlib + setuptools ]; checkInputs = with python3.pkgs; [ diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index ed1362a0a52..440cd346522 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "13xfnlaqjisi9fm1p7ydhgrh86ccbfwkxbnrv8abdx80jwb0lm15"; + sha256 = "1knqgq8xrlvwfc3y2hki6p0zr4dblm7max37y01p3bf641gs748z"; }; cargoSha256 = "13sx7mbirhrd0is7gvnk0mir5qizbhrlvsn0v55ibf3bybjsb644"; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 9bec174a58a..044acbe1720 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -3,7 +3,7 @@ , docbook_xml_dtd_42, readline , popt, iniparser, libbsd, libarchive, libiconv, gettext , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs -, gnutls, ncurses, libunwind, systemd, jansson, lmdb, gpgme +, gnutls, ncurses, libunwind, systemd, jansson, lmdb, gpgme, libuuid , enableLDAP ? false , enablePrinting ? false @@ -20,37 +20,36 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.10.6"; + version = "4.10.8"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "0hpgdqlyczj98pkh2ldglvvnkrb1q541r3qikdvxq0qjvd9fpywy"; + sha256 = "1x0hlhb674fndfkmimjicnzs543n3i8465a5ifcmjwvzavxha7y4"; }; outputs = [ "out" "dev" "man" ]; - patches = - [ ./4.x-no-persistent-install.patch - ./patch-source3__libads__kerberos_keytab.c.patch - ./4.x-no-persistent-install-dynconfig.patch - ./4.x-fix-makeflags-parsing.patch - ]; + patches = [ + ./4.x-no-persistent-install.patch + ./patch-source3__libads__kerberos_keytab.c.patch + ./4.x-no-persistent-install-dynconfig.patch + ./4.x-fix-makeflags-parsing.patch + ]; nativeBuildInputs = optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ]; - buildInputs = - [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* - docbook_xml_dtd_45 */ readline popt iniparser jansson - libbsd libarchive zlib fam libiconv gettext libunwind krb5Full - ] - ++ optionals stdenv.isLinux [ libaio systemd ] + buildInputs = [ + python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* + docbook_xml_dtd_45 */ readline popt iniparser jansson + libbsd libarchive zlib fam libiconv gettext libunwind krb5Full + ] ++ optionals stdenv.isLinux [ libaio systemd ] ++ optional enableLDAP openldap ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi ++ optionals enableDomainController [ gnutls gpgme lmdb ] ++ optional enableRegedit ncurses ++ optional (enableCephFS && stdenv.isLinux) libceph - ++ optional (enableGlusterFS && stdenv.isLinux) glusterfs + ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] ++ optional enableAcl acl ++ optional enablePam pam; @@ -67,25 +66,24 @@ stdenv.mkDerivation rec { --replace "bld.SAMBA_BINARY('resolvconftest'" "True or bld.SAMBA_BINARY('resolvconftest'" ''; - configureFlags = - [ "--with-static-modules=NONE" - "--with-shared-modules=ALL" - "--with-system-mitkrb5" - "--with-system-mitkdc" krb5Full - "--enable-fhs" - "--sysconfdir=/etc" - "--localstatedir=/var" - "--disable-rpath" - ] - ++ [(if enableDomainController + configureFlags = [ + "--with-static-modules=NONE" + "--with-shared-modules=ALL" + "--with-system-mitkrb5" + "--with-system-mitkdc" krb5Full + "--enable-fhs" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--disable-rpath" + ] ++ singleton (if enableDomainController then "--with-experimental-mit-ad-dc" - else "--without-ad-dc")] + else "--without-ad-dc") ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ] ++ optional (!enableAcl) "--without-acl-support" ++ optional (!enablePam) "--without-pam"; preBuild = '' - export MAKEFLAGS="-j $NIX_BUILD_CORES" + export MAKEFLAGS="-j $NIX_BUILD_CORES" ''; # Some libraries don't have /lib/samba in RPATH but need it. @@ -105,7 +103,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.samba.org/; + homepage = "https://www.samba.org"; description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/servers/samba/master.nix b/pkgs/servers/samba/master.nix deleted file mode 100644 index 21038a0f218..00000000000 --- a/pkgs/servers/samba/master.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ fetchFromGitHub -, samba4 -, nettle -} : - - (samba4.overrideAttrs(oldAttrs: rec { - name = "samba-unstable-${version}"; - version = "2018-03-09"; - - src = fetchFromGitHub { - owner = "samba-team"; - repo = "samba"; - rev = "9e954bcbf43d67a18ee55f84cda0b09028f96b92"; - sha256 = "07j1pwm4kax6pq21gq9gpmp7dhj5afdyvkhgyl3yz334mb41q11g"; - }; - - # Remove unnecessary install flags, same as <4.8 patch - postPatch = oldAttrs.postPatch + '' - sed -i '423,433d' dynconfig/wscript - ''; - - patches = [ ./4.x-no-persistent-install.patch ]; - buildInputs = [ nettle ] ++ oldAttrs.buildInputs; - meta.branch = "master"; - })).override { - # samba4.8+ removed the ability to disable LDAP. - # Enable for base derivation here: - enableLDAP = true; - } diff --git a/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch b/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch deleted file mode 100644 index 64652c08c19..00000000000 --- a/pkgs/servers/sql/mariadb/cmake-fix-crypt-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libmariadb/plugins/auth/CMakeLists.txt b/libmariadb/plugins/auth/CMakeLists.txt -index aa599418..7a51f73b 100644 ---- a/libmariadb/plugins/auth/CMakeLists.txt -+++ b/libmariadb/plugins/auth/CMakeLists.txt -@@ -50,6 +50,7 @@ IF(WITH_SSL) - ${REF10_SOURCES} - ${CRYPT_SOURCE} - INCLUDES ${REF10_DIR} -+ LIBRARIES ${ED25519_LIBS} - COMPILE_OPTIONS -DMYSQL_CLIENT=1) - IF(MSVC) - # Silence conversion (integer truncantion) warnings from reference code diff --git a/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch b/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch new file mode 100644 index 00000000000..173fa1e0c63 --- /dev/null +++ b/pkgs/servers/sql/mariadb/cmake-without-plugin-auth-pam.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake +index f7790748..995621e0 100644 +--- a/cmake/build_configurations/mysql_release.cmake ++++ b/cmake/build_configurations/mysql_release.cmake +@@ -121,7 +121,6 @@ ENDIF() + + IF(UNIX) + SET(WITH_EXTRA_CHARSETS all CACHE STRING "") +- SET(PLUGIN_AUTH_PAM YES) + + IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") + IF(NOT IGNORE_AIO_CHECK) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ac14015c4cf..b188b2295a8 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy -, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5 +, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices , asio, buildEnv, check, scons @@ -28,21 +28,21 @@ galeraLibs = buildEnv { }; common = rec { # attributes common to both builds - version = "10.3.17"; + version = "10.3.18"; src = fetchurl { 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 = "15vh15az16932q42y9dxpzwxldmh0x4hvzrar3f8kblsqm7ym890"; + sha256 = "1p6yvmahnkmsz50zjzp20ak7jzbqysly5bdl51nnrngrbfl6qib9"; name = "mariadb-${version}.tar.gz"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - ncurses openssl zlib pcre jemalloc libiconv + ncurses openssl zlib pcre jemalloc libiconv curl ] ++ optionals stdenv.isLinux [ libaio systemd libkrb5 ] ++ optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; @@ -53,7 +53,6 @@ common = rec { # attributes common to both builds patches = [ ./cmake-includedir.patch ./cmake-libmariadb-includedir.patch - ./cmake-fix-crypt-libs.patch ]; cmakeFlags = [ @@ -68,7 +67,7 @@ common = rec { # attributes common to both builds "-DINSTALL_DOCDIR=share/doc/mysql" "-DINSTALL_DOCREADMEDIR=share/doc/mysql" "-DINSTALL_INCLUDEDIR=include/mysql" - "-DINSTALL_LIBDIR=lib/mysql" + "-DINSTALL_LIBDIR=lib" "-DINSTALL_PLUGINDIR=lib/mysql/plugin" "-DINSTALL_INFODIR=share/mysql/docs" "-DINSTALL_MANDIR=share/man" @@ -97,7 +96,7 @@ common = rec { # attributes common to both builds postInstall = '' rm "$out"/lib/mysql/plugin/daemon_example.ini mkdir -p "$dev"/bin && mv "$out"/bin/{mariadb_config,mysql_config} "$dev"/bin - mkdir -p "$dev"/lib/mysql && mv "$out"/lib/mysql/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib/mysql + mkdir -p "$dev"/lib/ && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib mkdir -p "$dev"/lib/mysql/plugin && mv "$out"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$dev"/lib/mysql/plugin ''; @@ -123,6 +122,7 @@ client = stdenv.mkDerivation (common // { patches = common.patches ++ [ ./cmake-plugin-includedir.patch + ./cmake-without-plugin-auth-pam.patch ]; cmakeFlags = common.cmakeFlags ++ [ @@ -136,14 +136,13 @@ client = stdenv.mkDerivation (common // { -DCMAKE_INSTALL_PREFIX_DEV=$dev" ''; - postInstall = common.postInstall + '' + postInstall = common.postInstall + '' rm -r "$out"/share/doc rm "$out"/bin/{mysqltest,mytop,wsrep_sst_rsync_wan} - libmysqlclient_path=$(readlink -f $out/lib/mysql/libmysqlclient${libExt}) - rm "$out"/lib/mysql/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}} - mv "$libmysqlclient_path" "$out"/lib/mysql/libmysqlclient${libExt} - ln -sv libmysqlclient${libExt} "$out"/lib/mysql/libmysqlclient_r${libExt} - + libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt}) + rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}} + mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt} + ln -sv libmysqlclient${libExt} "$out"/lib/libmysqlclient_r${libExt} ''; }); @@ -158,6 +157,7 @@ server = stdenv.mkDerivation (common // { xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl + ++ optional stdenv.isLinux linux-pam ++ optional (!stdenv.isDarwin) mytopEnv; patches = common.patches ++ [ @@ -166,7 +166,6 @@ server = stdenv.mkDerivation (common // { cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" - "-DINSTALL_PLUGINDIR=lib/mysql/plugin" "-DENABLED_LOCAL_INFILE=OFF" "-DWITH_READLINE=ON" "-DWITH_EXTRA_CHARSETS=all" @@ -196,7 +195,7 @@ server = stdenv.mkDerivation (common // { chmod +x "$out"/bin/wsrep_sst_common rm "$out"/bin/mysql_client_test rm -r "$out"/data # Don't need testing data - rm "$out"/lib/mysql/{libmysqlclient${libExt},libmysqlclient_r${libExt}} + rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}} mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString withoutClient '' ${ # We don't build with GSSAPI on Darwin diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index ae72b164b84..05fd405dbe6 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "0mggf5h6gh2mck75dmz5w63gi7d10pqs58fdp2jdpv3am75picll"; + sha256 = "0v4fj83zifcqhihc5myh0qv2396n5kw4sa8ix6jljmp6wh036z9j"; }; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 0b97c79c938..13aa5d942e5 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "2.6.2"; + version = "2.6.3"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost gmp cgal mpfr ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "09xy5pmiwq0lxf2m8p4q5r892mfmn32vf8m75p84jnz4707z1l0j"; + sha256 = "0jdjb8476vjgc7i26v2drcqjvhdbsk1wx243fddffg169nb664ml"; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 5f995995820..ef3dc4894d7 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.4.1"; + version = "1.4.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "1gbca0fyaxjkwijdp2ah4iykwq5xabz9kkf8ak76sif4lz64y54b"; + sha256 = "06mchpfjh4kskxq5r8b84870gl37xcqdf14n96qjb4nbyw9l8xcc"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" ]; diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix new file mode 100644 index 00000000000..62efabb022c --- /dev/null +++ b/pkgs/shells/liquidprompt/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "liquidprompt"; + version = "unstable-2018-05-21"; + + src = fetchFromGitHub { + owner = "nojhan"; + repo = pname; + rev = "eda83efe4e0044f880370ed5e92aa7e3fdbef971"; + sha256 = "1p7ah3x850ajpq07xvxxd7fx2i67cf0n71ww085g32k9fwij4rd4"; + }; + + installPhase = '' + install -D -m 0444 liquidprompt $out/bin/liquidprompt + install -D -m 0444 liquidpromptrc-dist $out/share/doc/liquidprompt/liquidpromptrc-dist + install -D -m 0444 liquid.theme $out/share/doc/liquidprompt/liquid.theme + + install -D -m 0444 liquidprompt.plugin.zsh \ + $out/share/zsh/plugins/liquidprompt/liquidprompt.plugin.zsh + install -D -m 0444 liquidprompt \ + $out/share/zsh/plugins/liquidprompt/liquidprompt + ''; + + meta = with stdenv.lib; { + description = "A full-featured & carefully designed adaptive prompt for Bash & Zsh"; + homepage = https://github.com/nojhan/liquidprompt; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ gerschtli ]; + }; +} diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 8aa66d65fad..7df43f7dab4 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-09-11"; + version = "2019-09-20"; pname = "oh-my-zsh"; - rev = "ddd359dd668f448856438304bedfe952d1749efd"; + rev = "6cfaa076272e08b6a81b6358b78d020e48f8a4a6"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "027f0si4ah8ppwypxip3ximkwbh4n9ghv7kip2cfj5h5nqlg786q"; + sha256 = "0i1mlw42g2w5pbg6zsl48pdwv1hy5zrwx9kq4w04mynwg7mc9hs5"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index ad7b46a907e..0e7536b4fa1 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "spaceship-prompt"; - version = "3.7.1"; + version = "3.11.2"; src = fetchFromGitHub { owner = "denysdovhan"; repo = "spaceship-prompt"; - sha256 = "0laihax18bs254rm2sww5wkjbmkp4m5c8aicgqpi4diz7difxk6z"; - rev = "aaa34aeab9ba0a99416788f627ec9aeffba392f0"; + sha256 = "1q7m9mmg82n4fddfz01y95d5n34xnzhrnn1lli0vih39sgmzim9b"; + rev = "v${version}"; }; installPhase = '' diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 8f62bd24dda..041964bcacc 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -62,7 +62,6 @@ rec { ]; mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ]; }); - static = true; }; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index ce77ebe8c1a..79ae1e50ca2 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation rec { description = "A fork of the bacula project"; license = licenses.agpl3; platforms = platforms.unix; + broken = true; }; } diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index d24da778dcd..8d23e955095 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Online backups for the truly paranoid"; homepage = "http://www.tarsnap.com/"; - license = "tarsnap"; + license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice roconnor ]; }; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 42889714e92..0a4207d0715 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, autoreconfHook, pkgconfig, perl, python , db, libgcrypt, avahi, libiconv, pam, openssl, acl -, ed, glibc +, ed, glibc, libevent }: stdenv.mkDerivation rec{ @@ -18,12 +18,13 @@ stdenv.mkDerivation rec{ nativeBuildInputs = [ autoreconfHook pkgconfig perl python python.pkgs.wrapPython ]; - buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ]; + buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ]; configureFlags = [ "--with-bdb=${db.dev}" "--with-ssl-dir=${openssl.dev}" "--with-lockfile=/run/lock/netatalk" + "--with-libevent=${libevent.dev}" "--localstatedir=/var/lib" ]; diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix new file mode 100644 index 00000000000..c393c65a720 --- /dev/null +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -0,0 +1,53 @@ +{ fetchFromGitHub +, fetchurl +, lz4 ? null +, lz4Support ? false +, lzma +, lzo +, stdenv +, xz +, zlib +}: + +assert lz4Support -> (lz4 != null); + +let + patch = fetchFromGitHub { + owner = "devttys0"; + repo = "sasquatch"; + rev = "3e0cc40fc6dbe32bd3a5e6c553b3320d5d91ceed"; + sha256 = "19lhndjv7v9w6nmszry63zh5rqii9v7wvsbpc2n6q606hyz955g2"; + } + "/patches/patch0.txt"; +in +stdenv.mkDerivation rec { + pname = "sasquatch"; + version = "4.3"; + + src = fetchurl { + url = mirror://sourceforge/squashfs/squashfs4.3.tar.gz; + sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d"; + }; + + buildInputs = [ lzma lzo xz zlib ] + ++ stdenv.lib.optional lz4Support lz4; + + patches = [ patch ]; + patchFlags = [ "-p0" ]; + + postPatch = '' + cd squashfs-tools + ''; + + installFlags = "INSTALL_DIR=\${out}/bin"; + + makeFlags = [ "XZ_SUPPORT=1" ] + ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; + + meta = with stdenv.lib; { + homepage = "https://github.com/devttys0/sasquatch"; + description = "Set of patches to the standard unsquashfs utility (part of squashfs-tools) that attempts to add support for as many hacked-up vendor-specific SquashFS implementations as possible"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.pamplemousse ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch b/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch deleted file mode 100644 index 5626800e723..00000000000 --- a/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 0ab12a8585373be2de5129e14d979c62e7a90d82 Mon Sep 17 00:00:00 2001 -From: Chris Lamb <lamby@debian.org> -Date: Mon, 21 Nov 2016 09:33:05 +0100 -Subject: [PATCH] If SOURCE_DATE_EPOCH is set, override timestamps with that - value. - -See https://reproducible-builds.org/specs/source-date-epoch/ for more -information about this environment variable. - -Based on a patch by Alexander Couzens <lynxis@fe...> posted on -https://sourceforge.net/p/squashfs/mailman/message/34673610/ - -Signed-off-by: Chris Lamb <lamby@debian.org> ---- - squashfs-tools/mksquashfs.c | 38 ++++++++++++++++++++++++++++++++++++- - 1 file changed, 37 insertions(+), 1 deletion(-) - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index c2098bd..b49e956 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -137,6 +137,9 @@ unsigned int cache_bytes = 0, cache_size = 0, inode_count = 0; - /* inode lookup table */ - squashfs_inode *inode_lookup_table = NULL; - -+/* override filesystem creation time */ -+time_t mkfs_fixed_time = -1; -+ - /* in memory directory data */ - #define I_COUNT_SIZE 128 - #define DIR_ENTRIES 32 -@@ -5104,6 +5107,9 @@ int main(int argc, char *argv[]) - int total_mem = get_default_phys_mem(); - int progress = TRUE; - int force_progress = FALSE; -+ char *source_date_epoch, *endptr; -+ unsigned long long epoch; -+ - struct file_buffer **fragment = NULL; - - if(argc > 1 && strcmp(argv[1], "-version") == 0) { -@@ -5641,6 +5647,36 @@ printOptions: - } - } - -+ /* if SOURCE_DATE_EPOCH is set, use that timestamp for the mkfs time */ -+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); -+ if(source_date_epoch) { -+ errno = 0; -+ epoch = strtoull(source_date_epoch, &endptr, 10); -+ if((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) -+ || (errno != 0 && epoch == 0)) { -+ ERROR("Environment variable $SOURCE_DATE_EPOCH: " -+ "strtoull: %s\n", strerror(errno)); -+ EXIT_MKSQUASHFS(); -+ } -+ if(endptr == source_date_epoch) { -+ ERROR("Environment variable $SOURCE_DATE_EPOCH: " -+ "No digits were found: %s\n", endptr); -+ EXIT_MKSQUASHFS(); -+ } -+ if(*endptr != '\0') { -+ ERROR("Environment variable $SOURCE_DATE_EPOCH: " -+ "Trailing garbage: %s\n", endptr); -+ EXIT_MKSQUASHFS(); -+ } -+ if(epoch > ULONG_MAX) { -+ ERROR("Environment variable $SOURCE_DATE_EPOCH: " -+ "value must be smaller than or equal to " -+ "%lu but was found to be: %llu \n", ULONG_MAX, epoch); -+ EXIT_MKSQUASHFS(); -+ } -+ mkfs_fixed_time = (time_t)epoch; -+ } -+ - /* - * Some compressors may need the options to be checked for validity - * once all the options have been processed -@@ -5993,7 +6029,7 @@ printOptions: - sBlk.flags = SQUASHFS_MKFLAGS(noI, noD, noF, noX, no_fragments, - always_use_fragments, duplicate_checking, exportable, - no_xattrs, comp_opts); -- sBlk.mkfs_time = time(NULL); -+ sBlk.mkfs_time = mkfs_fixed_time != -1 ? mkfs_fixed_time : time(NULL); - - disable_info(); - --- -2.17.0 - diff --git a/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch b/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch deleted file mode 100644 index 5002375887f..00000000000 --- a/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 32a07d4156a281084c90a4b78affc8b0b32a26fc Mon Sep 17 00:00:00 2001 -From: intrigeri <intrigeri@boum.org> -Date: Mon, 21 Nov 2016 11:41:28 +0000 -Subject: [PATCH] If SOURCE_DATE_EPOCH is set, also clamp content timestamps - with that value. - -Based on a patch by Alexander Couzens <lynxis@fe...> posted on -https://sourceforge.net/p/squashfs/mailman/message/34673610/ ---- - squashfs-tools/mksquashfs.c | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index b49e956..9f020bf 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -137,6 +137,9 @@ unsigned int cache_bytes = 0, cache_size = 0, inode_count = 0; - /* inode lookup table */ - squashfs_inode *inode_lookup_table = NULL; - -+/* clamp all timestamps to SOURCE_DATE_EPOCH */ -+time_t content_clamp_time = -1; -+ - /* override filesystem creation time */ - time_t mkfs_fixed_time = -1; - -@@ -2246,6 +2249,8 @@ restat: - pathname_reader(dir_ent), strerror(errno)); - goto read_err; - } -+ if(content_clamp_time != -1 && buf2.st_mtime >= content_clamp_time) -+ buf2.st_mtime = content_clamp_time; - - if(read_size != buf2.st_size) { - close(file); -@@ -3101,7 +3106,7 @@ void dir_scan(squashfs_inode *inode, char *pathname, - buf.st_mode = S_IRWXU | S_IRWXG | S_IRWXO | S_IFDIR; - buf.st_uid = getuid(); - buf.st_gid = getgid(); -- buf.st_mtime = time(NULL); -+ buf.st_mtime = content_clamp_time != -1 ? content_clamp_time : time(NULL); - buf.st_dev = 0; - buf.st_ino = 0; - dir_ent->inode = lookup_inode2(&buf, PSEUDO_FILE_OTHER, 0); -@@ -3127,6 +3115,8 @@ void dir_scan(squashfs_inode *inode, char *pathname, - /* source directory has disappeared? */ - BAD_ERROR("Cannot stat source directory %s because %s\n", - pathname, strerror(errno)); -+ if(content_clamp_time != -1 && buf.st_mtime >= content_clamp_time) -+ buf.st_mtime = content_clamp_time; - dir_ent->inode = lookup_inode(&buf); - } - -@@ -3365,6 +3372,8 @@ struct dir_info *dir_scan1(char *filename, char *subpath, - free_dir_entry(dir_ent); - continue; - } -+ if(content_clamp_time != -1 && buf.st_mtime >= content_clamp_time) -+ buf.st_mtime = content_clamp_time; - - if((buf.st_mode & S_IFMT) != S_IFREG && - (buf.st_mode & S_IFMT) != S_IFDIR && -@@ -3544,7 +3553,7 @@ void dir_scan2(struct dir_info *dir, struct pseudo *pseudo) - buf.st_gid = pseudo_ent->dev->gid; - buf.st_rdev = makedev(pseudo_ent->dev->major, - pseudo_ent->dev->minor); -- buf.st_mtime = time(NULL); -+ buf.st_mtime = content_clamp_time != -1 ? content_clamp_time : time(NULL); - buf.st_ino = pseudo_ino ++; - - if(pseudo_ent->dev->type == 'd') { -@@ -5674,7 +5683,7 @@ printOptions: - "%lu but was found to be: %llu \n", ULONG_MAX, epoch); - EXIT_MKSQUASHFS(); - } -- mkfs_fixed_time = (time_t)epoch; -+ mkfs_fixed_time = content_clamp_time = (time_t)epoch; - } - - /* --- -2.17.0 - diff --git a/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch b/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch deleted file mode 100644 index 4be4b96369a..00000000000 --- a/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch +++ /dev/null @@ -1,220 +0,0 @@ -From afc0c76a170bd17cbd29bbec6ae6d2227e398570 Mon Sep 17 00:00:00 2001 -From: Alexander Couzens <lynxis@fe80.eu> -Date: Fri, 13 Jan 2017 22:00:37 +0100 -Subject: [PATCH] remove frag_deflator_thread - -frag_deflator_thread compress fragments. -Replace the deflator_thread with a function and -use the function instead of the to_frag queue. ---- - squashfs-tools/info.c | 5 --- - squashfs-tools/mksquashfs.c | 76 +++++++++++++------------------------ - squashfs-tools/mksquashfs.h | 2 +- - squashfs-tools/restore.c | 15 +------- - 4 files changed, 30 insertions(+), 68 deletions(-) - -diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c -index 7968c77..028d578 100644 ---- a/squashfs-tools/info.c -+++ b/squashfs-tools/info.c -@@ -96,11 +96,6 @@ void dump_state() - printf("compressed block queue (deflate thread(s) -> main thread)\n"); - dump_seq_queue(to_main, 0); - -- printf("uncompressed packed fragment queue (main thread -> fragment" -- " deflate thread(s))\n"); -- dump_queue(to_frag); -- -- - printf("locked frag queue (compressed frags waiting while multi-block" - " file is written)\n"); - dump_queue(locked_fragment); -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index cf48e40..cacf14c 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -270,10 +270,10 @@ unsigned int sid_count = 0, suid_count = 0, sguid_count = 0; - struct cache *reader_buffer, *fragment_buffer, *reserve_cache; - struct cache *bwriter_buffer, *fwriter_buffer; - struct queue *to_reader, *to_deflate, *to_writer, *from_writer, -- *to_frag, *locked_fragment, *to_process_frag; -+ *locked_fragment, *to_process_frag; - struct seq_queue *to_main; - pthread_t reader_thread, writer_thread, main_thread; --pthread_t *deflator_thread, *frag_deflator_thread, *frag_thread; -+pthread_t *deflator_thread, *frag_thread; - pthread_t *restore_thread = NULL; - pthread_mutex_t fragment_mutex = PTHREAD_MUTEX_INITIALIZER; - pthread_mutex_t pos_mutex = PTHREAD_MUTEX_INITIALIZER; -@@ -323,7 +323,7 @@ struct dir_info *scan1_opendir(char *pathname, char *subpath, int depth); - void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad); - unsigned short get_checksum_mem(char *buff, int bytes); - void check_usable_phys_mem(int total_mem); -- -+void frag_deflator(struct file_buffer *file_buffer); - - void prep_exit() - { -@@ -1540,7 +1540,7 @@ void write_fragment(struct file_buffer *fragment) - pthread_mutex_lock(&fragment_mutex); - fragment_table[fragment->block].unused = 0; - fragments_outstanding ++; -- queue_put(to_frag, fragment); -+ frag_deflator(fragment); - pthread_cleanup_pop(1); - } - -@@ -2412,51 +2412,34 @@ void *deflator(void *arg) - } - - --void *frag_deflator(void *arg) -+void frag_deflator(struct file_buffer *file_buffer) - { -- void *stream = NULL; -- int res; - -- res = compressor_init(comp, &stream, block_size, 1); -- if(res) -- BAD_ERROR("frag_deflator:: compressor_init failed\n"); -- -- pthread_cleanup_push((void *) pthread_mutex_unlock, &fragment_mutex); -- -- while(1) { -- int c_byte, compressed_size; -- struct file_buffer *file_buffer = queue_get(to_frag); -- struct file_buffer *write_buffer = -+ int c_byte, compressed_size; -+ struct file_buffer *write_buffer = - cache_get(fwriter_buffer, file_buffer->block); - -- c_byte = mangle2(stream, write_buffer->data, file_buffer->data, -- file_buffer->size, block_size, noF, 1); -- compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); -- write_buffer->size = compressed_size; -- pthread_mutex_lock(&fragment_mutex); -- if(fragments_locked == FALSE) { -- fragment_table[file_buffer->block].size = c_byte; -- fragment_table[file_buffer->block].start_block = bytes; -- write_buffer->block = bytes; -- bytes += compressed_size; -- fragments_outstanding --; -- queue_put(to_writer, write_buffer); -- pthread_mutex_unlock(&fragment_mutex); -- TRACE("Writing fragment %lld, uncompressed size %d, " -- "compressed size %d\n", file_buffer->block, -- file_buffer->size, compressed_size); -- } else { -- add_pending_fragment(write_buffer, c_byte, -- file_buffer->block); -- pthread_mutex_unlock(&fragment_mutex); -- } -- cache_block_put(file_buffer); -+ c_byte = mangle2(stream, write_buffer->data, file_buffer->data, -+ file_buffer->size, block_size, noF, 1); -+ compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); -+ write_buffer->size = compressed_size; -+ if(fragments_locked == FALSE) { -+ fragment_table[file_buffer->block].size = c_byte; -+ fragment_table[file_buffer->block].start_block = bytes; -+ write_buffer->block = bytes; -+ bytes += compressed_size; -+ fragments_outstanding --; -+ queue_put(to_writer, write_buffer); -+ TRACE("Writing fragment %lld, uncompressed size %d, " -+ "compressed size %d\n", file_buffer->block, -+ file_buffer->size, compressed_size); -+ } else { -+ add_pending_fragment(write_buffer, c_byte, -+ file_buffer->block); - } -- -- pthread_cleanup_pop(0); -+ cache_block_put(file_buffer); - } - -- - struct file_buffer *get_file_buffer() - { - struct file_buffer *file_buffer = seq_queue_get(to_main); -@@ -4257,19 +4240,17 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, - multiply_overflow(processors * 3, sizeof(pthread_t))) - BAD_ERROR("Processors too large\n"); - -- deflator_thread = malloc(processors * 3 * sizeof(pthread_t)); -+ deflator_thread = malloc(processors * 2 * sizeof(pthread_t)); - if(deflator_thread == NULL) - MEM_ERROR(); - -- frag_deflator_thread = &deflator_thread[processors]; -- frag_thread = &frag_deflator_thread[processors]; -+ frag_thread = &deflator_thread[processors]; - - to_reader = queue_init(1); - to_deflate = queue_init(reader_size); - to_process_frag = queue_init(reader_size); - to_writer = queue_init(bwriter_size + fwriter_size); - from_writer = queue_init(1); -- to_frag = queue_init(fragment_size); - locked_fragment = queue_init(fragment_size); - to_main = seq_queue_init(); - reader_buffer = cache_init(block_size, reader_size, 0, 0); -@@ -4285,9 +4266,6 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, - for(i = 0; i < processors; i++) { - if(pthread_create(&deflator_thread[i], NULL, deflator, NULL)) - BAD_ERROR("Failed to create thread\n"); -- if(pthread_create(&frag_deflator_thread[i], NULL, frag_deflator, -- NULL) != 0) -- BAD_ERROR("Failed to create thread\n"); - if(pthread_create(&frag_thread[i], NULL, frag_thrd, - (void *) destination_file) != 0) - BAD_ERROR("Failed to create thread\n"); -diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h -index 55708a3..dc5bde4 100644 ---- a/squashfs-tools/mksquashfs.h -+++ b/squashfs-tools/mksquashfs.h -@@ -135,7 +135,7 @@ struct append_file { - extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; - struct cache *bwriter_buffer, *fwriter_buffer; - extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, -- *to_frag, *locked_fragment, *to_process_frag; -+ *locked_fragment, *to_process_frag; - extern struct append_file **file_mapping; - extern struct seq_queue *to_main; - extern pthread_mutex_t fragment_mutex, dup_mutex; -diff --git a/squashfs-tools/restore.c b/squashfs-tools/restore.c -index 5e336b3..a7aaf2e 100644 ---- a/squashfs-tools/restore.c -+++ b/squashfs-tools/restore.c -@@ -47,8 +47,8 @@ - #define TRUE 1 - - extern pthread_t reader_thread, writer_thread, main_thread; --extern pthread_t *deflator_thread, *frag_deflator_thread, *frag_thread; --extern struct queue *to_deflate, *to_writer, *to_frag, *to_process_frag; -+extern pthread_t *deflator_thread, *frag_thread; -+extern struct queue *to_deflate, *to_writer, *to_process_frag; - extern struct seq_queue *to_main; - extern void restorefs(); - extern int processors; -@@ -120,17 +120,6 @@ void *restore_thrd(void *arg) - pthread_cancel(main_thread); - pthread_join(main_thread, NULL); - -- /* then flush the main thread to fragment deflator thread(s) -- * queue. The fragment deflator thread(s) will idle -- */ -- queue_flush(to_frag); -- -- /* now kill the fragment deflator thread(s) */ -- for(i = 0; i < processors; i++) -- pthread_cancel(frag_deflator_thread[i]); -- for(i = 0; i < processors; i++) -- pthread_join(frag_deflator_thread[i], NULL); -- - /* - * then flush the main thread/fragment deflator thread(s) - * to writer thread queue. The writer thread will idle --- -2.17.0 - diff --git a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch b/pkgs/tools/filesystems/squashfs/4k-align.patch index c9c3dd3d760..e73c0678875 100644 --- a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch +++ b/pkgs/tools/filesystems/squashfs/4k-align.patch @@ -1,3 +1,7 @@ +This patch has been edited to apply to squashfs 4.4, commit +52eb4c279cd283ed9802dd1ceb686560b22ffb67. Below is the original +message body of the patch. + From 7bda7c75748f36b0a50f93e46144d5a4de4974ad Mon Sep 17 00:00:00 2001 From: Amin Hassani <ahassani@google.com> Date: Thu, 15 Dec 2016 10:43:15 -0800 @@ -16,20 +20,24 @@ increased_size = (number_of_unfragmented_files_in_image + number of fragments) * The 4k alignment can be enabled by flag '-4k-align' --- -diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c ---- a/squashfs-tools/mksquashfs.c 2019-07-06 15:50:22.214873176 +0000 -+++ b/squashfs-tools/mksquashfs.c 2019-07-06 15:51:22.244802582 +0000 -@@ -100,7 +100,9 @@ + squashfs-tools/mksquashfs.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index a45b77f..07b1c06 100644 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -102,7 +102,9 @@ int old_exclude = TRUE; int use_regex = FALSE; int nopad = FALSE; int exit_on_error = FALSE; +int do_4k_align = FALSE; - static off_t squashfs_start_offset = 0; + long long start_offset = 0; +#define ALIGN_UP(bytes, size) (bytes = (bytes + size - 1) & ~(size - 1)) long long global_uid = -1, global_gid = -1; -@@ -1495,6 +1497,9 @@ +@@ -1546,6 +1548,9 @@ void unlock_fragments() * queue at this time. */ while(!queue_empty(locked_fragment)) { @@ -39,17 +47,17 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c write_buffer = queue_get(locked_fragment); frg = write_buffer->block; size = SQUASHFS_COMPRESSED_SIZE_BLOCK(fragment_table[frg].size); -@@ -2414,6 +2419,9 @@ - compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); - write_buffer->size = compressed_size; - if(fragments_locked == FALSE) { -+ // 4k align the start of each fragment. -+ if(do_4k_align) -+ ALIGN_UP(bytes, 4096); - fragment_table[file_buffer->block].size = c_byte; - fragment_table[file_buffer->block].start_block = bytes; - write_buffer->block = bytes; -@@ -2728,6 +2736,10 @@ +@@ -2478,6 +2483,9 @@ void *frag_deflator(void *arg) + write_buffer->size = compressed_size; + pthread_mutex_lock(&fragment_mutex); + if(fragments_locked == FALSE) { ++ // 4k align the start of each fragment. ++ if(do_4k_align) ++ ALIGN_UP(bytes, 4096); + fragment_table[file_buffer->block].size = c_byte; + fragment_table[file_buffer->block].start_block = bytes; + write_buffer->block = bytes; +@@ -2877,6 +2885,10 @@ int write_file_blocks(squashfs_inode *inode, struct dir_ent *dir_ent, long long sparse = 0; struct file_buffer *fragment_buffer = NULL; @@ -60,7 +68,7 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c if(pre_duplicate(read_size)) return write_file_blocks_dup(inode, dir_ent, read_buffer, dup); -@@ -4808,6 +4820,7 @@ +@@ -4972,6 +4984,7 @@ void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad) "compressed", no_fragments ? "no" : noF ? "uncompressed" : "compressed", no_xattrs ? "no" : noX ? "uncompressed" : "compressed", noI || noId ? "uncompressed" : "compressed"); @@ -68,7 +76,7 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c printf("\tduplicates are %sremoved\n", duplicate_checking ? "" : "not "); printf("Filesystem size %.2f Kbytes (%.2f Mbytes)\n", bytes / 1024.0, -@@ -5570,6 +5583,8 @@ +@@ -5853,6 +5866,8 @@ print_compressor_options: root_name = argv[i]; } else if(strcmp(argv[i], "-version") == 0) { VERSION(); @@ -77,7 +85,7 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c } else { ERROR("%s: invalid option\n\n", argv[0]); printOptions: -@@ -5613,6 +5628,7 @@ +@@ -5904,6 +5919,7 @@ printOptions: ERROR("\t\t\tdirectory containing that directory, " "rather than the\n"); ERROR("\t\t\tcontents of the directory\n"); @@ -85,3 +93,6 @@ diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c ERROR("\nFilesystem filter options:\n"); ERROR("-p <pseudo-definition>\tAdd pseudo file " "definition\n"); +-- +2.23.0 + diff --git a/pkgs/tools/filesystems/squashfs/darwin.patch b/pkgs/tools/filesystems/squashfs/darwin.patch index 6022e65be47..eb2dc24ec1a 100644 --- a/pkgs/tools/filesystems/squashfs/darwin.patch +++ b/pkgs/tools/filesystems/squashfs/darwin.patch @@ -1,5 +1,11 @@ +Patch based on commits by Dave Vasilevsky <dave@vasilevsky.ca> and +Blake Riley <blake.riley@gmail.com>, squashed into a single patch, +with BSD-specific changes omitted. + +See also https://github.com/plougher/squashfs-tools/pull/69. + diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c -index 4b06ccb..26365e7 100644 +index 4b06ccb..3cad2ab 100644 --- a/squashfs-tools/action.c +++ b/squashfs-tools/action.c @@ -38,6 +38,10 @@ @@ -7,7 +13,7 @@ index 4b06ccb..26365e7 100644 #include <errno.h> +#ifndef FNM_EXTMATCH /* glibc extension */ -+ #define FNM_EXTMATCH 0 ++ #define FNM_EXTMATCH 0 +#endif + #include "squashfs_fs.h" @@ -28,21 +34,21 @@ index 4b06ccb..26365e7 100644 /* diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c -index 7968c77..c8e4c52 100644 +index fe23d78..5c2f835 100644 --- a/squashfs-tools/info.c +++ b/squashfs-tools/info.c -@@ -134,31 +134,22 @@ void dump_state() +@@ -144,31 +144,22 @@ void dump_state() void *info_thrd(void *arg) { sigset_t sigmask; - struct timespec timespec = { .tv_sec = 1, .tv_nsec = 0 }; - int sig, waiting = 0; -+ int sig, err, waiting = 0; ++ int sig, err, waiting = 0; sigemptyset(&sigmask); sigaddset(&sigmask, SIGQUIT); sigaddset(&sigmask, SIGHUP); -+ sigaddset(&sigmask, SIGALRM); ++ sigaddset(&sigmask, SIGALRM); while(1) { - if(waiting) @@ -64,11 +70,11 @@ index 7968c77..c8e4c52 100644 continue; default: - BAD_ERROR("sigtimedwait/sigwaitinfo failed " -+ BAD_ERROR("sigwaitfailed " ++ BAD_ERROR("sigwait failed " "because %s\n", strerror(errno)); } } -@@ -169,8 +160,12 @@ void *info_thrd(void *arg) +@@ -179,8 +170,12 @@ void *info_thrd(void *arg) /* set one second interval period, if ^\ received within then, dump queue and cache status */ waiting = 1; @@ -83,119 +89,46 @@ index 7968c77..c8e4c52 100644 } diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index d696a51..c86d1b3 100644 +index a45b77f..3607448 100644 --- a/squashfs-tools/mksquashfs.c +++ b/squashfs-tools/mksquashfs.c -@@ -50,6 +50,10 @@ +@@ -35,7 +35,12 @@ + #include <stddef.h> + #include <sys/types.h> + #include <sys/stat.h> ++#ifndef linux ++#include <sys/sysctl.h> ++#else ++#include <sys/sysinfo.h> + #include <sys/sysmacros.h> ++#endif + #include <fcntl.h> + #include <errno.h> + #include <dirent.h> +@@ -50,7 +55,10 @@ + #include <sys/wait.h> #include <limits.h> #include <ctype.h> - +-#include <sys/sysinfo.h> ++ +#ifndef FNM_EXTMATCH /* glibc extension */ -+ #define FNM_EXTMATCH 0 ++ #define FNM_EXTMATCH 0 +#endif -+ + #ifndef linux #define __BYTE_ORDER BYTE_ORDER - #define __BIG_ENDIAN BIG_ENDIAN -@@ -831,13 +835,13 @@ char *subpathname(struct dir_ent *dir_ent) - } - - --inline unsigned int get_inode_no(struct inode_info *inode) -+static inline unsigned int get_inode_no(struct inode_info *inode) - { - return inode->inode_number; - } - - --inline unsigned int get_parent_no(struct dir_info *dir) -+static inline unsigned int get_parent_no(struct dir_info *dir) - { - return dir->depth ? get_inode_no(dir->dir_ent->inode) : inode_no; - } -@@ -2030,7 +2034,7 @@ struct file_info *duplicate(long long file_size, long long bytes, - } - - --inline int is_fragment(struct inode_info *inode) -+static inline int is_fragment(struct inode_info *inode) - { - off_t file_size = inode->buf.st_size; - -@@ -2999,13 +3003,13 @@ struct inode_info *lookup_inode2(struct stat *buf, int pseudo, int id) - } - - --inline struct inode_info *lookup_inode(struct stat *buf) -+static inline struct inode_info *lookup_inode(struct stat *buf) - { - return lookup_inode2(buf, 0, 0); - } - - --inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this) -+static inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this) - { - if (inode->inode_number == 0) { - inode->inode_number = use_this ? : inode_no ++; -@@ -3016,7 +3020,7 @@ inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this) - } - - --inline struct dir_ent *create_dir_entry(char *name, char *source_name, -+static inline struct dir_ent *create_dir_entry(char *name, char *source_name, - char *nonstandard_pathname, struct dir_info *dir) - { - struct dir_ent *dir_ent = malloc(sizeof(struct dir_ent)); -@@ -3034,7 +3038,7 @@ inline struct dir_ent *create_dir_entry(char *name, char *source_name, - } - - --inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir, -+static inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir, - struct inode_info *inode_info) - { - struct dir_info *dir = dir_ent->our_dir; -@@ -3050,7 +3054,7 @@ inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir, - } - - --inline void add_dir_entry2(char *name, char *source_name, -+static inline void add_dir_entry2(char *name, char *source_name, - char *nonstandard_pathname, struct dir_info *sub_dir, - struct inode_info *inode_info, struct dir_info *dir) - { -@@ -3062,7 +3066,7 @@ inline void add_dir_entry2(char *name, char *source_name, - } - - --inline void free_dir_entry(struct dir_ent *dir_ent) -+static inline void free_dir_entry(struct dir_ent *dir_ent) - { - if(dir_ent->name) - free(dir_ent->name); -@@ -3083,7 +3087,7 @@ inline void free_dir_entry(struct dir_ent *dir_ent) - } - - --inline void add_excluded(struct dir_info *dir) -+static inline void add_excluded(struct dir_info *dir) - { - dir->excluded ++; - } -@@ -4200,6 +4204,7 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, +@@ -4348,6 +4356,7 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, sigemptyset(&sigmask); sigaddset(&sigmask, SIGQUIT); sigaddset(&sigmask, SIGHUP); + sigaddset(&sigmask, SIGALRM); - if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) == -1) + if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) BAD_ERROR("Failed to set signal mask in intialise_threads\n"); -@@ -4987,6 +4992,36 @@ int parse_num(char *arg, int *res) +@@ -5195,6 +5204,35 @@ int get_physical_memory() + long long page_size = sysconf(_SC_PAGESIZE); + int phys_mem; - int get_physical_memory() - { -+ int phys_mem; +#ifndef linux + #ifdef HW_MEMSIZE + #define SYSCTL_PHYSMEM HW_MEMSIZE @@ -223,50 +156,21 @@ index d696a51..c86d1b3 100644 + ERROR_EXIT(" Defaulting to least viable amount\n"); + phys_mem = SQUASHFS_LOWMEM; + } -+ #undef SYSCTL_PHYSMEM ++ #undef SYSCTL_PHYSMEM +#else - /* - * Long longs are used here because with PAE, a 32-bit - * machine can have more than 4GB of physical memory -@@ -4996,10 +5031,11 @@ int get_physical_memory() - */ - long long num_pages = sysconf(_SC_PHYS_PAGES); - long long page_size = sysconf(_SC_PAGESIZE); -- int phys_mem = num_pages * page_size >> 20; -+ phys_mem = num_pages * page_size >> 20; + if(num_pages == -1 || page_size == -1) { + struct sysinfo sys; + int res = sysinfo(&sys); +@@ -5207,6 +5245,7 @@ int get_physical_memory() + } - if(num_pages == -1 || page_size == -1) - return 0; + phys_mem = num_pages * page_size >> 20; +#endif if(phys_mem < SQUASHFS_LOWMEM) BAD_ERROR("Mksquashfs requires more physical memory than is " -diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h -index 55708a3..d44d1fd 100644 ---- a/squashfs-tools/mksquashfs.h -+++ b/squashfs-tools/mksquashfs.h -@@ -24,6 +24,7 @@ - * mksquashfs.h - * - */ -+#include <pthread.h> - - struct dir_info { - char *pathname; -diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c -index cb74cf6..fe2b4bc 100644 ---- a/squashfs-tools/pseudo.c -+++ b/squashfs-tools/pseudo.c -@@ -30,6 +30,7 @@ - #include <errno.h> - #include <string.h> - #include <stdlib.h> -+#include <sys/stat.h> - #include <sys/types.h> - #include <sys/wait.h> - #include <sys/stat.h> diff --git a/squashfs-tools/read_xattrs.c b/squashfs-tools/read_xattrs.c -index 42106f5..837d3fb 100644 +index 4debedf..3257c30 100644 --- a/squashfs-tools/read_xattrs.c +++ b/squashfs-tools/read_xattrs.c @@ -39,13 +39,13 @@ @@ -286,10 +190,10 @@ index 42106f5..837d3fb 100644 extern int read_block(int, long long, long long *, int, void *); diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c -index f190e96..927e441 100644 +index 727f1d5..c1a6183 100644 --- a/squashfs-tools/unsquashfs.c +++ b/squashfs-tools/unsquashfs.c -@@ -32,7 +32,12 @@ +@@ -32,8 +32,12 @@ #include "stdarg.h" #include "fnmatch_compat.h" @@ -297,21 +201,40 @@ index f190e96..927e441 100644 +#include <sys/sysctl.h> +#else #include <sys/sysinfo.h> + #include <sys/sysmacros.h> +#endif -+ #include <sys/types.h> #include <sys/time.h> #include <sys/resource.h> -@@ -2185,6 +2190,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size) +@@ -1080,7 +1084,7 @@ int create_inode(char *pathname, struct inode *i) + break; + case SQUASHFS_SYMLINK_TYPE: + case SQUASHFS_LSYMLINK_TYPE: { +- struct timespec times[2] = { ++ struct timeval times[2] = { + { i->time, 0 }, + { i->time, 0 } + }; +@@ -1099,8 +1103,7 @@ int create_inode(char *pathname, struct inode *i) + goto failed; + } + +- res = utimensat(AT_FDCWD, pathname, times, +- AT_SYMLINK_NOFOLLOW); ++ res = lutimes(pathname, times); + if(res == -1) { + EXIT_UNSQUASH_STRICT("create_inode: failed to set time on " + "%s, because %s\n", pathname, +@@ -2235,6 +2238,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size) sigemptyset(&sigmask); sigaddset(&sigmask, SIGQUIT); sigaddset(&sigmask, SIGHUP); + sigaddset(&sigmask, SIGALRM); - if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) == -1) + if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) EXIT_UNSQUASH("Failed to set signal mask in initialise_threads" "\n"); diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h -index 0edbd25..cea9caa 100644 +index 934618b..0e680ab 100644 --- a/squashfs-tools/unsquashfs.h +++ b/squashfs-tools/unsquashfs.h @@ -46,6 +46,10 @@ @@ -319,7 +242,7 @@ index 0edbd25..cea9caa 100644 #include <sys/time.h> +#ifndef FNM_EXTMATCH /* glibc extension */ -+ #define FNM_EXTMATCH 0 ++ #define FNM_EXTMATCH 0 +#endif + #ifndef linux @@ -381,7 +304,7 @@ index c8e2b9b..7d4f7af 100644 } diff --git a/squashfs-tools/unsquashfs_xattr.c b/squashfs-tools/unsquashfs_xattr.c -index 59f4aae..13f0e35 100644 +index 7742dfe..f8cd3b6 100644 --- a/squashfs-tools/unsquashfs_xattr.c +++ b/squashfs-tools/unsquashfs_xattr.c @@ -27,6 +27,11 @@ @@ -389,15 +312,15 @@ index 59f4aae..13f0e35 100644 #include <sys/xattr.h> +#ifdef XATTR_NOFOLLOW /* Apple's xattrs */ -+ #define lsetxattr(path_, name_, val_, sz_, flags_) \ -+ setxattr(path_, name_, val_, sz_, 0, flags_ | XATTR_NOFOLLOW) ++ #define lsetxattr(path_, name_, val_, sz_, flags_) \ ++ setxattr(path_, name_, val_, sz_, 0, flags_ | XATTR_NOFOLLOW) +#endif + #define NOSPACE_MAX 10 extern int root_process; diff --git a/squashfs-tools/xattr.c b/squashfs-tools/xattr.c -index b46550c..5b32eca 100644 +index 64dfd82..d82d186 100644 --- a/squashfs-tools/xattr.c +++ b/squashfs-tools/xattr.c @@ -22,6 +22,14 @@ @@ -420,12 +343,15 @@ index b46550c..5b32eca 100644 #include <sys/xattr.h> +#ifdef XATTR_NOFOLLOW /* Apple's xattrs */ -+ #define llistxattr(path_, buf_, sz_) \ -+ listxattr(path_, buf_, sz_, XATTR_NOFOLLOW) -+ #define lgetxattr(path_, name_, val_, sz_) \ -+ getxattr(path_, name_, val_, sz_, 0, XATTR_NOFOLLOW) ++ #define llistxattr(path_, buf_, sz_) \ ++ listxattr(path_, buf_, sz_, XATTR_NOFOLLOW) ++ #define lgetxattr(path_, name_, val_, sz_) \ ++ getxattr(path_, name_, val_, sz_, 0, XATTR_NOFOLLOW) +#endif + #include "squashfs_fs.h" #include "squashfs_swap.h" #include "mksquashfs.h" +-- +2.23.0 + diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 5bd3b27eded..15a535eed3b 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -8,26 +8,20 @@ assert lz4Support -> (lz4 != null); stdenv.mkDerivation { pname = "squashfs"; - version = "4.4dev_20180612"; + version = "4.4"; src = fetchFromGitHub { owner = "plougher"; repo = "squashfs-tools"; - sha256 = "1y53z8dkph3khdyhkmkmy0sg9p1n8czv3vj4l324nj8kxyih3l2c"; - rev = "6e242dc95485ada8d1d0b3dd9346c5243d4a517f"; + sha256 = "0697fv8n6739mcyn57jclzwwbbqwpvjdfkv1qh9s56lvyqnplwaw"; + # Tag "4.4" points to this commit. + rev = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"; }; patches = [ - # These patches ensures that mksquashfs output is reproducible. - # See also https://reproducible-builds.org/docs/system-images/ - # and https://github.com/NixOS/nixpkgs/issues/40144. - ./0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch - ./0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch - ./0003-remove-frag-deflator-thread.patch - # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. - ./squashfs-tools-4.4-4k-align.patch + ./4k-align.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ zlib xz zstd ] diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index 87686108720..d7603c42fca 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -24,7 +24,16 @@ in stdenv.mkDerivation rec { osl seexpr makeWrapper ]; - NIX_CFLAGS_COMPILE = "-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR -I${openimageio.dev}/include/OpenImageIO -Wno-unused-but-set-variable"; + NIX_CFLAGS_COMPILE = [ + "-I${openexr.dev}/include/OpenEXR" + "-I${ilmbase.dev}/include/OpenEXR" + "-I${openimageio.dev}/include/OpenImageIO" + + "-Wno-unused-but-set-variable" + "-Wno-error=class-memaccess" + "-Wno-error=maybe-uninitialized" + "-Wno-error=catch-value" + ]; cmakeFlags = [ "-DUSE_EXTERNAL_XERCES=ON" "-DUSE_EXTERNAL_OCIO=ON" "-DUSE_EXTERNAL_OIIO=ON" diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index b183df701a7..93084640e76 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.9.0"; + version = "0.9.4"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0i6ayp295xnppq92lc1fsfyrjkxrkvsva07yby45qa0l92nihqpy"; + sha256 = "1im04vlhmjdwzp19pizk4bmzvybgjg40ig833qx5lbisfs74xyxw"; }; - cargoSha256 = "1qdi1l0k0v00r9mfxgf09dzkvgxn07rcsl2yyyrhvcn731ak302y"; + cargoSha256 = "0675995zh9nn690kdha3zfsa157173rxwcqz0kasbl9byjczi6sm"; meta = with stdenv.lib; { description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index efeb760e560..18e80ab6e4a 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "datamash"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "mirror://gnu/datamash/${pname}-${version}.tar.gz"; - sha256 = "fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1b91pbdarnfmbhid8aa2f50k0fln8n7pg62782b4y0jlzvaljqi2"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 7465cb67f61..76661c77f7b 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "7.3.0"; + version = "7.4.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "0y4657w1pi4x9nmbv551dj00dyiv935m8ph7jlv00chwy3hrb3yi"; + sha256 = "108p1p9bxhg4qzwfs6wqcakcvlpqw3w498jkz1vhmg6jp1mbmgdr"; }; - cargoSha256 = "1qqlii9693ih7pxl80v515a13jar3yayr5v7pa57x14i9syir10c"; + cargoSha256 = "0ylanxcb1vrhvm9h3lvq8nh28362wi5hjy0pqdv5lh40pphcknnz"; preFixup = '' install -Dm644 "$src/doc/fd.1" "$out/man/man1/fd.1" diff --git a/pkgs/tools/misc/mtm/default.nix b/pkgs/tools/misc/mtm/default.nix index d0bf3521c7c..b518a159e91 100644 --- a/pkgs/tools/misc/mtm/default.nix +++ b/pkgs/tools/misc/mtm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mtm"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "deadpixi"; repo = pname; rev = version; - sha256 = "0q23z1dfjz3qkmxqm0d8sg81gn6w1j2n2j6c9hk1kk7iv21v1zb0"; + sha256 = "0k9xachd9wnyhj8sh4yninckgwm3a7zdxnn490x65ikn4vqb7w8x"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index 78426329975..d68ed9c5cd3 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, +{ stdenv, fetchFromGitLab, makeWrapper, nixosTests, # optional dependencies, the command(s) they provide coreutils, # mktemp grub2, # grub-mount and grub-probe @@ -9,11 +9,14 @@ ntfs3g # ntfs3g }: stdenv.mkDerivation rec { - version = "1.76"; + version = "1.77"; pname = "os-prober"; - src = fetchurl { - url = "https://salsa.debian.org/philh/os-prober/-/archive/${version}/os-prober-${version}.tar.bz2"; - sha256 = "07rw3092pckh21vx6y4hzqcn3wn4cqmwxaaiq100lncnhmszg11g"; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "installer-team"; + repo = pname; + rev = version; + sha256 = "05sji756xdl67pp2sf7rk0ih9h6f6kgk9nvxlyv1bzbmcizlh2d2"; }; buildInputs = [ makeWrapper ]; @@ -56,6 +59,9 @@ stdenv.mkDerivation rec { done; ''; + passthru.tests = { + os-prober = nixosTests.os-prober; + }; meta = with stdenv.lib; { description = "Utility to detect other OSs on a set of drives"; homepage = http://packages.debian.org/source/sid/os-prober; diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index fbb56b98be7..952268b26f0 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -4,22 +4,17 @@ let inherit (lib) getDev; in mkDerivation rec { pname = "qt5ct"; - version = "0.39"; + version = "0.41"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "069y6c17gfics8rz3rdsn2x2hb39m4qka08ygwpxa8gqppffqs9p"; + sha256 = "1p2p6116wg5bc0hcbi2sygwlgk0g9idxpci0qdh3p4lb1plk0h7j"; }; nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtbase ]; - # Wayland needs to know the desktop file name in order to show the app name and icon. - # Patch has been upstreamed and can be removed in the future. - # See: https://sourceforge.net/p/qt5ct/code/549/ - patches = [ ./wayland.patch ]; - qmakeFlags = [ "LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease" ]; diff --git a/pkgs/tools/misc/qt5ct/wayland.patch b/pkgs/tools/misc/qt5ct/wayland.patch deleted file mode 100644 index fe186cfa469..00000000000 --- a/pkgs/tools/misc/qt5ct/wayland.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/qt5ct/main.cpp -+++ b/src/qt5ct/main.cpp -@@ -29,14 +29,18 @@ - #include <QApplication> - #include <QLibraryInfo> - #include <QLocale> --#include "qt5ct.h" -+#include <QtGlobal> - #include <QTranslator> - #include <QtDebug> -+#include "qt5ct.h" - #include "mainwindow.h" - - int main(int argc, char **argv) - { - QApplication app(argc, argv); -+#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) -+ QGuiApplication::setDesktopFileName("qt5ct.desktop"); -+#endif - QTranslator translator; - QString locale = Qt5CT::systemLanguageID(); - translator.load(QString(":/qt5ct_") + locale);
\ No newline at end of file diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index c51bf998b32..5d571e0c022 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - sha256 = "164qxbzlzg53xicp2n5kg9qbmvlckc6rk78n69s82d2d09mbq1ks"; + sha256 = "0vlpvacay25dzb5wix9jd91j0j1nrwz4k8zglj7210mhabfpnxvb"; }; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "192lq0wf8c2p3s4n6c0xr02hwyswypxypimbghi4m8f3fgj2l3ig"; + cargoSha256 = "0p16pa9psbj9126b4p61l0skmmasp2ms6c6r5rh3dfr8gg77qzpa"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 12ba89304c0..b530193258c 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -2,20 +2,23 @@ , gitMinimal }: let - inherit (python3Packages) python nose pycrypto pyyaml requests mock; + + inherit (python3Packages) + python nose pycrypto pyyaml requests mock python-dateutil setuptools; + in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "2.2"; + version = "2.4"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "02yjz17x8dl5spn7mcbj1ji7vsyx0qwwa60zqyrdxpr03g1rnhdz"; + sha256 = "146ss7pzh61yw84crk6hzfxkfdnf6bq07m11b6lgsw4hsn71g59w"; }; pythonPaths = [ pycrypto pyyaml requests ]; - buildInputs = [ python perl nose mock makeWrapper ] ++ pythonPaths; + buildInputs = [ python perl nose mock makeWrapper python-dateutil setuptools ] ++ pythonPaths; nativeBuildInputs = [ gitMinimal zip ]; postPatch = '' @@ -32,9 +35,6 @@ in stdenv.mkDerivation rec { doCheck = true; checkPhase = '' - sed -i "/def test_parse_m3u8/i\\ - @unittest.skip('requires internet')" lib/svtplay_dl/tests/hls.py - sh scripts/run-tests.sh -2 ''; diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index a71666b7acd..c47fe77fb76 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "txr"; - version = "224"; + version = "225"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "10xz140i4sam9r7r8rz5mz5jbwal7xvaimzrb7lmisqsvby2qcw7"; + sha256 = "07vh0rmvjr2sir15l3ppp2pnp2d849dg17rzykkzqyk3d5rwfxyj"; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix index f2c0f43cca9..a6fe1853ae5 100644 --- a/pkgs/tools/misc/uhubctl/default.nix +++ b/pkgs/tools/misc/uhubctl/default.nix @@ -3,21 +3,20 @@ , libusb }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "uhubctl"; - version = "unstable-2019-07-31"; + version = "2.1.0"; src = fetchFromGitHub { owner = "mvp"; repo = "uhubctl"; - rev = "1961aa02e9924a54a6219d16c61a0beb0d626e46"; - sha256 = "15mvqp1xh079nqp0mynh3l1wmw4maa320pn4jr8bz7nh3knmk0n1"; + rev = "refs/tags/v${version}"; + sha256 = "1cgmwsf68g49k6q4jvz073bpjhg5p73kk1a4kbgkxmvx01gmbcmq"; }; buildInputs = [ libusb ]; - installFlags = [ "prefix=$(out)" ]; - + installFlags = [ "prefix=${placeholder "out"}" ]; meta = with stdenv.lib; { homepage = "https://github.com/mvp/uhubctl"; description = "Utility to control USB power per-port on smart USB hubs"; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 3be931a362b..20405991331 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -4,12 +4,12 @@ , time, utillinux, which, writeScript, xfsprogs, runtimeShell }: stdenv.mkDerivation { - name = "xfstests-2018-04-11"; + name = "xfstests-2019-09-08"; src = fetchgit { url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; - rev = "fdf6d4bc862bb3269c95986fdaf1c59271762ad6"; - sha256 = "16j1kcmj0xq6s2qw4hll5r5cz7q4vbbsy2nh1g5aaq7xsl3h8mhb"; + rev = "0837e907988a5f410cae0ae714f42f9c4242e072"; + sha256 = "1f5cv0vwc1g9difzp69k49rc5nfd08y72vdg318j25nv3rwv7wc9"; }; nativeBuildInputs = [ @@ -23,6 +23,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; patchPhase = '' + substituteInPlace Makefile \ + --replace "cp include/install-sh ." "cp -f include/install-sh ." + # Patch the destination directory sed -i include/builddefs.in -e "s|^PKG_LIB_DIR\s*=.*|PKG_LIB_DIR=$out/lib/xfstests|" diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index aed902044f9..adce403f35d 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = "v${version}"; - sha256 = "17klcw2iv7d636mp7fb80kjvqd3xqkzqhwz41ri1l029dxji4zzh"; + sha256 = "13cfdghkprkaxgrbwsjndbza2mjxm2x774lnq7q4gfyc48mzwi70"; }; dontBuild = true; - buildInputs = [ lua ]; + buildInputs = [ (lua.withPackages (p: with p; [ luafilesystem ])) ]; installPhase = '' install -Dm755 z.lua $out/bin/z diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index 068d51229cb..05e9ba1282e 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "boringtun"; @@ -21,6 +21,8 @@ rustPlatform.buildRustPackage rec { # we append a new line to the end of file. preConfigure = "echo '' >> .cargo/config"; + buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + # Testing this project requires sudo, Docker and network access, etc. doCheck = false; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index 6395fcf09eb..cf3c173e1b2 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python3Packages }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "httpie"; version = "1.0.3"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; sha256 = "103fcigpxf4nqmrdqjnyz7d9n4n16906slwmmqqc0gkxv8hnw6vd"; }; - propagatedBuildInputs = with pythonPackages; [ pygments requests ]; + propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ]; doCheck = false; diff --git a/pkgs/tools/networking/httplz/cargo-lock.patch b/pkgs/tools/networking/httplz/cargo-lock.patch index f88998902c5..1d1632a0e82 100644 --- a/pkgs/tools/networking/httplz/cargo-lock.patch +++ b/pkgs/tools/networking/httplz/cargo-lock.patch @@ -1,9 +1,9 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..731829e +index 0000000..fe230f5 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,1403 @@ +@@ -0,0 +1,1190 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] @@ -12,20 +12,11 @@ index 0000000..731829e +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "advapi32-sys" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "aho-corasick" -+version = "0.6.9" ++version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -33,7 +24,7 @@ index 0000000..731829e +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -43,17 +34,16 @@ index 0000000..731829e + +[[package]] +name = "atty" -+version = "0.2.11" ++version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "autocfg" -+version = "0.1.2" ++version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -61,8 +51,8 @@ index 0000000..731829e +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -70,17 +60,12 @@ index 0000000..731829e +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bitflags" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "bitflags" -+version = "1.0.4" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -88,7 +73,7 @@ index 0000000..731829e +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -102,13 +87,8 @@ index 0000000..731829e +] + +[[package]] -+name = "build_const" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "byteorder" -+version = "1.3.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -125,7 +105,7 @@ index 0000000..731829e +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -134,31 +114,31 @@ index 0000000..731829e +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cc" -+version = "1.0.28" ++version = "1.0.45" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "cfg-if" -+version = "0.1.6" ++version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "clap" -+version = "2.32.0" ++version = "2.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -167,16 +147,7 @@ index 0000000..731829e +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "core-foundation" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -190,64 +161,49 @@ index 0000000..731829e + +[[package]] +name = "core-foundation-sys" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "core-foundation-sys" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "crc" -+version = "1.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "crc32fast" -+version = "1.1.2" ++version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ctrlc" -+version = "3.1.1" ++version = "3.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dtoa" -+version = "0.4.3" ++version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "embed-resource" -+version = "1.1.4" ++version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "winreg 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "flate2" -+version = "1.0.6" ++version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -265,7 +221,7 @@ index 0000000..731829e + +[[package]] +name = "fuchsia-cprng" -+version = "0.1.0" ++version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -275,60 +231,61 @@ index 0000000..731829e + +[[package]] +name = "getrandom" -+version = "0.1.10" ++version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "httparse" -+version = "1.3.3" ++version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "https" -+version = "1.5.2" ++version = "1.6.0" +dependencies = [ + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ctrlc 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "embed-resource 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "embed-resource 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "hyper" -+version = "0.10.15" ++version = "0.10.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -338,21 +295,11 @@ index 0000000..731829e + +[[package]] +name = "hyper-native-tls" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "hyper-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", + "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -368,15 +315,15 @@ index 0000000..731829e + +[[package]] +name = "iron" -+version = "0.6.0" ++version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", + "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -388,27 +335,13 @@ index 0000000..731829e +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "kernel32-sys" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "language-tags" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "lazy_static" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "lazy_static" -+version = "1.2.0" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -426,15 +359,15 @@ index 0000000..731829e +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "log" -+version = "0.4.6" ++version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -453,12 +386,8 @@ index 0000000..731829e + +[[package]] +name = "memchr" -+version = "2.1.3" ++version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "mime" @@ -470,7 +399,7 @@ index 0000000..731829e + +[[package]] +name = "mime_guess" -+version = "1.8.6" ++version = "1.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -481,63 +410,38 @@ index 0000000..731829e + +[[package]] +name = "miniz-sys" -+version = "0.1.11" ++version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "miniz_oxide" -+version = "0.2.1" ++version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "miniz_oxide_c_api" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "modifier" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "native-tls" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "native-tls" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", -+ "schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -545,12 +449,12 @@ index 0000000..731829e + +[[package]] +name = "nix" -+version = "0.11.0" ++version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -560,32 +464,23 @@ index 0000000..731829e +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-traits" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "num_cpus" -+version = "1.9.0" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "openssl" -+version = "0.9.24" ++name = "num_cpus" ++version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -593,10 +488,10 @@ index 0000000..731829e +version = "0.10.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -611,11 +506,11 @@ index 0000000..731829e +version = "0.9.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -624,6 +519,11 @@ index 0000000..731829e +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "phf" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -660,7 +560,7 @@ index 0000000..731829e + +[[package]] +name = "pkg-config" -+version = "0.3.14" ++version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -683,43 +583,31 @@ index 0000000..731829e + +[[package]] +name = "rand" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_jitter 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand" -+version = "0.7.0" ++version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -728,7 +616,7 @@ index 0000000..731829e +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -738,7 +626,7 @@ index 0000000..731829e +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -746,20 +634,20 @@ index 0000000..731829e +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_core" -+version = "0.4.0" ++version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "rand_core" -+version = "0.5.0" ++version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -775,7 +663,7 @@ index 0000000..731829e +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -788,34 +676,34 @@ index 0000000..731829e + +[[package]] +name = "rand_jitter" -+version = "0.1.2" ++version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_os" -+version = "0.1.2" ++version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_pcg" -+version = "0.1.1" ++version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -836,43 +724,31 @@ index 0000000..731829e + +[[package]] +name = "redox_syscall" -+version = "0.1.51" ++version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "redox_termios" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "regex" -+version = "1.1.0" ++version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.5" ++version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "remove_dir_all" -+version = "0.5.1" ++version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -880,7 +756,7 @@ index 0000000..731829e +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -888,36 +764,17 @@ index 0000000..731829e +] + +[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "safemem" -+version = "0.3.0" ++version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "schannel" -+version = "0.1.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "security-framework" -+version = "0.1.16" ++version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -933,15 +790,6 @@ index 0000000..731829e + +[[package]] +name = "security-framework-sys" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "security-framework-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ @@ -949,19 +797,6 @@ index 0000000..731829e +] + +[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "serde" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -989,7 +824,7 @@ index 0000000..731829e +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1002,15 +837,12 @@ index 0000000..731829e + +[[package]] +name = "smallvec" -+version = "0.6.8" ++version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "strsim" -+version = "0.7.0" ++version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1032,12 +864,11 @@ index 0000000..731829e +] + +[[package]] -+name = "tempdir" -+version = "0.3.7" ++name = "tabwriter" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1045,30 +876,20 @@ index 0000000..731829e +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "termion" -+version = "1.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "textwrap" -+version = "0.10.0" ++version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1076,7 +897,7 @@ index 0000000..731829e +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1085,8 +906,8 @@ index 0000000..731829e +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1113,11 +934,6 @@ index 0000000..731829e +] + +[[package]] -+name = "ucd-util" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "unicase" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1127,7 +943,7 @@ index 0000000..731829e + +[[package]] +name = "unicase" -+version = "2.2.0" ++version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1146,12 +962,12 @@ index 0000000..731829e +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "unicode-width" -+version = "0.1.5" ++version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1160,14 +976,6 @@ index 0000000..731829e +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "unreachable" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "unsafe-any" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1186,13 +994,8 @@ index 0000000..731829e +] + +[[package]] -+name = "utf8-ranges" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "vcpkg" -+version = "0.2.6" ++version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1211,18 +1014,31 @@ index 0000000..731829e +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "wasi" -+version = "0.5.0" ++name = "vswhom" ++version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] + +[[package]] -+name = "winapi" -+version = "0.2.8" ++name = "vswhom-sys" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winapi" -+version = "0.3.6" ++version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1230,11 +1046,6 @@ index 0000000..731829e +] + +[[package]] -+name = "winapi-build" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1246,164 +1057,140 @@ index 0000000..731829e + +[[package]] +name = "winreg" -+version = "0.4.0" ++version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[metadata] +"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" -+"checksum advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a" -+"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e" ++"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" +"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" -+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" -+"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" ++"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" ++"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875" +"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -+"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" -+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" ++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" +"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" +"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" -+"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" -+"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" ++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" +"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" +"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" -+"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" -+"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" -+"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e" ++"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67" +"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -+"checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d" +"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" -+"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" -+"checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192" -+"checksum ctrlc 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "630391922b1b893692c6334369ff528dcc3a9d8061ccf4c803aa8f83cb13db5e" -+"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd" -+"checksum embed-resource 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "59edbe56442f96505f79c9116006f2e26c7f5655cccdc2c1546b2528c63bd612" -+"checksum flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2291c165c8e703ee54ef3055ad6188e3d51108e2ded18e9f2476e774fc5ad3d4" ++"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" ++"checksum ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7dfd2d8b4c82121dfdff120f818e09fc4380b0b7e17a742081a89b94853e87f" ++"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" ++"checksum embed-resource 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1419cfb011b3f11cbe865738cc2a36cc574437de4e3f2a1a57f118b230aa4f3" ++"checksum flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "2adaffba6388640136149e18ed080b77a78611c1e1d6de75aedcdf78df5d4682" +"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+"checksum fuchsia-cprng 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81f7f8eb465745ea9b02e2704612a9946a59fa40572086c6fd49d6ddcf30bf31" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" -+"checksum getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6171a6cc63fbabbe27c2b5ee268e8b7fe5dc1eb0dd2dfad537c1dfed6f69117e" -+"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83" -+"checksum hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)" = "df0caae6b71d266b91b4a83111a61d2b94ed2e2bea024c532b933dcff867e58c" -+"checksum hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "72332e4a35d3059583623b50e98e491b78f8b96c5521fcb3f428167955aa56e8" ++"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" ++"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" ++"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" +"checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" +"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -+"checksum iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d8e17268922834707e1c29e8badbf9c712c9c43378e1b6a3388946baff10be2" ++"checksum iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8" +"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" -+"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" -+"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" -+"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" ++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" +"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" +"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +"checksum md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54e5826684849cecd3fa05a6a5052c50a3542f163a9917ff0b91379426a2e45d" -+"checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8" ++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -+"checksum mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2d4c0961143b8efdcfa29c3ae63281601b446a4a668165454b6c90f8024954c5" -+"checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649" -+"checksum miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c468f2369f07d651a5d0bb2c9079f8488a66d5466efe42d0c5c6466edcb7f71e" -+"checksum miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7fe927a42e3807ef71defb191dc87d4e24479b221e67015fe38ae2b7b447bab" ++"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7" ++"checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" ++"checksum miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7108aff85b876d06f22503dcce091e29f76733b2bfdd91eebce81f5e68203a10" +"checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" -+"checksum native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f74dbadc8b43df7864539cedb7bc91345e532fdd913cfdc23ad94f4d2d40fbc0" +"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" -+"checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17" ++"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" +"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -+"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" -+"checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238" ++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" ++"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" +"checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" -+"checksum openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "a3605c298474a3aa69de92d21139fb5e2a81688d308262359d85cdd0d12a7985" +"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +"checksum openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)" = "f4fad9e54bd23bd4cbbe48fdc08a1b8091707ac869ef8508edea2fec77dcc884" +"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" ++"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" +"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" +"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -+"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" ++"checksum pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea" +"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" +"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" +"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -+"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -+"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" ++"checksum rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "59cea0d944b32347a1863e95942fd6ebdb486afb4f038119494f2860380c1d51" +"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" -+"checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" ++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -+"checksum rand_jitter 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "080723c6145e37503a2224f801f252e14ac5531cb450f4502698542d188cb3c0" -+"checksum rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b7c690732391ae0abafced5015ffb53656abfaec61b342290e5eb56b286a679d" -+"checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -+"checksum redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)" = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85" -+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -+"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f" -+"checksum regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861" -+"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" ++"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" ++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +"checksum rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49" -+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" -+"checksum schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56" -+"checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332" ++"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0" ++"checksum schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339" +"checksum security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2" -+"checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead" +"checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" -+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" +"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400" +"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba" +"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" +"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -+"checksum smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "88aea073965ab29f6edb5493faf96ad662fb18aa9eeb186a3b7057951605ed15" -+"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" ++"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -+"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" ++"checksum tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9128e3a9149e51494cad59712a286e149fcb74e443d2298d69bd6eaa42cc4ebb" +"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" -+"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" +"checksum trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458" +"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" +"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -+"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" +"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -+"checksum unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90" ++"checksum unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150" +"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" -+"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" ++"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" +"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" -+"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" +"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -+"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" -+"checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d" ++"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" +"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -+"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7" -+"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" -+"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" ++"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" ++"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" ++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+"checksum winreg 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf285379f20d7f26abd990d9a566be9d31ab7a9d335299baaa1f0604f5f96af" ++"checksum winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a" diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index b7ee85da9d8..6c84ac8da70 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -1,25 +1,36 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgs, darwin }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, rustPlatform +, openssl, pkgconfig, darwin, libiconv }: rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "thecoshman"; repo = "http"; rev = "v${version}"; - sha256 = "0q9ng8vf01k65zmcm7bbkqyrkj5hs86zdxwrfj98f4xqxrm75rf6"; + sha256 = "1y9mlbympb19i3iw7s7jm7lvkpcl4w0sig6jnd4w3ykhkdhzh6di"; }; - buildInputs = with pkgs; [ openssl pkgconfig ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + openssl pkgconfig + ] ++ lib.optionals stdenv.isDarwin [ + libiconv darwin.apple_sdk.frameworks.Security + ]; cargoBuildFlags = [ "--bin httplz" ]; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "18qr3sy4zj4lwbzrz98d82kwagfbzkmrxk5sxl7w9vhdzy2diskw"; + cargoSha256 = "1bxh7p2a04lpghqms8cx1f1cq5nbcx6cxh5ac7i72d5vzy4v07nl"; + + postInstall = '' + wrapProgram $out/bin/httplz \ + --prefix PATH : "${openssl}/bin" + ''; meta = with stdenv.lib; { description = "A basic http server for hosting a folder fast and simply"; - homepage = https://github.com/thecoshman/http; + homepage = "https://github.com/thecoshman/http"; license = licenses.mit; maintainers = with maintainers; [ bbigras ]; }; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 0b0860126b5..681d5d0e7a9 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -3,11 +3,14 @@ let wrapper = stdenv.mkDerivation rec { pname = "wrapper"; version = "3.5.35"; + src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; sha256 = "0mjyw9ays9v6lnj21pmfd3qdvd9b6rwxfmw3pg6z0kyf2jadixw2"; }; + buildInputs = [ jdk ]; + buildPhase = '' export ANT_HOME=${ant} export JAVA_HOME=${jdk}/lib/openjdk/jre/ @@ -16,6 +19,7 @@ let wrapper = stdenv.mkDerivation rec { sed 's/ testsuite$//' -i src/c/Makefile-linux-x86-64.make ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"} ''; + installPhase = '' mkdir -p $out/{bin,lib} cp bin/wrapper $out/bin/wrapper @@ -27,17 +31,22 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.41"; + pname = "i2p"; + version = "0.9.42"; + src = fetchurl { - url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "0adrj56i3pcc9ainj22akjrrvy73carz5jk29qa1h2b9q03di73b"; + url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2"; + sha256 = "04y71hzkdpjzbac569rhyg1zfx37j0alggbl9gnkaqfbprb2nj1h"; }; + buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; + buildPhase = '' export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" ant preppkg-linux-only - ''; + ''; + installPhase = '' set -B mkdir -p $out/{bin,share} @@ -61,13 +70,13 @@ stdenv.mkDerivation rec { mv $out/man $out/share/ chmod +x $out/bin/* $out/i2psvc rm $out/{osid,postinstall.sh,INSTALL-headless.txt} - ''; + ''; meta = with stdenv.lib; { - homepage = https://geti2p.net; description = "Applications and router for I2P, anonymity over the Internet"; - maintainers = [ maintainers.joelmo ]; + homepage = "https://geti2p.net"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.joelmo ]; }; } diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index ab09399cd8e..d2dbd235e11 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ip2unix"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "nixcloud"; repo = "ip2unix"; rev = "v${version}"; - sha256 = "1hbc7csicgza1w43aq1q189w8gzwkc2v5mxpnhaiwggwsa5vvkl0"; + sha256 = "121ygj50i7ja9bv76y51qsjbjmmydhpi0sd3xb6pysmlzv0bxn17"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index ee331648e75..a9758e5fd47 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { # Irrelevant in nixpkgs excludes = [ "setup.py" "setup.cfg" "release/docker/*" ]; }) + ./pytest5.patch ]; postPatch = '' @@ -54,7 +55,7 @@ buildPythonPackage rec { checkPhase = '' export HOME=$(mktemp -d) export LC_CTYPE=en_US.UTF-8 - pytest -k 'not test_find_unclaimed_URLs' + pytest -k 'not test_find_unclaimed_URLs and not test_tcp' ''; propagatedBuildInputs = [ @@ -62,7 +63,7 @@ buildPythonPackage rec { h2 hyperframe kaitaistruct passlib pyasn1 pyopenssl pyparsing pyperclip ruamel_yaml tornado urwid brotlipy - sortedcontainers ldap3 wsproto + sortedcontainers ldap3 wsproto setuptools ]; checkInputs = [ diff --git a/pkgs/tools/networking/mitmproxy/pytest5.patch b/pkgs/tools/networking/mitmproxy/pytest5.patch new file mode 100644 index 00000000000..bfbf7253b9c --- /dev/null +++ b/pkgs/tools/networking/mitmproxy/pytest5.patch @@ -0,0 +1,31 @@ +diff --git a/test/mitmproxy/net/test_tls.py b/test/mitmproxy/net/test_tls.py +index 489bf89f..c78472e3 100644 +--- a/test/mitmproxy/net/test_tls.py ++++ b/test/mitmproxy/net/test_tls.py +@@ -87,14 +87,16 @@ def test_get_client_hello(): + rfile = io.BufferedReader(io.BytesIO( + FULL_CLIENT_HELLO_NO_EXTENSIONS[:30] + )) +- with pytest.raises(exceptions.TlsProtocolException, message="Unexpected EOF"): ++ with pytest.raises(exceptions.TlsProtocolException): + tls.get_client_hello(rfile) ++ pytest.fail("Unexpected EOF") + + rfile = io.BufferedReader(io.BytesIO( + b"GET /" + )) +- with pytest.raises(exceptions.TlsProtocolException, message="Expected TLS record"): ++ with pytest.raises(exceptions.TlsProtocolException): + tls.get_client_hello(rfile) ++ pytest.fail("Expected TLS record") + + + class TestClientHello: +@@ -153,5 +155,6 @@ class TestClientHello: + b"\x01\x00\x00\x03" + # handshake header + b"foo" + )) +- with pytest.raises(exceptions.TlsProtocolException, message='Cannot parse Client Hello'): ++ with pytest.raises(exceptions.TlsProtocolException): + tls.ClientHello.from_file(rfile) ++ pytest.fail('Cannot parse Client Hello') diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix index 1fb50686d0d..4236c9e1818 100644 --- a/pkgs/tools/networking/network-manager/openconnect/default.nix +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, networkmanager, libsecret +{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, autoreconfHook, networkmanager, gcr, libsecret, file , gtk3, withGnome ? true, gnome3, kmod }: let pname = "NetworkManager-openconnect"; - version = "1.2.4"; + version = "1.2.6"; in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15j98wwspv6mcmy91w30as5qc1bzsnhlk060xhjy4qrvd37y0xx1"; + sha256 = "0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m"; }; patches = [ @@ -20,13 +20,14 @@ in stdenv.mkDerivation { ]; buildInputs = [ openconnect networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret ]; + ++ stdenv.lib.optionals withGnome [ gtk3 gcr libsecret ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig file ]; configureFlags = [ "--with-gnome=${if withGnome then "yes" else "no"}" "--enable-absolute-paths" + "--without-libnm-glib" ]; passthru = { diff --git a/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch b/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch new file mode 100644 index 00000000000..51c9a706f89 --- /dev/null +++ b/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch @@ -0,0 +1,34 @@ +From 9cb650ea96c0e5063775071cfdae072e92c553b8 Mon Sep 17 00:00:00 2001 +From: emanuele-f <faranda@ntop.org> +Date: Tue, 18 Sep 2018 12:49:57 +0200 +Subject: [PATCH] Compilation fix with new libpcap + +SOCKET and INVALID_SOCKET are now defined in pcap.h +--- + third-party/mongoose/mongoose.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/third-party/mongoose/mongoose.c b/third-party/mongoose/mongoose.c +index 6a61cea9b..634c142e3 100644 +--- a/third-party/mongoose/mongoose.c ++++ b/third-party/mongoose/mongoose.c +@@ -247,7 +247,9 @@ struct pollfd { + #define mg_rename(x, y) rename(x, y) + #define mg_sleep(x) usleep((x) * 1000) + #define ERRNO errno ++#ifndef INVALID_SOCKET + #define INVALID_SOCKET (-1) ++#endif + + /* ntop */ + #if ((ULONG_MAX) == (UINT_MAX)) +@@ -270,7 +272,9 @@ struct pollfd { + #endif + + //#define INT64_FMT PRId64 ++#ifndef SOCKET + typedef int SOCKET; ++#endif + #define WINCDECL + + #endif // End of Windows and UNIX specific includes diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 06d28e844ff..0c693ac6288 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-Undo-weird-modification-of-data_dir.patch ./0002-Remove-requirement-to-have-writeable-callback-dir.patch + ./0003-New-libpcap-defines-SOCKET.patch ]; buildInputs = [ libpcap/* gnutls libgcrypt*/ libxml2 glib geoip geolite-legacy diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index a884ed0ccd4..0b9c254deeb 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.32.2"; + version = "0.32.3"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; - rev = "d70135ec71979e7588c649c80f2acea65346a99a"; - sha256 = "062lzc1c96nwg22ql10mwjkxhq68lyak7s0id5y4f9mmj6d4rd69"; + rev = "v${version}"; + sha256 = "0vpnw42a28glghdpgxmqhxd63cnbpghhazpzsdksqkw0i1l36ywr"; }; - modSha256 = "0hl8ly2qx0fv9diipqkcrlaz3ncsb2h81i0ccf5gn9cmyl37x0yk"; + modSha256 = "1h51zgvjq3bm09yhm54rk8a86cqa1zma3mx6pb0kq7k72xvhpx0a"; meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index ef6b0d5c641..bd17fa054d3 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "0.0.20190702"; + version = "0.0.20190913"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1xl4hzqrny3855s7h1k24py81gdjyfv0mhv6y528f6p0h38r89s3"; + sha256 = "08ns5d6xbl0qylb98mml0yh0yp837a1sm3hvpra21by1dvx8k0dg"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index 7ac73fac39e..6c5f0660d12 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,13 +1,13 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "07hnyx616dk03md00pmgpb5c2sp9w0n5l94s82arair0kpi0ncy0"; + sha256 = "18kvsgl3kpla33dp1nbpd1kdgndfqcmlwwpjls55fp4mlczf8lcx"; }; cargoSha256 = "0wfx7shsdqrwbnzr2a0fnly1kd93mxbm96zjq5pzrq94lphkhqhz"; diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 17d023f6daf..870e6ce67b9 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }: rustPlatform.buildRustPackage rec { pname = "nix-du"; - version = "0.3.0"; + version = "unstable-2019-07-15"; src = fetchFromGitHub { owner = "symphorien"; repo = "nix-du"; - rev = "v${version}"; - sha256 = "1x6qpivxbn94034jfdxb97xi97fhcdv2z7llq2ccfc80mgd0gz8l"; + rev = "e6e927c15e75f7c2e63f7f3c181dc6b257f6fd9e"; + sha256 = "08jyp078h9jpb9qfqg5mdbq29rl8a006n94hqk3yk6gv1s57cfic"; }; cargoSha256 = "071gbhxbvnwi7n3zpy7bmlprzir0sl0f0pb191xg2ynw678prd7v"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 69489e271cb..4d4f73ad7c2 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -121,7 +121,7 @@ common = homepage = https://nixos.org/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.unix; outputsToInstall = [ "out" "man" ]; }; @@ -200,13 +200,13 @@ in rec { }); nixFlakes = lib.lowPrio (callPackage common rec { - name = "nix-2.3${suffix}"; - suffix = "pre20190830_04np4n6"; + name = "nix-2.4${suffix}"; + suffix = "pre20190913_a25c022"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "aa82f8b2d2a2c42f0d713e8404b668cef1a4b108"; - hash = "sha256-09ZHwpxf9pRDacCSGTHYx+fnKYgxKx8G37Jqb4wl1xI="; + rev = "a25c022af3fa0a35be406942869edae1bdff2cf8"; + hash = "sha256-HIvgrkXxQ57TPcf2pn9PkSDzM4XOCwXa1zYyIvcAdpg="; }; fromGit = true; diff --git a/pkgs/tools/package-management/nixops/azure-storage/default.nix b/pkgs/tools/package-management/nixops/azure-storage/default.nix new file mode 100644 index 00000000000..6693a7464d4 --- /dev/null +++ b/pkgs/tools/package-management/nixops/azure-storage/default.nix @@ -0,0 +1,35 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-common +, futures +, dateutil +, requests +, isPy3k +}: + +buildPythonPackage rec { + version = "0.20.3"; + pname = "azure-storage"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; + }; + + propagatedBuildInputs = [ azure-common dateutil requests ] + ++ pkgs.lib.optionals (!isPy3k) [ futures ]; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + ''; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix index d9ba324dce7..e6e30b26240 100644 --- a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix +++ b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix @@ -26,6 +26,7 @@ callPackage ./generic.nix (rec { azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { }; azure-mgmt-resource = callPackage ./azure-mgmt-resource { }; azure-mgmt-storage = callPackage ./azure-mgmt-storage { }; + azure-storage = callPackage ./azure-storage { }; }); }; }) diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index f403aaaf687..7b4c8cf68eb 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -2,13 +2,13 @@ , kernel ? null, withDriver ? false }: pythonPackages.buildPythonApplication rec { name = "chipsec-${version}"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "chipsec"; repo = "chipsec"; rev = version; - sha256 = "09ipr0vls1l2wln4z3dc9vx0zp63ps3dxkwlpm9rqqbpg7qq6lrp"; + sha256 = "043gf21zygvrzvvkwv5xxpcv3ryj5m8klkgyhq0lnh6k594qrg77"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 90bd55f55a2..e2f460e7e30 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { }; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig texinfo ]; buildInputs = [ - libgcrypt libassuan libksba libiconv npth gettext texinfo + libgcrypt libassuan libksba libiconv npth gettext readline libusb gnutls adns openldap zlib bzip2 sqlite ]; diff --git a/pkgs/tools/security/pinentry/autoconf-ar.patch b/pkgs/tools/security/pinentry/autoconf-ar.patch new file mode 100644 index 00000000000..6f531cfce32 --- /dev/null +++ b/pkgs/tools/security/pinentry/autoconf-ar.patch @@ -0,0 +1,35 @@ +diff -ur a/configure.ac b/configure.ac +--- a/configure.ac 2019-09-14 11:30:11.584847746 +0000 ++++ b/configure.ac 2019-09-14 11:31:26.692355265 +0000 +@@ -81,6 +81,7 @@ + AC_PROG_CPP + AC_PROG_INSTALL + AC_PROG_RANLIB ++AC_CHECK_TOOL(AR, ar) + # We need to check for cplusplus here because we may not do the test + # for Qt and autoconf does does not allow that. + AC_PROG_CXX +diff -ur a/pinentry/Makefile.in b/pinentry/Makefile.in +--- a/pinentry/Makefile.in 2017-12-03 17:43:23.000000000 +0000 ++++ b/pinentry/Makefile.in 2019-09-14 11:32:02.532000236 +0000 +@@ -113,7 +113,7 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LIBRARIES = $(noinst_LIBRARIES) +-AR = ar ++AR = @AR@ + ARFLAGS = cru + AM_V_AR = $(am__v_AR_@AM_V@) + am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +diff -ur a/secmem/Makefile.in b/secmem/Makefile.in +--- a/secmem/Makefile.in 2017-12-03 17:43:23.000000000 +0000 ++++ b/secmem/Makefile.in 2019-09-14 11:31:58.764934552 +0000 +@@ -113,7 +113,7 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LIBRARIES = $(noinst_LIBRARIES) +-AR = ar ++AR = @AR@ + ARFLAGS = cru + AM_V_AR = $(am__v_AR_@AM_V@) + am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 25e018de627..160816a8cb7 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, lib, pkgconfig +{ fetchurl, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook , libgpgerror, libassuan , libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null , qt4 ? null, qt5 ? null @@ -23,7 +23,7 @@ mkDerivation rec { sha256 = "0w35ypl960pczg5kp6km3dyr000m1hf0vpwwlh72jjkjza36c1v8"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt4 ] ++ stdenv.lib.optional (qt5 != null) qt5.qtbase; @@ -32,7 +32,9 @@ mkDerivation rec { substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses ''; - patches = lib.optionals (gtk2 != null) [ + patches = [ + ./autoconf-ar.patch + ] ++ lib.optionals (gtk2 != null) [ (fetchpatch { url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/" + "0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch"; diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index fcc45542214..b132066fee5 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -1,20 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "sops"; - version = "3.3.1"; - - goPackagePath = "go.mozilla.org/sops"; + version = "3.4.0"; src = fetchFromGitHub { rev = version; owner = "mozilla"; repo = pname; - sha256 = "0jbrz3yz6cj08h8cx6y98m8r0lpclh9367cw5apy6w3v71i3svfi"; + sha256 = "1mrqf9xgv88v919x7gz9l1x70xwvp6cfz3zp9ip1nj2pzn6ixz3d"; }; + modSha256 = "13ja8nxycmdjnrnsxdd1qs06x408aqr4im127a6y433pkx2dg7gc"; + meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/mozilla/sops"; description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files"; maintainers = [ maintainers.marsam ]; license = licenses.mpl20; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 249ff435c5f..527c8064bac 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.1.5"; + version = "0.4.1.6"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "0984jb6hdcc10f7aq8xzl7l4jf93skp45wkv2v63z4zv0nvf0r58"; + sha256 = "0wgdid8w7srd218hh4rwslzdx2ickxw1pg18p2wry1r6wi65521a"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index c0fa221c969..7620fc9760d 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vault"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1xljm7xmb4ldg3wx8s9kw1spffg4ywk4r1jqfa743czd2xxmqavl"; + sha256 = "11zi12j09vi6j112a1n8f7sxwp15pbh0801bzh27ihcy01hlzdf8"; }; - modSha256 = "13pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q"; + modSha256 = "10pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q"; buildFlagsArray = [ "-tags='vault'" diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 6927c64bf48..63aa563bfa0 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "datefudge"; - version = "1.22"; + version = "1.23"; src = fetchgit { url = "https://salsa.debian.org/debian/datefudge.git"; - rev = "fe27db47a0f250fb56164114fff8ae8d5af47ab6"; - sha256 = "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c"; + rev = "090d3aace17640478f7f5119518b2f4196f62617"; + sha256 = "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv"; }; patchPhase = '' diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 65c905f28c6..29c20ad8d53 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -13,11 +13,18 @@ stdenv.mkDerivation rec { sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf"; }; - patches = [ (fetchpatch { - # fix crash in scan_dmi_sysfs() when run as non-root - url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch"; - sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3"; - })]; + patches = [ + (fetchpatch { + # fix crash in scan_dmi_sysfs() when run as non-root + url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch"; + sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3"; + }) + (fetchpatch { + # support cross-compilation + url = "https://github.com/lyonel/lshw/commit/8486d25cea9b68794504fbd9e5c6e294bac6cb07.patch"; + sha256 = "08f0wnxsq0agvsc66bhc7lxvk564ir0pp8pg3cym6a621prb9lm0"; + }) + ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 30ebd4969dc..7526a55d7ef 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -12,12 +12,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.17.0"; + version = "1.17.1"; pname = "netdata"; src = fetchurl { url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz"; - sha256 = "099xvndf5lql4ipwqhm38lpc65yicmpmkk3a7c2j4m48l3vqw9y6"; + sha256 = "0k49ms295b9icccvknyqyqlsy911h06c7h7aql5havcx5m5jxq7w"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 77f6632ff53..f5c447ea0a5 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -22,7 +22,7 @@ plan9portLinkFlags() configurePhase() { ( - echo CC9=\"$(which $CC)\" + echo CC9=\"$(command -v $CC)\" echo CFLAGS=\"$NIX_CFLAGS_COMPILE\" echo LDFLAGS=\"$(plan9portLinkFlags)\" echo X11=\"${libXt_dev}/include\" diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index b2b94e1d9d9..0bf8a7e85dc 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { patches = [ ./dont_static_link.patch ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc' + ''; + preBuild = '' patchShebangs scripts ''; diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index f581e44bcc8..d2c710d10f8 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -10,7 +10,18 @@ python3.pkgs.buildPythonApplication rec { }; propagatedBuildInputs = with python3.pkgs; [ - agate agate-excel agate-dbf agate-sql six + agate + agate-excel + agate-dbf + # sql test fail with agate-sql-0.5.4 + (agate-sql.overridePythonAttrs(old: rec { + version = "0.5.3"; + src = python3.pkgs.fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "1d6rbahmdix7xi7ma2v86fpk5yi32q5dba5vama35w5mmn2pnyw7"; + };})) + six ]; checkInputs = with python3.pkgs; [ diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 514f3f67539..820d98408fb 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -28,14 +28,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "8.2.3"; + version = "9.0.3"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "1ldlyhxkav34y9d7g2kx3d4p26c2b82vnwi0ywnfynb16sav36d5"; + sha256 = "1qnjdcbwkxxqfahylzl0wj1gk51yi9m8akd4d1rrq37vg2vwdkjy"; }; nativeBuildInputs = with python3Packages; [ @@ -51,12 +51,14 @@ in buildPythonApplication rec { img2pdf pdfminer pikepdf + pillow reportlab ruffus + setuptools + tqdm ]; checkInputs = with python3Packages; [ - hocr-tools pypdf2 pytest pytest-helpers-namespace @@ -67,7 +69,6 @@ in buildPythonApplication rec { setuptools ] ++ runtimeDeps; - postPatch = '' substituteInPlace src/ocrmypdf/leptonica.py \ --replace "ffi.dlopen(find_library('lept'))" \ @@ -93,6 +94,8 @@ in buildPythonApplication rec { and not test_old_unpaper' ''; + makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ]; + meta = with stdenv.lib; { homepage = "https://github.com/jbarlow83/OCRmyPDF"; description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index b5ceb522e23..2a9625501b6 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -9,7 +9,6 @@ use Getopt::Long qw(:config gnu_getopt); use Cwd 'abs_path'; use Time::HiRes; -my $nsenter = "@utillinux@/bin/nsenter"; my $su = "@su@"; # Ensure a consistent umask. @@ -270,9 +269,10 @@ sub restartContainer { # Run a command in the container. sub runInContainer { my @args = @_; - my $leader = getLeader; - exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", @args); - die "cannot run ‘nsenter’: $!\n"; + + exec("systemd-run", "--machine", $containerName, "--pty", "--quiet", "--", @args); + + die "cannot run ‘systemd-run’: $!\n"; } # Remove a directory while recursively unmounting all mounted filesystems within diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ac88446242e..a837336740b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -217,6 +217,7 @@ mapAliases ({ mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 module_init_tools = kmod; # added 2016-04-22 + mono-zeroconf = throw "deprecated 2019-09-20: abandoned by upstream."; mpich2 = mpich; # added 2018-08-06 msf = metasploit; # added 2018-04-25 libmsgpack = msgpack; # added 2018-08-17 @@ -291,8 +292,6 @@ mapAliases ({ pyo3-pack = maturin; pulseaudioLight = pulseaudio; # added 2018-04-25 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 - qt_gstreamer = qt-gstreamer; # added 2017-02 - qt_gstreamer1 = qt-gstreamer1; # added 2017-02 quake3game = ioquake3; # added 2016-01-14 qwt6 = libsForQt5.qwt; # added 2015-12-19 qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26 @@ -317,6 +316,7 @@ mapAliases ({ s6PortableUtils = s6-portable-utils; # added 2018-07-23 sagemath = sage; # added 2018-10-27 sam = deadpixi-sam; # added 2018-04-25 + sambaMaster = throw "removed 2019-09-13: outdated and no longer needed"; samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02 saneBackendsGit = sane-backends-git; # added 2016-01-02 @@ -389,6 +389,7 @@ mapAliases ({ winusb = woeusb; # added 2017-12-22 wireguard = wireguard-tools; # added 2018-05-19 morituri = whipper; # added 2018-09-13 + xfceUnstable = xfce4-14; # added 2019-09-17 x11 = xlibsWrapper; # added 2015-09 xbmc = kodi; # added 2018-04-25 xbmcPlain = kodiPlain; # added 2018-04-25 @@ -425,7 +426,7 @@ mapAliases ({ ocamlPackages_latest; gst_all = { # added 2018-04-25 - inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer; + inherit (pkgs) gstreamer gnonlin gst-python; gstPluginsBase = pkgs.gst-plugins-base; gstPluginsBad = pkgs.gst-plugins-bad; gstPluginsGood = pkgs.gst-plugins-good; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e8b13c687e..378dabe0db6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -966,8 +966,6 @@ in novacomd = callPackage ../development/mobile/webos/novacomd.nix { }; }; - arc-theme = callPackage ../misc/themes/arc { }; - arc-kde-theme = callPackage ../misc/themes/arc-kde { }; adapta-gtk-theme = callPackage ../misc/themes/adapta { }; @@ -1100,7 +1098,7 @@ in bitbucket-cli = python2Packages.bitbucket-cli; - blink = callPackage ../applications/networking/instant-messengers/blink { }; + blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { }; blockbook = callPackage ../servers/blockbook { }; @@ -2220,27 +2218,12 @@ in circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; - citrix_receiver_unwrapped = callPackage ../applications/networking/remote/citrix-receiver { }; - citrix_receiver_unwrapped_13_10_0 = citrix_receiver_unwrapped.override { version = "13.10.0"; }; - citrix_receiver_unwrapped_13_9_1 = citrix_receiver_unwrapped.override { version = "13.9.1"; }; - citrix_receiver_unwrapped_13_9_0 = citrix_receiver_unwrapped.override { version = "13.9.0"; }; - citrix_receiver_unwrapped_13_8_0 = citrix_receiver_unwrapped.override { version = "13.8.0"; }; - - citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix { - citrix_receiver = citrix_receiver_unwrapped; - }; - citrix_receiver_13_10_0 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix { - citrix_receiver = citrix_receiver_unwrapped_13_10_0; - }; - citrix_receiver_13_9_1 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix { - citrix_receiver = citrix_receiver_unwrapped_13_9_1; - }; - citrix_receiver_13_9_0 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix { - citrix_receiver = citrix_receiver_unwrapped_13_9_0; - }; - citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix { - citrix_receiver = citrix_receiver_unwrapped_13_8_0; - }; + # Cleanup before 20.03: + citrix_receiver = throw "citrix_receiver has been discontinued by Citrix (https://docs.citrix.com/en-us/citrix-workspace-app.html). Please use citrix_workspace."; + citrix_receiver_13_10_0 = citrix_receiver; + citrix_receiver_13_9_1 = citrix_receiver; + citrix_receiver_13_9_0 = citrix_receiver; + citrix_receiver_13_8_0 = citrix_receiver; citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; citrix_workspace_unwrapped_19_8_0 = citrix_workspace_unwrapped.override { version = "19.8.0"; }; @@ -3694,6 +3677,8 @@ in pgf_graphics = callPackage ../tools/graphics/pgf { }; + pgformatter = callPackage ../development/tools/pgformatter { }; + pgloader = callPackage ../development/tools/pgloader { }; pigz = callPackage ../tools/compression/pigz { }; @@ -4585,7 +4570,10 @@ in librest = callPackage ../development/libraries/librest { }; - libwebsockets = callPackage ../development/libraries/libwebsockets { }; + inherit (callPackages ../development/libraries/libwebsockets { }) + libwebsockets_3_1 + libwebsockets_3_2 + libwebsockets; lidarr = callPackage ../servers/lidarr { }; @@ -5974,6 +5962,8 @@ in samplicator = callPackage ../tools/networking/samplicator { }; + sasquatch = callPackage ../tools/filesystems/sasquatch { }; + sasview = callPackage ../applications/science/misc/sasview {}; scallion = callPackage ../tools/security/scallion { }; @@ -7285,6 +7275,8 @@ in ksh = callPackage ../shells/ksh { }; + liquidprompt = callPackage ../shells/liquidprompt { }; + mksh = callPackage ../shells/mksh { }; oh = callPackage ../shells/oh { }; @@ -8349,7 +8341,9 @@ in cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; - cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { }; + cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -8372,7 +8366,9 @@ in rustracer = callPackage ../development/tools/rust/racer { inherit (darwin.apple_sdk.frameworks) Security; }; - rustracerd = callPackage ../development/tools/rust/racerd { }; + rustracerd = callPackage ../development/tools/rust/racerd { + inherit (darwin.apple_sdk.frameworks) Security; + }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; rust-cbindgen = callPackage ../development/tools/rust/cbindgen { inherit (darwin.apple_sdk.frameworks) Security; @@ -8707,6 +8703,8 @@ in metamath = callPackage ../development/interpreters/metamath { }; + minder = callPackage ../applications/misc/minder { }; + mujs = callPackage ../development/interpreters/mujs { }; nix-exec = callPackage ../development/interpreters/nix-exec { @@ -9289,8 +9287,11 @@ in # }; # You can use a different directory, but whichever directory you choose # should be owned by user root, group nixbld with permissions 0770. - ccacheWrapper = makeOverridable ({ extraConfig ? "", unwrappedCC ? stdenv.cc.cc }: - wrapCC (ccache.links {inherit unwrappedCC extraConfig;})) {}; + ccacheWrapper = makeOverridable ({ extraConfig ? "", cc ? stdenv.cc }: + cc.override { cc = ccache.links { + inherit extraConfig; + unwrappedCC = cc.cc; + }; }) {}; ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper); cccc = callPackage ../development/tools/analysis/cccc { }; @@ -9710,6 +9711,8 @@ in kati = callPackage ../development/tools/build-managers/kati { }; + kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; + kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { gperf = gperf_3_0; }; @@ -11081,9 +11084,6 @@ in qt-mobility = callPackage ../development/libraries/qt-mobility {}; - qt-gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {}; - - qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155; }; qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { }; @@ -12693,8 +12693,6 @@ in mono-addins = callPackage ../development/libraries/mono-addins { }; - mono-zeroconf = callPackage ../development/libraries/mono-zeroconf { }; - movit = callPackage ../development/libraries/movit { }; mosquitto = callPackage ../servers/mqtt/mosquitto { }; @@ -14720,6 +14718,8 @@ in meteor = callPackage ../servers/meteor { }; + micronaut = callPackage ../development/tools/micronaut {}; + minio = callPackage ../servers/minio { }; # Backwards compatibility. @@ -15003,6 +15003,7 @@ in prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; + prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; @@ -15113,8 +15114,6 @@ in python = python3; }; - sambaMaster = callPackage ../servers/samba/master.nix { }; - samba = samba4; # A lightweight Samba 3, useful for non-Linux-based OSes. @@ -15418,6 +15417,8 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; + cpustat = callPackage ../os-specific/linux/cpustat { }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ @@ -15727,6 +15728,10 @@ in ]; }; + linux_5_3 = callPackage ../os-specific/linux/kernel/linux-5.3.nix { + kernelPatches = [ kernelPatches.bridge_stp_helper ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -15805,6 +15810,8 @@ in e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; + intel-speed-select = if stdenv.lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; + ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; it87 = callPackage ../os-specific/linux/it87 {}; @@ -15919,7 +15926,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_5_2; + linuxPackages_latest = linuxPackages_5_3; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -15930,6 +15937,7 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2); + linuxPackages_5_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_3); # When adding to this list: # - Update linuxPackages_latest to the latest version @@ -16551,6 +16559,8 @@ in arc-icon-theme = callPackage ../data/icons/arc-icon-theme { }; + arc-theme = callPackage ../data/themes/arc { }; + arkpandora_ttf = callPackage ../data/fonts/arkpandora { }; aurulent-sans = callPackage ../data/fonts/aurulent-sans { }; @@ -16945,6 +16955,8 @@ in papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; + papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { }; + papis = with python3Packages; toPythonApplication papis; paps = callPackage ../tools/misc/paps { }; @@ -16989,6 +17001,8 @@ in publicsuffix-list = callPackage ../data/misc/publicsuffix-list { }; + qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { }; + qogir-theme = callPackage ../data/themes/qogir { }; redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; @@ -18364,6 +18378,8 @@ in freenet = callPackage ../applications/networking/p2p/freenet { }; + freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {}; + freepv = callPackage ../applications/graphics/freepv { }; xfontsel = callPackage ../applications/misc/xfontsel { }; @@ -18432,8 +18448,6 @@ in inherit (gnome3) gitg; - giv = callPackage ../applications/graphics/giv { }; - gmrun = callPackage ../applications/misc/gmrun {}; gnucash = callPackage ../applications/office/gnucash { @@ -18456,7 +18470,7 @@ in m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; - manuskript = callPackage ../applications/editors/manuskript { }; + manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; manul = callPackage ../development/tools/manul { }; @@ -18781,7 +18795,7 @@ in stdenv = gccStdenv; }; - ike = callPackage ../applications/networking/ike { }; + ike = callPackage ../applications/networking/ike { bison = bison2; }; ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; @@ -19204,7 +19218,10 @@ in lxdvdrip = callPackage ../applications/video/lxdvdrip { }; - handbrake = callPackage ../applications/video/handbrake { }; + handbrake = callPackage ../applications/video/handbrake { + inherit (darwin.apple_sdk.frameworks) AudioToolbox Foundation VideoToolbox; + inherit (darwin) libobjc; + }; lilyterm = callPackage ../applications/misc/lilyterm { inherit (gnome2) vte; @@ -19605,6 +19622,8 @@ in qtcurve = libsForQt5.callPackage ../misc/themes/qtcurve {}; + qbec = callPackage ../applications/networking/cluster/qbec { }; + rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; @@ -19621,6 +19640,8 @@ in smtube = libsForQt5.callPackage ../applications/video/smtube {}; + softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {}; + stride = callPackage ../applications/networking/instant-messengers/stride { }; sudolikeaboss = callPackage ../tools/security/sudolikeaboss { }; @@ -19671,6 +19692,8 @@ in pdfdiff = callPackage ../applications/misc/pdfdiff { }; + pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { }; + mupdf = callPackage ../applications/misc/mupdf { }; mystem = callPackage ../applications/misc/mystem { }; @@ -19957,6 +19980,8 @@ in purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { }; + purple-slack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-slack { }; + purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { }; purple-xmpp-http-upload = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload { }; @@ -20876,9 +20901,7 @@ in tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; - twister = callPackage ../applications/networking/p2p/twister { - boost = boost160; - }; + twister = callPackage ../applications/networking/p2p/twister { }; twmn = libsForQt5.callPackage ../applications/misc/twmn { }; @@ -21822,6 +21845,8 @@ in chessx = libsForQt59.callPackage ../games/chessx { }; + chiaki = libsForQt5.callPackage ../games/chiaki { }; + chocolateDoom = callPackage ../games/chocolate-doom { }; crispyDoom = callPackage ../games/crispy-doom { }; @@ -22414,6 +22439,8 @@ in tinyfugue = callPackage ../games/tinyfugue { }; + tome2 = callPackage ../games/tome2 { }; + tome4 = callPackage ../games/tome4 { }; toppler = callPackage ../games/toppler { }; @@ -22689,7 +22716,6 @@ in solarc-gtk-theme = callPackage ../misc/themes/solarc { }; xfce = xfce4-12; - xfceUnstable = xfce4-14; xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { }); xfce4-14 = recurseIntoAttrs (callPackage ../desktops/xfce4-14 { }); @@ -24141,7 +24167,9 @@ in pgmanage = callPackage ../applications/misc/pgmanage { }; - pgadmin = callPackage ../applications/misc/pgadmin { }; + pgadmin = callPackage ../applications/misc/pgadmin { + openssl = openssl_1_0_2; + }; pgf = pgf2; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index d4c2c3b1e3f..cc42ff161f9 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -127,7 +127,7 @@ in rec { version = "8.9.1"; }; coq_8_10 = callPackage ../applications/science/logic/coq { - version = "8.10+beta2"; + version = "8.10+beta3"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 49bfc58adf0..be7c0bc4171 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,6 +1,4 @@ -{ buildPackages, pkgs -, newScope -}: +{ buildPackages, pkgs, newScope }: let # These are attributes in compiler and packages that don't support integer-simple. @@ -47,24 +45,12 @@ in { ghc863Binary = callPackage ../development/compilers/ghc/8.6.3-binary.nix { }; - ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix { - bootPkgs = packages.ghc822Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_39; - llvmPackages = pkgs.llvmPackages_39; - }; ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix { bootPkgs = packages.ghc822Binary; sphinx = buildPackages.python3Packages.sphinx_1_7_9; buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; - ghc864 = callPackage ../development/compilers/ghc/8.6.4.nix { - bootPkgs = packages.ghc822Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_6; - llvmPackages = pkgs.llvmPackages_6; - }; ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix { bootPkgs = packages.ghc822Binary; inherit (buildPackages.python3Packages) sphinx; @@ -91,7 +77,7 @@ in { ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; }; ghcjs86 = callPackage ../development/compilers/ghcjs-ng { - bootPkgs = packages.ghc864; + bootPkgs = packages.ghc865; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json; stage0 = ../development/compilers/ghcjs-ng/8.6/stage0.nix; ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.6/dep-overrides.nix {}; @@ -126,21 +112,11 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc822 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc822; - ghc = bh.compiler.ghc822; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; - }; ghc844 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc844; ghc = bh.compiler.ghc844; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; }; - ghc864 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc864; - ghc = bh.compiler.ghc864; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; - }; ghc865 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc865; ghc = bh.compiler.ghc865; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4ece950f09e..ba3f37cd428 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -664,6 +664,8 @@ let then sexplib_108_08_00 else null; + ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; + ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { }; @@ -694,6 +696,10 @@ let then callPackage ../development/ocaml-modules/ppx_deriving {} else null; + ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; + + ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc {}; + ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96885a83ebb..8f9f0d6627c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -821,7 +821,7 @@ in { pdfx = callPackage ../development/python-modules/pdfx { }; - perf = callPackage ../development/python-modules/perf { }; + pyperf = callPackage ../development/python-modules/pyperf { }; perfplot = callPackage ../development/python-modules/perfplot { }; @@ -1991,15 +1991,17 @@ in { pyhepmc = callPackage ../development/python-modules/pyhepmc { }; - pytest = if isPy3k then - callPackage ../development/python-modules/pytest { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - } - else callPackage ../development/python-modules/pytest/2.nix { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; + pytest = if isPy3k then self.pytest_5 else self.pytest_4; + + pytest_5 = callPackage ../development/python-modules/pytest { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; + + pytest_4 = callPackage ../development/python-modules/pytest/4.nix { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; @@ -4378,8 +4380,6 @@ in { pyenchant = callPackage ../development/python-modules/pyenchant { }; - pyev = callPackage ../development/python-modules/pyev { }; - pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; pyext = callPackage ../development/python-modules/pyext { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index eac84cfc1a8..bc6c3525f77 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -14,7 +14,7 @@ self: super: let inherit (super.stdenvAdapters) makeStaticBinaries makeStaticLibraries propagateBuildInputs; - inherit (super.lib) foldl optional flip id composeExtensions; + inherit (super.lib) foldl optional flip id composeExtensions optionalAttrs; inherit (super) makeSetupHook; # Best effort static binaries. Will still be linked to libSystem, @@ -72,10 +72,12 @@ in { ncurses = super.ncurses.override { enableStatic = true; }; - libxml2 = super.libxml2.override { + libxml2 = super.libxml2.override ({ enableShared = false; enableStatic = true; - }; + } // optionalAttrs super.stdenv.hostPlatform.isDarwin { + pythonSupport = false; + }); zlib = super.zlib.override { static = true; shared = false; |