diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml index d9ff51ae3d..04086275d7 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml @@ -1102,6 +1102,8 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; nextcloud18 before upgrading to nextcloud19 since Nextcloud doesn't support upgrades across multiple major versions. + + The nixos-run-vms script now deletes the previous run machines states on test startup. You can use the diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix index 1477c471f8..cdc3b4b5c5 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -86,8 +86,8 @@ in { }; packages = mkOption { - default = [ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ]; - defaultText = "[ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ]"; + default = [ pkgs.stdenv pkgs.git pkgs.jdk11 config.programs.ssh.package pkgs.nix ]; + defaultText = "[ pkgs.stdenv pkgs.git pkgs.jdk11 config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; description = '' Packages to add to PATH for the jenkins process. @@ -207,7 +207,7 @@ in { # For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript script = '' - ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ + ${pkgs.jdk11}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ --httpPort=${toString cfg.port} \ --prefix=${cfg.prefix} \ -Djava.awt.headless=true \ diff --git a/third_party/nixpkgs/pkgs/applications/audio/sayonara/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sayonara/default.nix index c425817450..722333134d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sayonara/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sayonara/default.nix @@ -1,12 +1,12 @@ { mkDerivation , cmake -, fetchgit +, fetchFromGitLab , gst_all_1 , lib , libpulseaudio , ninja , pcre -, pkgconfig +, pkg-config , qtbase , qttools , taglib @@ -15,34 +15,16 @@ mkDerivation rec { pname = "sayonara-player"; - version = "1.5.1-stable5"; + version = "1.6.0-beta6"; - src = fetchgit { - url = "https://git.sayonara-player.com/sayonara.git"; + src = fetchFromGitLab { + owner = "luciocarreras"; + repo = "sayonara-player"; rev = version; - sha256 = "13l7r3gaszrkyf4z8rdijfzxvcnilax4ki2mcm30wqk8d4g4qdzj"; + sha256 = "sha256-SbJS0DQvbW++CNXbuDHQxFlLRb1kTtDdIdHOqu0YxeQ="; }; - # all this can go with version 1.5.2 - postPatch = '' - # if we don't delete this, sayonara will look here instead of the provided taglib - rm -r src/3rdParty/taglib - - for f in \ - src/DBus/DBusNotifications.cpp \ - src/Gui/Resources/Icons/CMakeLists.txt \ - src/Utils/Utils.cpp \ - test/Util/FileHelperTest.cpp \ - ; do - - substituteInPlace $f --replace /usr $out - done - - substituteInPlace src/Components/Shutdown/Shutdown.cpp \ - --replace /usr/bin/systemctl systemctl - ''; - - nativeBuildInputs = [ cmake ninja pkgconfig qttools ]; + nativeBuildInputs = [ cmake ninja pkg-config qttools ]; buildInputs = [ libpulseaudio diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index d6428e4031..fa6ee383c9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.7.2"; + version = "0.8.2"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "sha256-YUR9SDiRV/gJKx4H1cgdDnKGulTQPVP7MpHyihUEgqg="; + sha256 = "sha256-tJcpjviCXA1Y/PX1jlXphXZZMWBAAg3kdbsj41tmunE="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix index 85ad49a01d..7945dedc52 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix @@ -5,15 +5,15 @@ rustPlatform.buildRustPackage rec { pname = "kibi"; - version = "0.2.0"; + version = "0.2.1"; - cargoSha256 = "0zyqzb3k4ak7h58zjbg9b32hz1vgbbn9i9l85j4vd4aw8mhsz0n9"; + cargoSha256 = "1cbiidq0w5f9ynb09b6828p7p7y5xhpgz47n2jsl8mp96ydhy5lv"; src = fetchFromGitHub { owner = "ilai-deutel"; repo = "kibi"; rev = "v${version}"; - sha256 = "1cqnzw6gpsmrqcz82zn1x5i6najcr3i7shj0wnqzpwppff9a6yac"; + sha256 = "1x5bvvq33380k2qhs1bwz3f9zl5q1sl7iic47pxfkzv24bpjnypb"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix new file mode 100644 index 0000000000..556e5e30f3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -0,0 +1,112 @@ +{ stdenv +, fetchFromGitHub +, lzma +, qt5 +, wrapQtAppsHook +, miniupnpc_2 +, swftools +, pythonPackages +}: + +pythonPackages.buildPythonPackage { + pname = "hydrus"; + version = "413"; + format = "other"; + + src = fetchFromGitHub { + owner = "hydrusnetwork"; + repo = "hydrus"; + rev = "9fbed11bef499e01a6799b298bea7d0967d30430"; + sha256 = "1dl7qpzmlxl376lzm0chmwvf4nl55wz6fwcsw0ikb33rm8r33gq4"; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + ]; + + propagatedBuildInputs = with pythonPackages; [ + beautifulsoup4 + html5lib + lxml + numpy + opencv4 + pillow + psutil + pyopenssl + pyyaml + requests + send2trash + service-identity + twisted + lz4 + lzma + pysocks + matplotlib + qtpy + pyside2 + ]; + + checkInputs = with pythonPackages; [ nose httmock ]; + + # most tests are failing, presumably because we are not using test.py + checkPhase = '' + nosetests $src/hydrus/test \ + -e TestClientAPI \ + -e TestClientConstants \ + -e TestClientDaemons \ + -e TestClientData \ + -e TestClientDB \ + -e TestClientDBDuplicates \ + -e TestClientDBTags \ + -e TestClientImageHandling \ + -e TestClientImportOptions \ + -e TestClientListBoxes \ + -e TestClientMigration \ + -e TestClientNetworking \ + -e TestClientTags \ + -e TestClientThreading \ + -e TestDialogs \ + -e TestFunctions \ + -e TestHydrusNATPunch \ + -e TestHydrusSerialisable \ + -e TestHydrusServer \ + -e TestHydrusSessions \ + -e TestServer \ + ''; + + extraOutputsToLink = [ "doc" ]; + + postPatch = '' + sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${miniupnpc_2}/bin/upnpc";' \ + -i ./hydrus/core/HydrusNATPunch.py + + sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${swftools}/bin/swfrender";' \ + -i ./hydrus/core/HydrusFlashHandling.py + ''; + + #doCheck = true; + + installPhase = '' + # Move the hydrus module and related directories + mkdir -p $out/${pythonPackages.python.sitePackages} + mv {hydrus,static} $out/${pythonPackages.python.sitePackages} + mv help $out/doc/ + + # install the hydrus binaries + mkdir -p $out/bin + install -m0755 server.py $out/bin/hydrus-server + install -m0755 client.py $out/bin/hydrus-client + ''; + + dontWrapQtApps = true; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + meta = with stdenv.lib; { + description = "Danbooru-like image tagging and searching system for the desktop"; + license = licenses.wtfpl; + homepage = "https://hydrusnetwork.github.io/hydrus/"; + maintainers = [ maintainers.evanjs ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix index 276c2cd3d7..faf7487305 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix @@ -1,8 +1,23 @@ -{ stdenv, fetchFromGitHub -, freeimage, fontconfig, pkgconfig -, asciidoc, docbook_xsl, libxslt, cmocka -, librsvg, pango, libxkbcommon, wayland -, libGLU, icu +{ asciidoc +, cmocka +, docbook_xsl +, fetchFromGitHub +, fontconfig +, freeimage +, icu +, libGLU +, libheif +, libjpeg_turbo +, libpng +, librsvg +, libtiff +, libxkbcommon +, libxslt +, netsurf +, pango +, pkgconfig +, stdenv +, wayland }: stdenv.mkDerivation rec { @@ -10,37 +25,31 @@ stdenv.mkDerivation rec { version = "4.1.0"; src = fetchFromGitHub { - owner = "eXeC64"; - repo = "imv"; - rev = "v${version}"; + owner = "eXeC64"; + repo = "imv"; + rev = "v${version}"; sha256 = "0gk8g178i961nn3bls75a8qpv6wvfvav6hd9lxca1skaikd33zdx"; }; - preBuild = '' - # Version is 4.0.1, but Makefile was not updated - sed -i 's/echo v4\.0\.0/echo v4.0.1/' Makefile - ''; - - nativeBuildInputs = [ - asciidoc - cmocka - docbook_xsl - libxslt - ]; + nativeBuildInputs = [ asciidoc cmocka docbook_xsl libxslt ]; buildInputs = [ freeimage + icu libGLU + libjpeg_turbo librsvg libxkbcommon + netsurf.libnsgif pango pkgconfig wayland - icu ]; installFlags = [ "PREFIX=$(out)" "CONFIGPREFIX=$(out)/etc" ]; + makeFlags = [ "BACKEND_LIBJPEG=yes" "BACKEND_LIBNSGIF=yes" ]; + postFixup = '' # The `bin/imv` script assumes imv-wayland or imv-x11 in PATH, # so we have to fix those to the binaries we installed into the /nix/store @@ -53,9 +62,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line image viewer for tiling window managers"; - homepage = "https://github.com/eXeC64/imv"; - license = licenses.gpl2; + homepage = "https://github.com/eXeC64/imv"; + license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj markus1189 ]; - platforms = platforms.all; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/krusader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/krusader/default.nix index ab13c4989d..585dfe3e04 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/krusader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/krusader/default.nix @@ -4,25 +4,23 @@ karchive, kconfig, kcrash, kguiaddons, kinit, kparts, kwindowsystem }: -let +mkDerivation rec { pname = "krusader"; version = "2.7.2"; -in mkDerivation rec { - pname = "krusader"; - inherit version; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "02b1jz5a7cjr13v6c7fczrhs1xmg1krnva5fxk8x2bf4nd1rm8s1"; }; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + + propagatedBuildInputs = [ karchive kconfig kcrash kguiaddons kinit kparts kwindowsystem ]; + meta = with lib; { description = "Norton/Total Commander clone for KDE"; - license = licenses.gpl2; homepage = "http://www.krusader.org"; + license = licenses.gpl2Only; maintainers = with maintainers; [ sander turion ]; }; - - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - propagatedBuildInputs = [ karchive kconfig kcrash kguiaddons kinit kparts kwindowsystem ]; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix index 4cecf07f0f..e23df96efe 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -11,16 +11,17 @@ , pandas , pyshp , setuptools +, withPcap ? true, dpkt ? null, dnslib ? null }: buildPythonApplication rec { pname = "visidata"; - version = "1.5.2"; + version = "2.0.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "19gs8i6chrrwibz706gib5sixx1cjgfzh7v011kp3izcrn524mc0"; + sha256 = "sha256-AkGU9p00y+psBS/fL2YLyQYRSMOp1aPs21E9bpN9z0M="; }; propagatedBuildInputs = [ @@ -34,7 +35,7 @@ buildPythonApplication rec { pandas pyshp setuptools - ]; + ] ++ lib.optionals withPcap [ dpkt dnslib ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix index d967c741fc..8e20093f5b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kube-router"; - version = "1.0.1"; + version = "1.1.0"; goPackagePath = "github.com/cloudnativelabs/kube-router"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "00bypaccv8q9xdcz6vlvl1qxqxqssl21bs4nkd1a6q8b4jpl339z"; + sha256 = "0nsd371w667qhgiygxcg4kmynwldb0pbip6x03rc7j854hg8l7k0"; }; buildFlagsArray = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index 691effa392..a56db43319 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.19.1"; + version = "1.19.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1wnlw2rl14q7cb8shhldbavdamvl3w3mlfvymwfvmvxfxzhrjlaq"; + sha256 = "0fpkgrykkjmkrh327g6zf3r6s39bnv5w1wlqsvvzyp2zsswgw81v"; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubespy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubespy/default.nix index e71e598e23..fa0e62c53f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubespy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubespy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubespy"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "pulumi"; repo = "kubespy"; - sha256 = "1p0qmn6458pa9la6zkvyrkgs2rhzfwsk9m3rk5fkmcfbh7b031r8"; + sha256 = "1xrwhxw2y0zpzsxp1rlm1wd0aqw6jda5ai5y1ards5djqsbsv87g"; }; - vendorSha256 = "0q85is01cbgxflnqdvxc9w5iqdizgvsc44h8z21j712bm2w7blqq"; + vendorSha256 = "0ajhbjs9ijpxp3svvj7pjiac78ps7vkqmqrizq18mllsry0m9pcl"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix new file mode 100644 index 0000000000..34f5be71ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, fetchFromGitHub +, python3Packages +, sox +, flac +, lame +, wrapQtAppsHook +, ffmpeg +, vorbis-tools +, pulseaudio +, nodejs +, youtube-dl +, opusTools +, gst_all_1 +}: +let packages = [ + vorbis-tools + sox + flac + lame + opusTools + gst_all_1.gstreamer + nodejs + ffmpeg + youtube-dl +] ++ stdenv.lib.optionals stdenv.isLinux [ pulseaudio ]; + +in +python3Packages.buildPythonApplication rec { + pname = "mkchromecast-unstable"; + version = "2020-10-17"; + + src = fetchFromGitHub rec { + owner = "muammar"; + repo = "mkchromecast"; + rev = "eb9da74d887acd70ed179e6e4c0cbed4ff83de04"; + sha256 = "1l565n3rmyghc4vzh80gazvdks1i97j1h94x33pkmxxlf9a9rncj"; + }; + + propagatedBuildInputs = with python3Packages; [ + PyChromecast + psutil + mutagen + flask + netifaces + requests + pyqt5 + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'platform.system() == "Darwin"' 'False' \ + --replace 'platform.system() == "Linux"' 'True' + ''; + + nativeBuildInputs = [ wrapQtAppsHook ]; + + # Relies on an old version (0.7.7) of PyChromecast unavailable in Nixpkgs. + # Is also I/O bound and impure, testing an actual device, so we disable. + doCheck = false; + + dontWrapQtApps = true; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + "--prefix PATH : ${stdenv.lib.makeBinPath packages}" + ]; + + postInstall = '' + substituteInPlace $out/lib/${python3Packages.python.libPrefix}/site-packages/mkchromecast/video.py \ + --replace '/usr/share/mkchromecast/nodejs/' '${placeholder "out"}/share/mkchromecast/nodejs/' + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install -Dm 755 -t $out/bin bin/audiodevice + substituteInPlace $out/lib/${python3Packages.python.libPrefix}/site-packages/mkchromecast/audio_devices.py \ + --replace './bin/audiodevice' '${placeholder "out"}/bin/audiodevice' + ''; + + meta = with stdenv.lib; { + homepage = "https://mkchromecast.com/"; + description = "Cast macOS and Linux Audio/Video to your Google Cast and Sonos Devices"; + license = licenses.mit; + maintainers = with maintainers; [ shou ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix index 714ab49524..34c0dac2a1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "A generic parser and tool package for the BTOR2 format"; homepage = "https://github.com/Boolector/btor2tools"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gfan/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gfan/default.nix index adac92f376..7e2a4625d3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/gfan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/gfan/default.nix @@ -8,11 +8,15 @@ stdenv.mkDerivation rec { sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56"; }; - patchPhase = stdenv.lib.optionalString stdenv.cc.isClang '' + patches = [ + ./gfan-0.6.2-cddlib-prefix.patch + ]; + + postPatch = stdenv.lib.optionalString stdenv.cc.isClang '' substituteInPlace Makefile --replace "-fno-guess-branch-probability" "" ''; - buildFlags = [ "CC=cc" "CXX=c++" "cddnoprefix=1" ]; + buildFlags = [ "CC=cc" "CXX=c++" ]; installFlags = [ ''PREFIX=$(out)'' ]; buildInputs = [ gmp mpir cddlib ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gfan/gfan-0.6.2-cddlib-prefix.patch b/third_party/nixpkgs/pkgs/applications/science/math/gfan/gfan-0.6.2-cddlib-prefix.patch new file mode 100644 index 0000000000..8a96a991cf --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/gfan/gfan-0.6.2-cddlib-prefix.patch @@ -0,0 +1,55 @@ +diff -ru gfan0.6.2.orig/src/app_librarytest.cpp gfan0.6.2/src/app_librarytest.cpp +--- gfan0.6.2.orig/src/app_librarytest.cpp 2020-10-19 08:41:27.981863500 +0900 ++++ gfan0.6.2/src/app_librarytest.cpp 2020-10-19 08:42:44.551863500 +0900 +@@ -12,8 +12,8 @@ + #include "setoper.h" + #include "cdd.h" + #else +-#include "cdd/setoper.h" +-#include "cdd/cdd.h" ++#include "cddlib/setoper.h" ++#include "cddlib/cdd.h" + #endif + #include + #include +diff -ru gfan0.6.2.orig/src/gfanlib_zcone.cpp gfan0.6.2/src/gfanlib_zcone.cpp +--- gfan0.6.2.orig/src/gfanlib_zcone.cpp 2020-10-19 08:41:27.981863500 +0900 ++++ gfan0.6.2/src/gfanlib_zcone.cpp 2020-10-19 08:42:44.571863500 +0900 +@@ -16,8 +16,8 @@ + #include "setoper.h" + #include "cdd.h" + #else +-#include "cdd/setoper.h" +-#include "cdd/cdd.h" ++#include "cddlib/setoper.h" ++#include "cddlib/cdd.h" + #endif + //} + +@@ -52,8 +52,8 @@ + "dd_free_global_constants()\n" + "in your deinitialisation code (only available for cddlib version>=094d).\n" + "This requires the header includes:\n" +- "#include \"cdd/setoper.h\"\n" +- "#include \"cdd/cdd.h\"\n" ++ "#include \"cddlib/setoper.h\"\n" ++ "#include \"cddlib/cdd.h\"\n" + "\n" + "Alternatively, you may call gfan:initializeCddlibIfRequired() and deinitializeCddlibIfRequired()\n" + "if gfanlib is the only code using cddlib. If at some point cddlib is no longer required by gfanlib\n" +diff -ru gfan0.6.2.orig/src/lp_cdd.cpp gfan0.6.2/src/lp_cdd.cpp +--- gfan0.6.2.orig/src/lp_cdd.cpp 2020-10-19 08:41:27.991863500 +0900 ++++ gfan0.6.2/src/lp_cdd.cpp 2020-10-19 08:42:44.571863500 +0900 +@@ -5,9 +5,9 @@ + #include "cdd.h" + #include "cdd_f.h" + #else +-#include "cdd/setoper.h" +-#include "cdd/cdd.h" +-#include "cdd/cdd_f.h" ++#include "cddlib/setoper.h" ++#include "cddlib/cdd.h" ++#include "cddlib/cdd_f.h" + #endif + //} + #include "termorder.h" diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index fa68c58f5a..77bacea2a2 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "50.0.0"; + version = "51.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "001i206lwxjyrp406svv4zpb1pliac3f4k5zhzgkjbk2dzj85pyd"; + sha256 = "06k2slgac0fhgypmdriwdc5s09mry22vxk316ixfj5sv3irwn7wc"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/validate-pkg-config.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/validate-pkg-config.sh index 54fc9cc122..ada1b56760 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/validate-pkg-config.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/validate-pkg-config.sh @@ -3,9 +3,8 @@ fixupOutputHooks+=(_validatePkgConfig) _validatePkgConfig() { + local bail=0 for pc in $(find "$prefix" -name '*.pc'); do - local bail=0 - # Do not fail immediately. It's nice to see all errors when # there are multiple pkgconfig files. if ! pkg-config --validate "$pc"; then diff --git a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index c6bcdfd3b2..4856931036 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "0.018"; + version = "0.022"; in fetchzip { name = "JuliaMono-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono.zip"; - sha256 = "0ss79a9gymbhih5pgjkg1mipmk0qsvqqwlkqcdm9fz87d7kfhby3"; + sha256 = "1v4a9qbvjlszamvqrj0g65z1nhahfmf1fzkgjwzkmsrdqn909dic"; postFetch = '' - mkdir -p $out/share/fonts + mkdir -p $out/share/fonts/truetype unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/default.nix index 7fbec79cbd..a5de4dfb3b 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/default.nix @@ -36,7 +36,12 @@ let buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. - elixir = elixir_1_10; + elixir = elixir_1_11; + + elixir_1_11 = lib.callElixir ../interpreters/elixir/1.11.nix { + inherit erlang; + debugInfo = true; + }; elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix { inherit erlang; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix b/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix new file mode 100644 index 0000000000..3dcd8c19ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.11.nix @@ -0,0 +1,9 @@ +{ mkDerivation }: + +# How to obtain `sha256`: +# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz +mkDerivation { + version = "1.11.1"; + sha256 = "0czyv98sq9drlvdwv3gw9vnhn8qa3va4xh5vdqpg7m6b93l1r3p1"; + minimumOTPVersion = "21"; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch new file mode 100644 index 0000000000..a1f9d68eb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch @@ -0,0 +1,100 @@ +From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Mon, 28 Aug 2017 09:24:06 +0200 +Subject: [PATCH] Don't use ldconfig + +--- + Lib/ctypes/util.py | 70 ++---------------------------------------------------- + 1 file changed, 2 insertions(+), 68 deletions(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 5e8b31a854..7b45ce6c15 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -94,46 +94,7 @@ elif os.name == "posix": + import re, tempfile + + def _findLib_gcc(name): +- # Run GCC's linker with the -t (aka --trace) option and examine the +- # library name it prints out. The GCC command will fail because we +- # haven't supplied a proper program with main(), but that does not +- # matter. +- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) +- +- c_compiler = shutil.which('gcc') +- if not c_compiler: +- c_compiler = shutil.which('cc') +- if not c_compiler: +- # No C compiler available, give up +- return None +- +- temp = tempfile.NamedTemporaryFile() +- try: +- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] +- +- env = dict(os.environ) +- env['LC_ALL'] = 'C' +- env['LANG'] = 'C' +- try: +- proc = subprocess.Popen(args, +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT, +- env=env) +- except OSError: # E.g. bad executable +- return None +- with proc: +- trace = proc.stdout.read() +- finally: +- try: +- temp.close() +- except FileNotFoundError: +- # Raised if the file was already removed, which is the normal +- # behaviour of GCC if linking fails +- pass +- res = re.search(expr, trace) +- if not res: +- return None +- return os.fsdecode(res.group(0)) ++ return None + + + if sys.platform == "sunos5": +@@ -255,34 +216,7 @@ elif os.name == "posix": + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' +- regex = os.fsencode(regex % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def _findLib_ld(name): + # See issue #9998 for why this is needed +-- +2.15.0 + diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index 90b6e8ee0c..a8db9bc925 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -28,6 +28,7 @@ with pkgs; isPy37 = pythonVersion == "3.7"; isPy38 = pythonVersion == "3.8"; isPy39 = pythonVersion == "3.9"; + isPy310 = pythonVersion == "3.10"; isPy2 = lib.strings.substring 0 1 pythonVersion == "2"; isPy3 = lib.strings.substring 0 1 pythonVersion == "3"; isPy3k = isPy3; @@ -115,6 +116,19 @@ in { inherit passthruFun; }; + python310 = callPackage ./cpython { + self = python310; + sourceVersion = { + major = "3"; + minor = "10"; + patch = "0"; + suffix = "a1"; + }; + sha256 = "0q59a99w1yad808mx4w6l0j7bk7dbd2kakngbk0w1h9z4dhr8wyv"; + inherit (darwin) configd; + inherit passthruFun; + }; + # Minimal versions of Python (built without optional dependencies) python3Minimal = (python38.override { self = python3Minimal; diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.73.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.73.nix new file mode 100644 index 0000000000..99a5486f19 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.73.nix @@ -0,0 +1,16 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.73.0"; + + src = fetchurl { + #url = "mirror://sourceforge/boost/boost_1_73_0.tar.bz2"; + urls = [ + "mirror://sourceforge/boost/boost_1_73_0.tar.bz2" + "https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_73_0.html + sha256 = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402"; + }; +}) + diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.74.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.74.nix new file mode 100644 index 0000000000..35b4013dcb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.74.nix @@ -0,0 +1,15 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.74.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_1_74_0.tar.bz2" + "https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_74_0.html + sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1"; + }; +}) + diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/cmake-paths-173.patch b/third_party/nixpkgs/pkgs/development/libraries/boost/cmake-paths-173.patch new file mode 100644 index 0000000000..7b88da0e42 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/boost/cmake-paths-173.patch @@ -0,0 +1,22 @@ +diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam +index 4238f921e..8fc1ea269 100644 +--- a/tools/boost_install/boost-install.jam ++++ b/tools/boost_install/boost-install.jam +@@ -649,7 +649,7 @@ rule generate-cmake-config- ( target : sources * : properties * ) + "" + "# Compute the include and library directories relative to this file." + "" +- "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)" ++ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)" + : true ; + + if [ path.is-rooted $(cmakedir) ] +@@ -668,6 +668,8 @@ rule generate-cmake-config- ( target : sources * : properties * ) + " unset(_BOOST_CMAKEDIR_ORIGINAL)" + "endif()" + "" ++ "# Assume that the installer actually did know where the libs were to be installed" ++ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)" + : true ; + } + diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix index 6d1c20f323..8295be238f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -113,7 +113,8 @@ stdenv.mkDerivation { if version == "1.55.0" then ./darwin-1.55-no-system-python.patch else ./darwin-no-system-python.patch) - ++ optional (versionAtLeast version "1.70") ./cmake-paths.patch; + ++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch + ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch; meta = { homepage = "http://boost.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lcms2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lcms2/default.nix index 0cf6228589..6e81dfc071 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lcms2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lcms2/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libtiff libjpeg zlib ]; + # See https://trac.macports.org/ticket/60656 + LDFLAGS = if stdenv.hostPlatform.isDarwin then "-Wl,-w" else null; + meta = with stdenv.lib; { description = "Color management engine"; homepage = "http://www.littlecms.com/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 9bc3770f21..3e97c3f343 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -9,6 +9,7 @@ , zlib , zstd , enableLite ? false +, enableShared ? true }: stdenv.mkDerivation rec { @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { "-DFORCE_SSE42=1") (stdenv.lib.optional enableLite "-DROCKSDB_LITE=1") "-DFAIL_ON_WARNINGS=${if stdenv.hostPlatform.isMinGW then "NO" else "YES"}" - ]; + ] ++ stdenv.lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0"; # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" hardeningDisable = stdenv.lib.optional stdenv.hostPlatform.isWindows "format"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix index 953f5a70b8..c55a1b8002 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { ./spooles.patch ]; + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace makefile --replace '-Wl,-soname' '-Wl,-install_name' + ''; + buildPhase = '' make lib ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch b/third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch index c0c93c9365..71fb4a7f44 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/spooles/spooles.patch @@ -166,7 +166,7 @@ index f014c7d..7c8042a 100755 #cd MPI ; make lib -#cd MT ; make lib + cd MT ; make lib -+ gcc -shared */*/*.lo -Wl,-soname,libspooles.so.2.2 -o libspooles.so.2.2 -lpthread -lm ++ $(CC) -shared */*/*.lo -Wl,-soname,libspooles.so.2.2 -o libspooles.so.2.2 -lpthread -lm + ln -s libspooles.so.2.2 libspooles.so global : diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 6243a735df..ff07222506 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -77,6 +77,7 @@ , {"fast-cli": "1.x"} , "fkill-cli" , "forever" +, "fx" , "get-graphql-schema" , "git-run" , "git-ssb" @@ -160,6 +161,7 @@ , "pyright" , "react-native-cli" , "react-tools" +, "readability-cli" , "redoc-cli" , "reveal.js" , "rollup" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 7736cbf947..4c4359a178 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -3307,6 +3307,15 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; + "@medv/blessed-2.0.1" = { + name = "_at_medv_slash_blessed"; + packageName = "@medv/blessed"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@medv/blessed/-/blessed-2.0.1.tgz"; + sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; + }; + }; "@microsoft/load-themed-styles-1.10.114" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; @@ -3316,6 +3325,15 @@ let sha512 = "baefCOffrEAN86rNBY5uVFt1hEH3DMhMVqeKwmbf1L0u51r0KhvMCdQVS9YRi4VHbiufiea2g7vlFf51RDatkQ=="; }; }; + "@mozilla/readability-0.3.0" = { + name = "_at_mozilla_slash_readability"; + packageName = "@mozilla/readability"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mozilla/readability/-/readability-0.3.0.tgz"; + sha512 = "q8f1CAZsRKK1j+O0BmikGIlKSK03RpT4woT0PCQwhw0nH0z4+rG026AkxoPcjT7Dsgh1ifGscW8tOpvjoyOjvw=="; + }; + }; "@mrmlnc/readdir-enhanced-2.2.1" = { name = "_at_mrmlnc_slash_readdir-enhanced"; packageName = "@mrmlnc/readdir-enhanced"; @@ -3352,22 +3370,22 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-5.0.1" = { + "@netlify/build-5.0.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-5.0.1.tgz"; - sha512 = "k6Lo9HkYXFSi3iZxSjPa7LJvF9Pb52R3+nZE83X8nhIiATdg8y08XOlvqfNGzS48eL6w2iDECUTi+nNfpSJdyw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-5.0.2.tgz"; + sha512 = "onXVJtddOP16XuqDTMhorbOObx/z4kMT7E9+h/q1+530D7PNb0ld/38je/xFNjHuysF8nFCinokQIaTt1ySpzg=="; }; }; - "@netlify/cache-utils-1.0.3" = { + "@netlify/cache-utils-1.0.4" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.3.tgz"; - sha512 = "M7hr8JDirjF9o+7JbHy0T59hfhQL7t9ywTpQ4h625jnJO7BaW+w0Y2CrH0M3QOfdukdof7rkUM2eyR8G0ReSZw=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.4.tgz"; + sha512 = "edIFfOTcJPlQSdJ5KF91ui7aHaYGzjmmdlWau1QHppym4AMajMKosWPoaOgl/SJ563oUNydYoEOP1nwP89//aw=="; }; }; "@netlify/config-0.11.11" = { @@ -3379,31 +3397,31 @@ let sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; }; }; - "@netlify/config-2.3.3" = { + "@netlify/config-2.3.4" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-2.3.3.tgz"; - sha512 = "ir04B74xZZ8knthHk8nUfRbJaBNC0p7uuiHmWNOJejlhn43p0rCxZ1+NRrO+Nrt0cIuhnUjrmmNn9U/69eUZ4A=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-2.3.4.tgz"; + sha512 = "toowJoJ3XE10iHxVWUTYeJL1bLx0N9mDKr2Qidk10UmqJqX8HrIb5pqxtnOxXM+ED+dcdVL++iBvMBNQVIZmmQ=="; }; }; - "@netlify/functions-utils-1.2.9" = { + "@netlify/functions-utils-1.2.10" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.2.9.tgz"; - sha512 = "1iMgfIMDy38ip7hAZd644BJ7he641xeGyG7MkPZtuxESfYfS6IrWiPNMu1NcVsNytXFLIFVg4m8LD6IBSiz1EQ=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.2.10.tgz"; + sha512 = "dgoCm8eLz4F0Jri6sfcv8NR2F7O9SGskh9rnB5UZQ/HqMoBy1Zbab6nsQvwOYUyjRQ6VibXopT2qHNpxYKlQ/g=="; }; }; - "@netlify/git-utils-1.0.3" = { + "@netlify/git-utils-1.0.4" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.3.tgz"; - sha512 = "DVrYCGQnqUc7hpeuWgdXgbgrNZjcuT22X6ymhMFYmwO9NS2RI8zWCiEpvA7IsTx38adyJUErH6KXkBomDB0tGg=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.4.tgz"; + sha512 = "ZB8X/uU3tcQdR6E2//ZLudEP8RUeRDkDX8PWg6gq6Aaisqjkaqg8OL68jYbIEyd09DrmXuM18KK3WMvYdZ7Wnw=="; }; }; "@netlify/open-api-0.18.1" = { @@ -3424,13 +3442,13 @@ let sha512 = "eOU3P8GgRSMKXZWBxMeLZYX3UUwq/w5Hn6BiUyroJ57UkxHFzMsIcsIryt/KW5vKEiLo/pvYZyU0S4WVcbHbWA=="; }; }; - "@netlify/run-utils-1.0.2" = { + "@netlify/run-utils-1.0.3" = { name = "_at_netlify_slash_run-utils"; packageName = "@netlify/run-utils"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.2.tgz"; - sha512 = "L3WKcTIYUilmRSMW+kFQDlo1kIa5fkLVbrmXAjqmCHpHSdY442vbdDwOnrRcJ0tqeR4QIw/ePVyE48Mk4E86Eg=="; + url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.3.tgz"; + sha512 = "o3U+F2vBuTjl84d5EgV0duImNVtPdMjh2MWs9YgI3Gy4rJLVQbQgPezlFV1PvDrgTMBG14iTTZKjaxFXpsA/sg=="; }; }; "@netlify/zip-it-and-ship-it-1.3.12" = { @@ -3955,13 +3973,13 @@ let sha512 = "uc6FmPEegAZawSHjUMFQwU7EjaDn7zy1iD/KD/wBROL9F4378OES8MKMYHoRAKT61Fk7LxVKZSDR5VespMQiqw=="; }; }; - "@prettier/plugin-pug-1.8.1" = { + "@prettier/plugin-pug-1.9.0" = { name = "_at_prettier_slash_plugin-pug"; packageName = "@prettier/plugin-pug"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.8.1.tgz"; - sha512 = "lXyGIECz6XsggTNfjqaQxeOB4PqoAL2pmhJ7koV7ibKA3JPlQeEkk91PcnUsSNFyFtLzfFBwaHepoBmJb5FNWQ=="; + url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.9.0.tgz"; + sha512 = "doLga3EPMPiUgO98aUWXoq8YuPLIwUWX0YbwqnSg2URQ7hKGjxlyEeVlAmrERVI3mm9zbwpEEZ02jw0ROd+5+g=="; }; }; "@primer/octicons-11.0.0" = { @@ -4252,13 +4270,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.2.3" = { + "@serverless/components-3.2.4" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.2.3.tgz"; - sha512 = "QY+vI/pNkuJeNnCLX258xCO4urJ/q3EXQk844VPXhaNPSogoioBzm+hFyOMydGBVLDy8+tVWbD8BDPSpdWJ9IA=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.2.4.tgz"; + sha512 = "J1iCygYu4ol9f3N1I0qkAZjCYxJ46l3bAc+MtIgWtuYc8ItmlqcoukOkTaOuUGM7I4ZoDiDBuK+Q9N8pxhokdw=="; }; }; "@serverless/core-1.1.2" = { @@ -4297,13 +4315,13 @@ let sha512 = "zTJBhzjWtDBogLFnzoz6NYiQ6CThsxuvHQxSbBLcNK4+VQPIkrZOxaQ+dNCNLeLN1Tb3NnZDPNGkoThvgGwq3Q=="; }; }; - "@serverless/platform-client-china-2.0.3" = { + "@serverless/platform-client-china-2.0.4" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.3.tgz"; - sha512 = "QTgZTDmnWI++GHtJfpjrfsXvsqMmIDcvXM4lDLEiu5FqvA/oZ+QlhGfZab8Dd6MGsKIgByMwATK7w6Or3Da3dQ=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.4.tgz"; + sha512 = "RNxz22NENCiw1pGPnwYRWVhDSj/4bkLNrsdMvxfv5iao/rFzY01y5HwUjPGKSDwdRQN26d4YiV8ejhFUIV7owA=="; }; }; "@serverless/platform-sdk-2.3.2" = { @@ -6151,40 +6169,40 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "@vue/cli-shared-utils-4.5.7" = { + "@vue/cli-shared-utils-4.5.8" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.5.7"; + version = "4.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.7.tgz"; - sha512 = "oicFfx9PvgupxN/LW0s2ktdn1U6bBu8J4lPcW2xj6TtTWUkkxwzis4Tm+XOvgvZnu44+d7216y0Y4TX90q645w=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.8.tgz"; + sha512 = "pa6oenhBO/5HeDLRSokiwVN01gROACEDy3ESXWuPmragOREGNmmFKtkPHlqeYavGEX6LFp7f0VK3uMX6UYS5mQ=="; }; }; - "@vue/cli-ui-4.5.7" = { + "@vue/cli-ui-4.5.8" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.5.7"; + version = "4.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.7.tgz"; - sha512 = "3K+KGGOtkpxpvrkq1Q7FAo1i4CmzCyB6MtOrs5rU6Uqt8eZUjdBu7m7ElsIDRNvprAERKmarTyu89ErgxrkC4g=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.8.tgz"; + sha512 = "m2is3vx+ccdsH7kenZgCOnYaTH3jm541ZuUPo2pYY+W0mX1bujrtpQgAmpkpPVKfcAdWnzoLi7+zkYBH7nXl2Q=="; }; }; - "@vue/cli-ui-addon-webpack-4.5.7" = { + "@vue/cli-ui-addon-webpack-4.5.8" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.5.7"; + version = "4.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.7.tgz"; - sha512 = "FTB7Oc+IXFuDPA7Q8m3bY0c70+J/wJbBFUZyqFDdSRgd09t3sG3PJ9/4jzW5KJKyBB2uyttvhk1atZuNPuUNaw=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.8.tgz"; + sha512 = "kptiU6IWvilevgX7BJUvvQWzzG4xTHKnXySmdpYjltFaAZLLxmCSUzkbvJFzOAOlpSCRQiUrNQnYCwd2f3upCw=="; }; }; - "@vue/cli-ui-addon-widgets-4.5.7" = { + "@vue/cli-ui-addon-widgets-4.5.8" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.5.7"; + version = "4.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.7.tgz"; - sha512 = "9EyKQKj/KhRcReWHa8G4j5d6YG/+dUppHo1IjeTbAhRdFmPgVJ3B51y+epK136s8KqS9p/bcsXXuIs8gZIxcjw=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.8.tgz"; + sha512 = "y3vnCLQxUgZ/entdvv6vut7uQwmIp+ichxBay4yy8TjtpBxdVH0EXAByi+6rJlO2sotlvmRdnZU7AV7tz1yLsw=="; }; }; "@vue/compiler-core-3.0.1" = { @@ -6709,31 +6727,13 @@ let sha512 = "tDV8V15wm7mmbAH6XvQRU1X+oPGmeOzYsd6h7hlRLz6QpV4Ec/KKxM8OpLtFmQPLCreGxTp+HuxtH4pRIZyL9w=="; }; }; - "@webpack-cli/generators-1.0.1" = { - name = "_at_webpack-cli_slash_generators"; - packageName = "@webpack-cli/generators"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/generators/-/generators-1.0.1.tgz"; - sha512 = "MPaOezICviBfgYc+r8WBTkyM8gOe3qBR5t32roPqyhL4SJmN4f82ZYvVomLEx+YFBQ5uksCauSHAGoJNXinymg=="; - }; - }; - "@webpack-cli/info-1.0.1" = { + "@webpack-cli/info-1.0.2" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.0.1.tgz"; - sha512 = "C6OJTxTLgTjBuNKLlseQ2HHjgEGTcgIFcrJd67K3pM2LcYJNWT6VFaPzk9Go0yTZ9km9awm8sq2hW3Hm32NBeQ=="; - }; - }; - "@webpack-cli/init-1.0.1" = { - name = "_at_webpack-cli_slash_init"; - packageName = "@webpack-cli/init"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/init/-/init-1.0.1.tgz"; - sha512 = "OmhDC1jjhhX13mNt+emTPR7u18nrAWKOk/nIAg8XRFdZU2VUBPJbOK3/6xmqXnWKByZVJClvaeUjvgVQBnQmZw=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.0.2.tgz"; + sha512 = "FEfLQwmN4pXZSYSrtp+KC84rFanoCIxXFpS2wUvviDCE2fnajwxw2GXzbj83IlH4Dl8Wq8kJjavVwvxv3YJmnw=="; }; }; "@webpack-cli/serve-1.0.1" = { @@ -6745,24 +6745,6 @@ let sha512 = "WGMaTMTK6NOe29Hw1WBEok9vGLfKg5C6jWzNOS/6HH1YadR+RL+TRWRcSyc81Dzulljhk/Ree9mrDM4Np9GGOQ=="; }; }; - "@webpack-cli/utils-1.0.1" = { - name = "_at_webpack-cli_slash_utils"; - packageName = "@webpack-cli/utils"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/utils/-/utils-1.0.1.tgz"; - sha512 = "G8UKA+B85/5X+pM85P0Knx43vwFS1W9WDseeif/15jbtDTib8jaNC+rD9SBvFcllmnqdfFXpkcrmWMW4A744dg=="; - }; - }; - "@webpack-cli/webpack-scaffold-1.0.1" = { - name = "_at_webpack-cli_slash_webpack-scaffold"; - packageName = "@webpack-cli/webpack-scaffold"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/webpack-scaffold/-/webpack-scaffold-1.0.1.tgz"; - sha512 = "AfnpwDJv2hxwpaM6Ljz0eNa7ayHVviPNWN/76RjlFxMGfT0K7O6IWw2oDvikqko227DClV4xO/5CL1/tz0LGhw=="; - }; - }; "@wry/context-0.4.4" = { name = "_at_wry_slash_context"; packageName = "@wry/context"; @@ -7096,6 +7078,15 @@ let sha512 = "clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A=="; }; }; + "acorn-globals-6.0.0" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz"; + sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; + }; + }; "acorn-jsx-3.0.1" = { name = "acorn-jsx"; packageName = "acorn-jsx"; @@ -9382,13 +9373,13 @@ let sha512 = "kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ=="; }; }; - "atomically-1.3.2" = { + "atomically-1.5.0" = { name = "atomically"; packageName = "atomically"; - version = "1.3.2"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/atomically/-/atomically-1.3.2.tgz"; - sha512 = "MAiqx5ir1nOoMeG2vLXJnj4oFROJYB1hMqa2aAo6GQVIkPdkIcrq9W9SR0OaRtvEowO7Y2bsXqKFuDMTO4iOAQ=="; + url = "https://registry.npmjs.org/atomically/-/atomically-1.5.0.tgz"; + sha512 = "BTkqh410x70yF7iFtJxnL7N5j6HU0JYrJpvLUbZNM4u9rvCPveqKo6nFM9aFrjAOOpzPBnxKVncJ8o/GfEx18g=="; }; }; "attach-ware-1.1.1" = { @@ -11857,15 +11848,6 @@ let sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA=="; }; }; - "cacheable-lookup-2.0.1" = { - name = "cacheable-lookup"; - packageName = "cacheable-lookup"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz"; - sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; - }; - }; "cacheable-lookup-5.0.3" = { name = "cacheable-lookup"; packageName = "cacheable-lookup"; @@ -16340,6 +16322,15 @@ let sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ=="; }; }; + "data-urls-2.0.0" = { + name = "data-urls"; + packageName = "data-urls"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz"; + sha512 = "X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ=="; + }; + }; "dataloader-2.0.0" = { name = "dataloader"; packageName = "dataloader"; @@ -16628,6 +16619,15 @@ let sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; }; }; + "decimal.js-10.2.1" = { + name = "decimal.js"; + packageName = "decimal.js"; + version = "10.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz"; + sha512 = "KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw=="; + }; + }; "decimal.js-7.5.1" = { name = "decimal.js"; packageName = "decimal.js"; @@ -16682,15 +16682,6 @@ let sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; }; }; - "decompress-response-5.0.0" = { - name = "decompress-response"; - packageName = "decompress-response"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-response/-/decompress-response-5.0.0.tgz"; - sha512 = "TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw=="; - }; - }; "decompress-response-6.0.0" = { name = "decompress-response"; packageName = "decompress-response"; @@ -18059,6 +18050,15 @@ let sha512 = "raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug=="; }; }; + "domexception-2.0.1" = { + name = "domexception"; + packageName = "domexception"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz"; + sha512 = "yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg=="; + }; + }; "domhandler-2.2.1" = { name = "domhandler"; packageName = "domhandler"; @@ -19554,13 +19554,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.0.1" = { + "eslint-plugin-vue-7.1.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.0.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.0.1.tgz"; - sha512 = "Pzl88S8Gue9BPcvSg+K/Av2V5UlwGeBxiZW5cLYbDngHm7vLnSuO/q2n54kIyCqfPmuD5PKlJrNSzoN+Ur9HRg=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.1.0.tgz"; + sha512 = "9dW7kj8/d2IkDdgNpvIhJdJ3XzU3x4PThXYMzWt49taktYnGyrTY6/bXCYZ/VtQKU9kXPntPrZ41+8Pw0Nxblg=="; }; }; "eslint-scope-3.7.3" = { @@ -21489,15 +21489,6 @@ let sha512 = "YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg=="; }; }; - "findup-sync-4.0.0" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz"; - sha512 = "6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ=="; - }; - }; "fined-1.2.0" = { name = "fined"; packageName = "fined"; @@ -23641,15 +23632,6 @@ let sha1 = "d9430ba32f6a30218243884418767340aafc0400"; }; }; - "got-10.7.0" = { - name = "got"; - packageName = "got"; - version = "10.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-10.7.0.tgz"; - sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; - }; - }; "got-11.4.0" = { name = "got"; packageName = "got"; @@ -24919,6 +24901,15 @@ let sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw=="; }; }; + "html-encoding-sniffer-2.0.1" = { + name = "html-encoding-sniffer"; + packageName = "html-encoding-sniffer"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; + sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ=="; + }; + }; "html-entities-1.3.1" = { name = "html-entities"; packageName = "html-entities"; @@ -27386,6 +27377,15 @@ let sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; }; }; + "is-potential-custom-element-name-1.0.0" = { + name = "is-potential-custom-element-name"; + packageName = "is-potential-custom-element-name"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz"; + sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; + }; + }; "is-primitive-2.0.0" = { name = "is-primitive"; packageName = "is-primitive"; @@ -28493,15 +28493,6 @@ let sha512 = "xpH2FVSEepXoNr6+cPlPHzPzBY1W9bPulufhCHOShzk8+CTCzAOQKytuOXT0b/9PvmO4biRi0g/ZIylVew815w=="; }; }; - "jscodeshift-0.7.1" = { - name = "jscodeshift"; - packageName = "jscodeshift"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.7.1.tgz"; - sha512 = "YMkZSyoc8zg5woZL23cmWlnFLPH/mHilonGA7Qbzs7H6M4v4PH0Qsn4jeDyw+CHhVoAnm9UxQyB0Yw1OT+mktA=="; - }; - }; "jsdom-11.12.0" = { name = "jsdom"; packageName = "jsdom"; @@ -28538,6 +28529,15 @@ let sha512 = "fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g=="; }; }; + "jsdom-16.4.0" = { + name = "jsdom"; + packageName = "jsdom"; + version = "16.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz"; + sha512 = "lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w=="; + }; + }; "jsdom-7.2.2" = { name = "jsdom"; packageName = "jsdom"; @@ -37857,15 +37857,6 @@ let sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; }; }; - "p-each-series-2.1.0" = { - name = "p-each-series"; - packageName = "p-each-series"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz"; - sha512 = "ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ=="; - }; - }; "p-event-2.3.1" = { name = "p-event"; packageName = "p-event"; @@ -38775,6 +38766,15 @@ let sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="; }; }; + "parse5-5.1.1" = { + name = "parse5"; + packageName = "parse5"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz"; + sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; + }; + }; "parse5-6.0.1" = { name = "parse5"; packageName = "parse5"; @@ -40810,13 +40810,13 @@ let sha512 = "s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA=="; }; }; - "pretty-error-2.1.1" = { + "pretty-error-2.1.2" = { name = "pretty-error"; packageName = "pretty-error"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz"; - sha1 = "5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"; + url = "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz"; + sha512 = "EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw=="; }; }; "pretty-format-23.6.0" = { @@ -42403,13 +42403,13 @@ let sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; - "query-string-6.13.5" = { + "query-string-6.13.6" = { name = "query-string"; packageName = "query-string"; - version = "6.13.5"; + version = "6.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-6.13.5.tgz"; - sha512 = "svk3xg9qHR39P3JlHuD7g3nRnyay5mHbrPctEBDUxUkHRifPHXJDhBUycdCC0NBjXoDf44Gb+IsOZL1Uwn8M/Q=="; + url = "https://registry.npmjs.org/query-string/-/query-string-6.13.6.tgz"; + sha512 = "/WWZ7d9na6s2wMEGdVCVgKWE9Rt7nYyNIf7k8xmHXcesPMlEzicWo3lbYwHyA4wBktI2KrXxxZeACLbE84hvSQ=="; }; }; "querystring-0.2.0" = { @@ -43915,13 +43915,13 @@ let sha512 = "Gyk9CYWqGmG2W83ZfQnK8ZGZbmKkrxnHHHiWxF32vH5Afd19IIPZFZADtlmeXVA2petJgCB9L1EbPUc6dS8jDg=="; }; }; - "renderkid-2.0.3" = { + "renderkid-2.0.4" = { name = "renderkid"; packageName = "renderkid"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz"; - sha512 = "z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA=="; + url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz"; + sha512 = "K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g=="; }; }; "repeat-element-1.1.3" = { @@ -45256,6 +45256,15 @@ let sha512 = "Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g=="; }; }; + "saxes-5.0.1" = { + name = "saxes"; + packageName = "saxes"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz"; + sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw=="; + }; + }; "scheduler-0.18.0" = { name = "scheduler"; packageName = "scheduler"; @@ -48910,13 +48919,13 @@ let sha512 = "fqqhZzXyAM6pGD9lky/GOPq6V4X0SeTAFBl0iXb/BzOegl40gpf/bV3QQP7zULNYvjr6+Dx8SCaDULjVoOru0A=="; }; }; - "stringify-entities-3.0.1" = { + "stringify-entities-3.1.0" = { name = "stringify-entities"; packageName = "stringify-entities"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.1.tgz"; - sha512 = "Lsk3ISA2++eJYqBMPKcr/8eby1I6L0gP0NlxF8Zja6c05yr/yCYyb2c9PwXjd08Ib3If1vn1rbs1H5ZtVuOfvQ=="; + url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz"; + sha512 = "3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg=="; }; }; "stringify-object-3.3.0" = { @@ -50288,13 +50297,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.43.0" = { + "terminal-kit-1.44.0" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.43.0.tgz"; - sha512 = "OuPvQzx6oxr3oE2Y78NgRy0TetmurGa/vshYV02Kd6XDWctHO/sHpjnLe3Jhi8FrUkL0XAZMGlxjLeDtRFL4wg=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.44.0.tgz"; + sha512 = "f9RLSA1a1ahx/40NwQ1FoGWz/el7no9RiGX4wMUirmqxJZjwZ09pMZWFWzlHb1yIfk9SnfRD9esGfofu5fF35A=="; }; }; "terminal-link-2.1.1" = { @@ -50324,13 +50333,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.3.5" = { + "terser-5.3.6" = { name = "terser"; packageName = "terser"; - version = "5.3.5"; + version = "5.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.3.5.tgz"; - sha512 = "Qw3CZAMmmfU824AoGKalx+riwocSI5Cs0PoGp9RdSLfmxkmJgyBxqLBP/isDNtFyhHnitikvRMZzyVgeq+U+Tg=="; + url = "https://registry.npmjs.org/terser/-/terser-5.3.6.tgz"; + sha512 = "145ap5v1HYx69HfLuwWaxTIlXyiSr+nSTb7ZWlJCgJn2JptuJRKziNa/zwFx9B1IU99Q055jHni74nLuuEC78w=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -51908,15 +51917,6 @@ let sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; - "type-fest-0.10.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.10.0.tgz"; - sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw=="; - }; - }; "type-fest-0.11.0" = { name = "type-fest"; packageName = "type-fest"; @@ -52187,6 +52187,15 @@ let sha512 = "G440NU6fewtnQftSgqRV1r2A5ChKbU1gqFCJ7I8S7MPpY/eZZfLGefaY6gUZYiWebMaO+txgiQ1ZyLDuNWJulg=="; }; }; + "uglify-js-3.11.3" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.3.tgz"; + sha512 = "wDRziHG94mNj2n3R864CvYw/+pc9y/RNImiTyrrf8BzgWn75JgFSwYvXrtZQMnMnOp/4UTrf3iCSQxSStPiByA=="; + }; + }; "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; @@ -52889,13 +52898,13 @@ let sha512 = "DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g=="; }; }; - "unist-util-visit-parents-3.1.0" = { + "unist-util-visit-parents-3.1.1" = { name = "unist-util-visit-parents"; packageName = "unist-util-visit-parents"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.0.tgz"; - sha512 = "0g4wbluTF93npyPrp/ymd3tCDTMnP0yo2akFD2FIBAYXq/Sga3lwaU1D8OYKbtpioaI6CkDcQ6fsMnmtzt7htw=="; + url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz"; + sha512 = "1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg=="; }; }; "universal-analytics-0.4.23" = { @@ -53375,13 +53384,13 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "url-toolkit-2.2.0" = { + "url-toolkit-2.2.1" = { name = "url-toolkit"; packageName = "url-toolkit"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.0.tgz"; - sha512 = "Rde0c9S4fJK3FaHim3DSgdQ8IFrSXcZCpAJo9T7/FA+BoQGhK0ow3mpwGQLJCPYsNn6TstpW7/7DzMpSpz9F9w=="; + url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.1.tgz"; + sha512 = "8+DzgrtDZYZGhHaAop5WGVghMdCfOLGbhcArsJD0qDll71FXa7EeKxi2hilPIscn2nwMz4PRjML32Sz4JTN0Xw=="; }; }; "urlencode-1.1.0" = { @@ -55121,6 +55130,15 @@ let sha512 = "p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg=="; }; }; + "w3c-xmlserializer-2.0.0" = { + name = "w3c-xmlserializer"; + packageName = "w3c-xmlserializer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; + sha512 = "4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA=="; + }; + }; "wait-port-0.2.9" = { name = "wait-port"; packageName = "wait-port"; @@ -55292,6 +55310,15 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; + "webidl-conversions-5.0.0" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; + sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; + }; + }; "webidl-conversions-6.1.0" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -55562,6 +55589,15 @@ let sha512 = "PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ=="; }; }; + "whatwg-url-8.4.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "8.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz"; + sha512 = "vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw=="; + }; + }; "whatwg-url-compat-0.6.5" = { name = "whatwg-url-compat"; packageName = "whatwg-url-compat"; @@ -58134,7 +58170,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.11.2" + sources."uglify-js-3.11.3" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -59101,10 +59137,10 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.5.7"; + version = "4.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.7.tgz"; - sha512 = "rx6yzQQ0DLxtJGxvGti8R1ND/wF5ISIv+hwyh1qB2R9gO6WobhT9sUBB/8Rth5hxRj7/MuCIz6KgmTc2hW+u2g=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.8.tgz"; + sha512 = "/hKE03mkpt+CHAL2UIdQC3B1rbNKzvBpU0280Pz9Vt1QlB9ruqBL+1MLJnm70+9d2+VX5Vk/mlaXBOuQz0ID4w=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" @@ -59440,14 +59476,14 @@ in sources."@types/through-0.0.30" sources."@types/ws-7.2.7" sources."@types/zen-observable-0.8.1" - sources."@vue/cli-shared-utils-4.5.7" - (sources."@vue/cli-ui-4.5.7" // { + sources."@vue/cli-shared-utils-4.5.8" + (sources."@vue/cli-ui-4.5.8" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.5.7" - sources."@vue/cli-ui-addon-widgets-4.5.7" + sources."@vue/cli-ui-addon-webpack-4.5.8" + sources."@vue/cli-ui-addon-widgets-4.5.8" (sources."@vue/compiler-core-3.0.1" // { dependencies = [ sources."@babel/types-7.12.1" @@ -62323,7 +62359,7 @@ in sources."pkginfo-0.4.1" sources."prompt-1.0.0" sources."punycode-2.1.1" - sources."query-string-6.13.5" + sources."query-string-6.13.6" sources."read-1.0.7" sources."revalidator-0.1.8" sources."rimraf-2.7.1" @@ -62377,10 +62413,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.9.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.9.0.tgz"; - sha512 = "p64cBvczMAK7JWAjZYAsvCiXAySybq32wWwKSdJx4hNn+jX8clwUmkbnhYaYfejyvz7fBzFTgMdbmOGOH4/DqA=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.11.0.tgz"; + sha512 = "QdKxUVPcrX+/rkpWHjQtRePsT2tWZY586Ip7hGsn5WCP3SY/HyAfzuzk6tygC0C7VvXrV0WQd3VLIMwgpwWQnA=="; }; buildInputs = globalBuildInputs; meta = { @@ -62435,10 +62471,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.1.tgz"; - sha512 = "kPNmgaCx6hKshq/Vv5uugrPkQcDa7pVp+hosGADBP8qzHxudbumDA5va2vSzqjhUxAYEGTL92F0mBapg29pJhg=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.2.tgz"; + sha512 = "j7Hs+NHSk6nMEVobAi6NCGLuU8ME7FAbjaOWSszbsYidkXKQ/pwKoNl459YWRjePC/uDZKBbLERPYqX+Y0xAQw=="; }; buildInputs = globalBuildInputs; meta = { @@ -64162,7 +64198,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."stringify-entities-3.0.1" + sources."stringify-entities-3.1.0" sources."strip-ansi-6.0.0" sources."strip-indent-3.0.0" sources."style-search-0.1.0" @@ -64187,7 +64223,7 @@ in sources."unist-util-remove-position-2.0.1" sources."unist-util-stringify-position-2.0.3" sources."unist-util-visit-2.0.3" - sources."unist-util-visit-parents-3.1.0" + sources."unist-util-visit-parents-3.1.1" sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.1.1" @@ -64379,7 +64415,7 @@ in }) sources."@nodelib/fs.stat-1.1.3" sources."@nodelib/fs.walk-1.2.4" - sources."@prettier/plugin-pug-1.8.1" + sources."@prettier/plugin-pug-1.9.0" sources."@sindresorhus/is-0.14.0" sources."@sorg/log-2.2.0" sources."@starptech/expression-parser-0.10.0" @@ -64661,7 +64697,7 @@ in sources."which-2.0.2" ]; }) - (sources."eslint-plugin-vue-7.0.1" // { + (sources."eslint-plugin-vue-7.1.0" // { dependencies = [ sources."semver-7.3.2" ]; @@ -67869,7 +67905,7 @@ in sources."arch-2.1.2" sources."arrify-1.0.1" sources."astral-regex-2.0.0" - sources."atomically-1.3.2" + sources."atomically-1.5.0" sources."auto-bind-4.0.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -69602,7 +69638,7 @@ in }) sources."url-join-4.0.1" sources."url-parse-lax-3.0.0" - sources."url-toolkit-2.2.0" + sources."url-toolkit-2.2.1" sources."use-3.1.1" (sources."util-0.11.1" // { dependencies = [ @@ -71926,7 +71962,11 @@ in sources."postcss-value-parser-4.1.0" sources."prepend-http-1.0.4" sources."pretty-bytes-5.4.1" - sources."pretty-error-2.1.1" + (sources."pretty-error-2.1.2" // { + dependencies = [ + sources."lodash-4.17.20" + ]; + }) (sources."pretty-format-25.5.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -72073,7 +72113,7 @@ in sources."relateurl-0.2.7" sources."remove-trailing-separator-1.1.0" sources."remove-trailing-slash-0.1.1" - (sources."renderkid-2.0.3" // { + (sources."renderkid-2.0.4" // { dependencies = [ sources."ansi-regex-2.1.1" (sources."dom-serializer-0.2.2" // { @@ -72087,6 +72127,7 @@ in sources."domutils-1.7.0" sources."entities-1.1.2" sources."htmlparser2-3.10.1" + sources."lodash-4.17.20" sources."readable-stream-3.6.0" sources."strip-ansi-3.0.1" ]; @@ -73527,6 +73568,40 @@ in bypassCache = true; reconstructLock = true; }; + fx = nodeEnv.buildNodePackage { + name = "fx"; + packageName = "fx"; + version = "20.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fx/-/fx-20.0.2.tgz"; + sha512 = "BgZNylpsDf5V0c4DwjWnre2dld9YbEbdNUnXzOC2WJv4R/AnJG8cu7mBERhkqxue3S3hgmJr3lqoqeKb2PedGQ=="; + }; + dependencies = [ + sources."@medv/blessed-2.0.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" + sources."has-flag-4.0.0" + sources."indent-string-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."lossless-json-1.0.4" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Command-line JSON viewer"; + homepage = https://fx.wtf/; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; get-graphql-schema = nodeEnv.buildNodePackage { name = "get-graphql-schema"; packageName = "get-graphql-schema"; @@ -73829,7 +73904,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."arrify-1.0.1" - sources."atomically-1.3.2" + sources."atomically-1.5.0" (sources."boxen-4.2.0" // { dependencies = [ sources."chalk-3.0.0" @@ -75875,7 +75950,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.11.2" + sources."uglify-js-3.11.3" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -77947,7 +78022,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.43.0" + sources."terminal-kit-1.44.0" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -80105,7 +80180,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.11.2" + sources."uglify-js-3.11.3" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -83446,20 +83521,20 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-5.0.1" // { + (sources."@netlify/build-5.0.2" // { dependencies = [ sources."chalk-3.0.0" sources."resolve-2.0.0-next.1" ]; }) - sources."@netlify/cache-utils-1.0.3" - (sources."@netlify/config-2.3.3" // { + sources."@netlify/cache-utils-1.0.4" + (sources."@netlify/config-2.3.4" // { dependencies = [ sources."chalk-3.0.0" ]; }) - sources."@netlify/functions-utils-1.2.9" - (sources."@netlify/git-utils-1.0.3" // { + sources."@netlify/functions-utils-1.2.10" + (sources."@netlify/git-utils-1.0.4" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -83470,7 +83545,7 @@ in }) sources."@netlify/open-api-0.18.1" sources."@netlify/plugin-edge-handlers-1.8.0" - sources."@netlify/run-utils-1.0.2" + sources."@netlify/run-utils-1.0.3" (sources."@netlify/zip-it-and-ship-it-1.3.12" // { dependencies = [ sources."resolve-2.0.0-next.1" @@ -84992,7 +85067,7 @@ in ]; }) sources."term-size-2.2.0" - (sources."terser-5.3.5" // { + (sources."terser-5.3.6" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -88361,7 +88436,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.11.2" + sources."uglify-js-3.11.3" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.0" @@ -90378,6 +90453,137 @@ in bypassCache = true; reconstructLock = true; }; + readability-cli = nodeEnv.buildNodePackage { + name = "readability-cli"; + packageName = "readability-cli"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readability-cli/-/readability-cli-1.1.5.tgz"; + sha512 = "xMbRC9qGezXO4dqRlTpSfC/o4XuUpsRq0yLGEumtulcNVz1RJyOEbovgnqmOhulZYSgsLbRCm8gZ0nQ5n0up6w=="; + }; + dependencies = [ + sources."@mozilla/readability-0.3.0" + sources."abab-2.0.5" + sources."acorn-7.4.1" + sources."acorn-globals-6.0.0" + sources."acorn-walk-7.2.0" + sources."ajv-6.12.6" + 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.10.1" + sources."bcrypt-pbkdf-1.0.2" + sources."browser-process-hrtime-1.0.0" + sources."caseless-0.12.0" + sources."combined-stream-1.0.8" + sources."core-util-is-1.0.2" + sources."cssom-0.4.4" + (sources."cssstyle-2.3.0" // { + dependencies = [ + sources."cssom-0.3.8" + ]; + }) + sources."dashdash-1.14.1" + sources."data-urls-2.0.0" + sources."decimal.js-10.2.1" + sources."deep-is-0.1.3" + sources."delayed-stream-1.0.0" + (sources."domexception-2.0.1" // { + dependencies = [ + sources."webidl-conversions-5.0.0" + ]; + }) + sources."ecc-jsbn-0.1.2" + sources."escodegen-1.14.3" + sources."esprima-4.0.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."getpass-0.1.7" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."html-encoding-sniffer-2.0.1" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.24" + sources."ip-regex-2.1.0" + sources."is-potential-custom-element-name-1.0.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."jsdom-16.4.0" + 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."levn-0.3.0" + sources."lodash-4.17.20" + sources."lodash.sortby-4.7.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."minimist-1.2.5" + sources."nwsapi-2.2.0" + sources."oauth-sign-0.9.0" + sources."optionator-0.8.3" + sources."parse5-5.1.1" + sources."performance-now-2.1.0" + sources."prelude-ls-1.1.2" + sources."psl-1.8.0" + sources."punycode-2.1.1" + sources."qs-6.5.2" + (sources."request-2.88.2" // { + dependencies = [ + sources."tough-cookie-2.5.0" + ]; + }) + sources."request-promise-core-1.1.4" + (sources."request-promise-native-1.0.9" // { + dependencies = [ + sources."tough-cookie-2.5.0" + ]; + }) + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."saxes-5.0.1" + sources."source-map-0.6.1" + sources."sshpk-1.16.1" + sources."stealthy-require-1.1.1" + sources."symbol-tree-3.2.4" + sources."tough-cookie-3.0.1" + sources."tr46-2.0.2" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."uri-js-4.4.0" + sources."uuid-3.4.0" + sources."verror-1.10.0" + sources."w3c-hr-time-1.0.2" + sources."w3c-xmlserializer-2.0.0" + sources."webidl-conversions-6.1.0" + sources."whatwg-encoding-1.0.5" + sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-8.4.0" + sources."word-wrap-1.2.3" + sources."ws-7.3.1" + sources."xml-name-validator-3.0.0" + sources."xmlchars-2.2.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Firefox Reader Mode in your terminal - get useful text from a web page using Mozilla's Readability library"; + homepage = "https://gitlab.com/gardenappl/readability-cli#readme"; + license = "GPL-3.0-only"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; @@ -90720,7 +90926,7 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.11.2" + sources."uglify-js-3.11.3" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -91510,7 +91716,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.2.3" // { + (sources."@serverless/components-3.2.4" // { dependencies = [ sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.5" @@ -91539,7 +91745,7 @@ in sources."@serverless/enterprise-plugin-4.1.1" sources."@serverless/event-mocks-1.1.1" sources."@serverless/platform-client-3.1.2" - sources."@serverless/platform-client-china-2.0.3" + sources."@serverless/platform-client-china-2.0.4" (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."chalk-2.4.2" @@ -92955,10 +93161,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.414.1"; + version = "1.415.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.414.1.tgz"; - sha512 = "e04W+CPOqFTiny0VYDk8CfMn04BOcNbKve5KjWWIz8a5Ccw80yRVdboMjh5rHRSKU+bMvECQX5Nr9wtqfvOwcQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.415.0.tgz"; + sha512 = "zpqUIizBSYTaZA1DvPf2xIOQSmutVDNxOkSM4CQkqk9xHf2W6ltq8NcxErVXUGYmsUmGfrNe0LIBaKP9lzyMbQ=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -96168,7 +96374,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.11.2" + sources."uglify-js-3.11.3" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -97026,7 +97232,7 @@ in ]; }) sources."string_decoder-0.10.31" - sources."stringify-entities-3.0.1" + sources."stringify-entities-3.1.0" sources."strip-ansi-5.2.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" @@ -97082,7 +97288,7 @@ in sources."unist-util-stringify-position-2.0.3" sources."unist-util-visit-2.0.3" sources."unist-util-visit-children-1.1.4" - sources."unist-util-visit-parents-3.1.0" + sources."unist-util-visit-parents-3.1.1" (sources."update-notifier-4.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -98449,10 +98655,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.11.2"; + version = "3.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.2.tgz"; - sha512 = "G440NU6fewtnQftSgqRV1r2A5ChKbU1gqFCJ7I8S7MPpY/eZZfLGefaY6gUZYiWebMaO+txgiQ1ZyLDuNWJulg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.3.tgz"; + sha512 = "wDRziHG94mNj2n3R864CvYw/+pc9y/RNImiTyrrf8BzgWn75JgFSwYvXrtZQMnMnOp/4UTrf3iCSQxSStPiByA=="; }; buildInputs = globalBuildInputs; meta = { @@ -100234,7 +100440,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.11.2" + sources."uglify-js-3.11.3" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -102252,7 +102458,7 @@ in sources."source-map-support-0.5.19" sources."supports-color-7.2.0" sources."tapable-2.0.0" - (sources."terser-5.3.5" // { + (sources."terser-5.3.6" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -102280,874 +102486,72 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.0.0.tgz"; - sha512 = "c5NOm8jDp3qWa+Q4pDZTcT5IwPcPXdjU1ejN9e7LojHQN02sjNr4tzLrt5pwkY+zN8pQL40m14JsbC2Dh+ZJ/w=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.1.0.tgz"; + sha512 = "NdhxXMZmoik62Y05t0h1y65LjBM7BwFPq311ihXuMM3RY6dlc4KkCTyHLzTuBEc+bqq6d3xh+CWmU0xRexNJBA=="; }; dependencies = [ - sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.1" - sources."@babel/core-7.12.3" - sources."@babel/generator-7.12.1" - sources."@babel/helper-annotate-as-pure-7.10.4" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.1" - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.1" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.10.4" - sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.10.4" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.1" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.11.0" - sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-validator-option-7.12.1" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.1" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" - sources."@babel/plugin-proposal-async-generator-functions-7.12.1" - sources."@babel/plugin-proposal-class-properties-7.12.1" - sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.1" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.1" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" - sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.1" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" - sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-syntax-typescript-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.1" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-flow-strip-types-7.12.1" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.1" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.1" - sources."@babel/plugin-transform-typescript-7.12.1" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.1" - sources."@babel/preset-flow-7.12.1" - sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.1" - sources."@babel/register-7.12.1" - sources."@babel/runtime-7.12.1" - sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.1" - sources."@babel/types-7.12.1" - sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.3" - sources."@sindresorhus/is-2.1.1" - sources."@szmarczak/http-timer-4.0.5" - sources."@types/cacheable-request-6.0.1" - sources."@types/glob-7.1.3" - sources."@types/http-cache-semantics-4.0.0" - sources."@types/keyv-3.1.1" - sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.10" - sources."@types/normalize-package-data-2.4.0" - sources."@types/responselike-1.0.0" - sources."@webpack-cli/generators-1.0.1" - sources."@webpack-cli/info-1.0.1" - sources."@webpack-cli/init-1.0.1" + sources."@webpack-cli/info-1.0.2" sources."@webpack-cli/serve-1.0.1" - (sources."@webpack-cli/utils-1.0.1" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."get-stream-5.2.0" - sources."got-10.7.0" - sources."lowercase-keys-2.0.0" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."type-fest-0.10.0" - sources."which-2.0.2" - ]; - }) - sources."@webpack-cli/webpack-scaffold-1.0.1" - sources."JSONStream-1.3.5" - sources."ajv-6.12.6" sources."ansi-colors-4.1.1" - (sources."ansi-escapes-4.3.1" // { - dependencies = [ - sources."type-fest-0.11.0" - ]; - }) - sources."ansi-regex-5.0.0" + sources."ansi-escapes-4.3.1" sources."ansi-styles-3.2.1" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" sources."array-back-4.0.1" - sources."array-differ-3.0.0" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."arrify-2.0.1" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."assign-symbols-1.0.0" - sources."ast-types-0.13.3" - sources."async-2.6.3" - sources."asynckit-0.4.0" - sources."atob-2.1.2" - sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" - (sources."axios-0.18.1" // { - dependencies = [ - sources."is-buffer-2.0.4" - ]; - }) - sources."babel-core-7.0.0-bridge.0" - sources."babel-plugin-dynamic-import-node-2.3.3" - sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."bcrypt-pbkdf-1.0.2" - sources."binaryextensions-2.3.0" - sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."browserslist-4.14.5" - sources."buffer-from-1.1.1" - sources."cache-base-1.0.1" - sources."cacheable-lookup-2.0.1" - (sources."cacheable-request-7.0.1" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."call-me-maybe-1.0.1" - sources."caniuse-lite-1.0.30001148" - sources."capture-stack-trace-1.0.1" - sources."caseless-0.12.0" sources."chalk-2.4.2" - sources."chardet-0.7.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-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-cursor-3.1.0" - (sources."cli-table-0.3.1" // { - dependencies = [ - sources."colors-1.0.3" - ]; - }) - sources."cli-width-3.0.0" - sources."clone-2.1.2" - sources."clone-buffer-1.0.0" - sources."clone-deep-4.0.1" - (sources."clone-response-1.0.2" // { - dependencies = [ - sources."mimic-response-1.0.1" - ]; - }) - sources."clone-stats-1.0.0" - sources."cloneable-readable-1.1.3" - sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colorette-1.2.1" - sources."colors-1.4.0" - sources."combined-stream-1.0.8" sources."command-line-usage-6.1.0" sources."commander-6.1.0" - sources."commondir-1.0.1" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - sources."convert-source-map-1.7.0" - sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.6.5" // { - dependencies = [ - sources."semver-7.0.0" - ]; - }) - sources."core-util-is-1.0.2" - sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.5" - sources."dargs-6.1.0" - sources."dashdash-1.14.1" - sources."dateformat-3.0.3" - sources."debug-4.3.0" - sources."decode-uri-component-0.2.0" - sources."decompress-response-5.0.0" + sources."cross-spawn-7.0.3" sources."deep-extend-0.6.0" - sources."defer-to-connect-2.0.0" - sources."define-properties-1.1.3" - sources."define-property-2.0.2" - sources."delayed-stream-1.0.0" - sources."detect-file-1.0.0" - sources."diff-4.0.2" - sources."dir-glob-2.2.2" - sources."download-stats-0.3.4" - sources."duplexer3-0.1.4" - sources."ecc-jsbn-0.1.2" - (sources."editions-2.3.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."ejs-3.1.5" - sources."electron-to-chromium-1.3.582" - sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."envinfo-7.7.3" - sources."errlop-2.2.0" - sources."error-7.2.1" - sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."esutils-2.0.3" - (sources."execa-4.0.3" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."get-stream-5.2.0" - sources."is-stream-2.0.0" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.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-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-tilde-2.0.2" - sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."external-editor-3.1.0" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-glob-2.2.7" - sources."fast-json-stable-stringify-2.1.0" - sources."figures-3.2.0" - sources."filelist-1.0.1" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" - (sources."findup-sync-4.0.0" // { - dependencies = [ - sources."braces-3.0.2" - sources."fill-range-7.0.1" - sources."is-number-7.0.0" - sources."micromatch-4.0.2" - sources."to-regex-range-5.0.1" - ]; - }) - sources."first-chunk-stream-2.0.0" - sources."flow-parser-0.136.0" - (sources."follow-redirects-1.5.10" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) - sources."for-in-1.0.2" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fragment-cache-0.2.1" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."gensync-1.0.0-beta.1" - sources."get-stream-3.0.0" - sources."get-value-2.0.6" - sources."getpass-0.1.7" - sources."gh-got-5.0.0" - sources."github-username-3.0.0" - sources."glob-7.1.6" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."glob-to-regexp-0.3.0" - (sources."global-modules-2.0.0" // { - dependencies = [ - sources."global-prefix-3.0.0" - ]; - }) - sources."global-prefix-1.0.2" - sources."globals-11.12.0" - sources."globby-9.2.0" - sources."got-6.7.1" - sources."graceful-fs-4.2.4" - sources."grouped-queue-1.1.0" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-1.0.3" + sources."execa-4.0.3" + sources."find-up-4.1.0" + sources."get-stream-5.2.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."homedir-polyfill-1.0.3" - sources."hosted-git-info-2.8.8" - sources."http-cache-semantics-4.1.0" - sources."http-signature-1.2.0" sources."human-signals-1.1.1" - sources."iconv-lite-0.4.24" - sources."ignore-4.0.6" - (sources."import-local-3.0.2" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-locate-4.1.0" - sources."path-exists-4.0.0" - sources."pkg-dir-4.2.0" - ]; - }) - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.5" - (sources."inquirer-7.3.3" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."strip-ansi-6.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."import-local-3.0.2" sources."interpret-2.2.0" - sources."is-accessor-descriptor-1.0.0" - sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" - sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.1" - sources."is-negative-zero-2.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" - sources."is-redirect-1.0.0" - sources."is-regex-1.1.1" - sources."is-retry-allowed-1.2.0" - sources."is-scoped-1.0.0" - sources."is-stream-1.1.0" - sources."is-symbol-1.0.3" - sources."is-typedarray-1.0.0" - sources."is-utf8-0.2.1" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."isbinaryfile-4.0.6" + sources."is-stream-2.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."isstream-0.1.2" - sources."istextorbinary-2.6.0" - (sources."jake-10.8.2" // { - dependencies = [ - sources."async-0.9.2" - ]; - }) - sources."js-tokens-4.0.0" - sources."jsbn-0.1.1" - sources."jscodeshift-0.7.1" - sources."jsesc-2.5.2" - sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."json5-2.1.3" - sources."jsonparse-1.3.1" - sources."jsprim-1.4.1" - sources."keyv-4.0.3" - sources."kind-of-6.0.3" - sources."lazy-cache-2.0.2" - sources."lines-and-columns-1.1.6" - sources."locate-path-3.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.20" - (sources."log-symbols-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."lowercase-keys-1.0.1" - sources."make-dir-2.1.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."mem-fs-1.2.0" - (sources."mem-fs-editor-7.0.1" // { - dependencies = [ - sources."rimraf-3.0.2" - ]; - }) sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."micromatch-3.1.10" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" - sources."mimic-response-2.1.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-1.0.4" - sources."moment-2.29.1" - sources."ms-2.1.2" - (sources."multimatch-4.0.0" // { - dependencies = [ - sources."array-union-2.1.0" - ]; - }) - sources."mute-stream-0.0.8" - sources."nanomatch-1.2.13" - sources."neo-async-2.6.2" - sources."nice-try-1.0.5" - sources."node-dir-0.1.17" - sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.63" - sources."normalize-package-data-2.5.0" - sources."normalize-url-4.5.0" - sources."npm-api-1.0.0" - (sources."npm-run-path-4.0.1" // { - dependencies = [ - sources."path-key-3.1.1" - ]; - }) - sources."oauth-sign-0.9.0" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.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-inspect-1.8.0" - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.1" - sources."object.pick-1.3.0" + sources."npm-run-path-4.0.1" sources."once-1.4.0" sources."onetime-5.1.2" - sources."os-tmpdir-1.0.2" - sources."p-cancelable-2.0.0" - sources."p-each-series-2.1.0" - sources."p-event-4.2.0" - sources."p-finally-1.0.0" sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-timeout-3.2.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."paged-request-2.0.1" - sources."parse-json-5.1.0" - sources."parse-passwd-1.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-key-2.0.1" + sources."path-exists-4.0.0" + sources."path-key-3.1.1" sources."path-parse-1.0.6" - (sources."path-type-3.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."performance-now-2.1.0" - sources."picomatch-2.2.2" - sources."pify-4.0.1" - sources."pirates-4.0.1" - sources."pkg-dir-3.0.0" - sources."posix-character-classes-0.1.1" - sources."prepend-http-1.0.4" - sources."pretty-bytes-5.4.1" - sources."prettyjson-1.2.1" - sources."private-0.1.8" - sources."process-nextick-args-2.0.1" - sources."psl-1.8.0" + sources."pkg-dir-4.2.0" sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" - sources."read-chunk-3.2.0" - sources."read-pkg-5.2.0" - sources."read-pkg-up-5.0.0" - sources."readable-stream-2.3.7" - (sources."recast-0.18.10" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) sources."rechoir-0.7.0" sources."reduce-flatten-2.0.0" - sources."regenerate-1.4.1" - sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.7" - sources."regenerator-transform-0.14.5" - sources."regex-not-1.0.2" - sources."regexpu-core-4.7.1" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.4" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" - sources."replace-ext-1.0.1" - sources."request-2.88.2" sources."resolve-1.17.0" sources."resolve-cwd-3.0.0" - (sources."resolve-dir-1.0.1" // { - dependencies = [ - sources."global-modules-1.0.0" - ]; - }) sources."resolve-from-5.0.0" - sources."resolve-url-0.2.1" - (sources."responselike-2.0.0" // { - dependencies = [ - sources."lowercase-keys-2.0.0" - ]; - }) - sources."restore-cursor-3.1.0" - sources."ret-0.1.15" - sources."rimraf-2.6.3" - sources."run-async-2.4.1" - sources."rxjs-6.6.3" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."safer-buffer-2.1.2" - sources."scoped-regex-1.0.0" - sources."semver-5.7.1" - sources."set-getter-0.1.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."shallow-clone-3.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - (sources."shelljs-0.8.4" // { - dependencies = [ - sources."interpret-1.4.0" - sources."rechoir-0.6.2" - ]; - }) + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" - sources."slash-2.0.0" - (sources."snapdragon-0.8.2" // { - 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-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."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.19" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."source-map-url-0.4.0" - sources."spdx-correct-3.1.1" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" - sources."split-string-3.1.0" - sources."sshpk-1.16.1" - (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-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."string-template-0.2.1" - (sources."string-width-4.2.0" // { - dependencies = [ - sources."strip-ansi-6.0.0" - ]; - }) - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - sources."string_decoder-1.1.1" - (sources."strip-ansi-4.0.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - ]; - }) - sources."strip-bom-2.0.0" - sources."strip-bom-buf-1.0.0" - sources."strip-bom-stream-2.0.0" sources."strip-final-newline-2.0.0" sources."supports-color-5.5.0" sources."table-layout-1.0.1" - sources."temp-0.8.4" - sources."text-table-0.2.0" - sources."textextensions-2.6.0" - sources."through-2.3.8" - sources."through2-3.0.2" - sources."timed-out-4.0.1" - sources."tmp-0.0.33" - sources."to-fast-properties-2.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-readable-stream-2.1.0" - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - sources."tough-cookie-2.5.0" - sources."tslib-1.14.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-fest-0.6.0" + sources."type-fest-0.11.0" sources."typical-5.2.0" - sources."unicode-canonical-property-names-ecmascript-1.0.4" - sources."unicode-match-property-ecmascript-1.0.4" - sources."unicode-match-property-value-ecmascript-1.2.0" - sources."unicode-property-aliases-ecmascript-1.1.0" - sources."union-value-1.0.1" - (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."uri-js-4.4.0" - sources."urix-0.1.0" - sources."url-parse-lax-1.0.0" - sources."use-3.1.1" - sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" sources."v8-compile-cache-2.1.1" - sources."validate-npm-package-license-3.0.4" - sources."verror-1.10.0" - sources."vinyl-2.2.1" - (sources."vinyl-file-3.0.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) sources."webpack-merge-4.2.2" - sources."which-1.3.1" - sources."with-open-file-0.1.7" + sources."which-2.0.2" sources."wordwrapjs-4.0.0" sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" - (sources."yeoman-environment-2.10.3" // { - dependencies = [ - sources."arrify-1.0.1" - sources."debug-3.2.6" - sources."diff-3.5.0" - sources."dir-glob-2.0.0" - sources."ejs-2.7.4" - sources."globby-8.0.2" - sources."ignore-3.3.10" - sources."log-symbols-2.2.0" - (sources."mem-fs-editor-6.0.0" // { - dependencies = [ - sources."dir-glob-2.2.2" - sources."globby-9.2.0" - sources."ignore-4.0.6" - sources."pify-4.0.1" - sources."slash-2.0.0" - ]; - }) - sources."mkdirp-0.5.5" - sources."pify-3.0.0" - sources."semver-7.3.2" - sources."slash-1.0.0" - ]; - }) - (sources."yeoman-generator-4.12.0" // { - dependencies = [ - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."semver-7.3.2" - ]; - }) ]; buildInputs = globalBuildInputs; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix index 7cc455b019..863bd21c90 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix @@ -1,11 +1,15 @@ { buildDunePackage, sqlexpr, ounit -, ppx_core, ppx_tools_versioned, re, lwt_ppx +, ppxlib, ppx_tools_versioned, re, lwt_ppx }: buildDunePackage { pname = "ppx_sqlexpr"; inherit (sqlexpr) version src meta; - buildInputs = [ sqlexpr ounit ppx_core ppx_tools_versioned re lwt_ppx ]; + postPatch = '' + substituteInPlace src/ppx/jbuild --replace ppx_core ppxlib + ''; + + buildInputs = [ sqlexpr ounit ppxlib ppx_tools_versioned re lwt_ppx ]; doCheck = true; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix index b704fd7453..bef31d1c1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix @@ -4,30 +4,31 @@ , isPy27 , ansible , pyyaml -, six -, nose , setuptools_scm , ruamel_yaml -, pathlib2 +, rich +, pytestCheckHook +, pytestcov +, pytest_xdist +, git }: buildPythonPackage rec { pname = "ansible-lint"; - version = "4.2.0"; + version = "4.3.5"; # pip is not able to import version info on raumel.yaml disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "eb925d8682d70563ccb80e2aca7b3edf84fb0b768cea3edc6846aac7abdc414a"; + sha256 = "0mjn0drw3cx4pfl9qll5j7wib5r8msihs5yl8ri9fkfcbz7k1hmy"; }; format = "pyproject"; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ pyyaml six ansible ruamel_yaml ] - ++ lib.optionals isPy27 [ pathlib2 ]; - checkInputs = [ nose ]; + propagatedBuildInputs = [ pyyaml ansible ruamel_yaml rich ]; + checkInputs = [ pytestCheckHook pytestcov pytest_xdist git ]; postPatch = '' patchShebangs bin/ansible-lint @@ -42,11 +43,11 @@ buildPythonPackage rec { ''; checkPhase = '' - PATH=$out/bin:$PATH nosetests test + pytest -k 'not test_run_playbook_github and not test_run_single_role_path_no_trailing_slash_script' ''; meta = with lib; { - homepage = "https://github.com/willthames/ansible-lint"; + homepage = "https://github.com/ansible/ansible-lint"; description = "Best practices checker for Ansible"; license = licenses.mit; maintainers = [ maintainers.sengaya ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix index 11777dbf9e..d346511019 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ let py = python; in buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.21"; + version = "8.0.22"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "0ky7rn9259807gji3fhvkmdmrgyaps431l9l9y6gh66i84kw1b3l"; + sha256 = "084q8x86ywgxgpsgdid8y9rjjys06146dqinfpmlggjswbq9kl0d"; }; propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix new file mode 100644 index 0000000000..4deee467f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix @@ -0,0 +1,26 @@ +{ aiohttp, async-timeout, buildPythonPackage, fetchPypi, isPy3k, lib }: + +buildPythonPackage rec { + pname = "pyaftership"; + version = "0.1.2"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "057dwzacc0lmsq00ipfbnxkq4rc2by8glmza6s8i6dzi1cc68v98"; + }; + + propagatedBuildInputs = [ aiohttp async-timeout ]; + + # No tests + doCheck = false; + pythonImportsCheck = [ "pyaftership.tracker" ]; + + meta = with lib; { + description = "Python wrapper package for the AfterShip API"; + homepage = "https://github.com/ludeeus/pyaftership"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix index 68549e5cab..adec3bd07b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -18,12 +18,11 @@ buildPythonPackage rec { pname = "pyatv"; - version = "v0.7.4"; - + version = "0.7.4"; src = fetchFromGitHub { owner = "postlund"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "17gsamn4aibsx4w50r9dwr5kr9anc7dd0f0dvmdl717rkgh13zyi"; }; @@ -37,7 +36,6 @@ buildPythonPackage rec { cryptography netifaces zeroconf - pytestCheckHook ]; checkInputs = [ @@ -45,6 +43,7 @@ buildPythonPackage rec { pytest pytest-aiohttp pytest-asyncio + pytestCheckHook ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix index ea08d7f902..6f18a47e13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix @@ -2,11 +2,13 @@ , buildPythonPackage , fetchPypi , markdown +, isPy27 }: buildPythonPackage rec { pname = "python-markdown-math"; version = "0.7"; + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index fe7b834e8e..284a44c971 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "123ndg7byrflczxzhk2c48bb8wlwgqzf1m0dzi0mnw3h52qiqjyp"; + sha256 = "1zy6v1srm5v6bg2rqb3hb4cz8g7zwhraf91y810y9csh6r4fv29b"; }; - vendorSha256 = "1prf1hffvwl2hdkrr8hqz1wwcz2n9dzhf68ziz5k3fzsx30jki9l"; + vendorSha256 = "0s367ikq6y1izjim72lnqc98vypl072nimcwnw9y9d7nld5y77c8"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 0bfc9071d7..0b5a7362de 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -48,9 +48,10 @@ let srcs.bazel_skylib srcs.io_bazel_rules_sass srcs.platforms - (if stdenv.hostPlatform.isDarwin - then srcs."java_tools_javac11_darwin-v8.0.zip" - else srcs."java_tools_javac11_linux-v8.0.zip") + # `bazel query` wants all of these to be available regardless of platform. + srcs."java_tools_javac11_darwin-v8.0.zip" + srcs."java_tools_javac11_linux-v8.0.zip" + srcs."java_tools_javac11_windows-v8.0.zip" srcs."coverage_output_generator-v2.1.zip" srcs.build_bazel_rules_nodejs srcs."android_tools_pkg-0.19.0rc1.tar.gz" @@ -131,10 +132,21 @@ let bazelRC = writeTextFile { name = "bazel-rc"; text = '' - build --override_repository=${remote_java_tools.name}=${remote_java_tools} - build --distdir=${distDir} startup --server_javabase=${runJdk} + # Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054 + # Most commands inherit from 'build' anyway. + build --distdir=${distDir} + fetch --distdir=${distDir} + query --distdir=${distDir} + + build --override_repository=${remote_java_tools.name}=${remote_java_tools} + fetch --override_repository=${remote_java_tools.name}=${remote_java_tools} + query --override_repository=${remote_java_tools.name}=${remote_java_tools} + + # Provide a default java toolchain, this will be the same as ${runJdk} + build --host_javabase='@local_jdk//:jdk' + # load default location for the system wide configuration try-import /etc/bazel.bazelrc ''; @@ -534,7 +546,7 @@ stdenv.mkDerivation rec { export TEST_TMPDIR=$(pwd) hello_test () { - $out/bin/bazel test --distdir=${distDir} \ + $out/bin/bazel test \ --test_output=errors \ --java_toolchain='${javaToolchain}' \ examples/cpp:hello-success_test \ diff --git a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix index a4107ad110..65c3a19489 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.23.2"; + version = "0.23.6"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G/oAKIG0TSEjaVi6vN2wg/apOztGLiqqYLfZy6Tmmgc="; + sha256 = "0afs3h8npbzmcrzm6kzfdva5id3zyifhhsh7zgyrxkmw60qhl498"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix index 750b651651..6c85a52380 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "1s5wb5m0d77qi90pyxld98ap37xnxrz3sz5gazq0pp5i9c9xa124"; + sha256 = "1ccwa44hpmpd57ff6w02rvrs63wxwmgls2i1rn285rxypmbysrp0"; }; - cargoSha256 = "10dzvzjqib751h2p1pl0z3dy2d17xwrcp9vyfrfr185yximcw2wx"; + cargoSha256 = "1sffivpgrn4my57pcrg46b2yg6fmhxj61d2sqvg60fjljrg595zn"; nativeBuildInputs = [ perl pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 77a0328fc3..2e6db32966 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-10-12"; + rev = "2020-10-19"; version = "unstable-${rev}"; - sha256 = "194xax87pwdh3p8zx46igvqwznlpnl4jp8lj987616gyldfgall0"; - cargoSha256 = "1rvf3a2fpqpf4q52pi676qzq7h0xfqlcbp15sc5vqc8nbbs7c7vw"; + sha256 = "1xvyk1d26zn1d9i42h78qsm6bg57nhn1rgr46jwa46gsb31nabjh"; + cargoSha256 = "18s5yrc9fdj2ndylwyf07l0kmwxka7mnbj254xmq3g7ragw71xjw"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/downgrade-smol_str.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/downgrade-smol_str.patch deleted file mode 100644 index c3ceb09633..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/downgrade-smol_str.patch +++ /dev/null @@ -1,82 +0,0 @@ -This patch revert 875ad9b5c410200f5072515ae91b4ff51cff0448 (Bump smol_str from 0.1.16 to 0.1.17 ). - -diff --git a/Cargo.lock b/Cargo.lock -index 477af57aa..8b9055879 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1470,9 +1470,9 @@ checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" - - [[package]] - name = "smol_str" --version = "0.1.17" -+version = "0.1.16" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6ca0f7ce3a29234210f0f4f0b56f8be2e722488b95cb522077943212da3b32eb" -+checksum = "2f7909a1d8bc166a862124d84fdc11bda0ea4ed3157ccca662296919c2972db1" - dependencies = [ - "serde", - ] -diff --git a/crates/hir_expand/src/name.rs b/crates/hir_expand/src/name.rs -index a5750d829..49841c7a1 100644 ---- a/crates/hir_expand/src/name.rs -+++ b/crates/hir_expand/src/name.rs -@@ -43,8 +43,8 @@ impl Name { - } - - /// Shortcut to create inline plain text name -- const fn new_inline(text: &str) -> Name { -- Name::new_text(SmolStr::new_inline(text)) -+ const fn new_inline_ascii(text: &[u8]) -> Name { -+ Name::new_text(SmolStr::new_inline_from_ascii(text.len(), text)) - } - - /// Resolve a name from the text of token. -@@ -127,7 +127,7 @@ pub mod known { - $( - #[allow(bad_style)] - pub const $ident: super::Name = -- super::Name::new_inline(stringify!($ident)); -+ super::Name::new_inline_ascii(stringify!($ident).as_bytes()); - )* - }; - } -@@ -210,8 +210,8 @@ pub mod known { - ); - - // self/Self cannot be used as an identifier -- pub const SELF_PARAM: super::Name = super::Name::new_inline("self"); -- pub const SELF_TYPE: super::Name = super::Name::new_inline("Self"); -+ pub const SELF_PARAM: super::Name = super::Name::new_inline_ascii(b"self"); -+ pub const SELF_TYPE: super::Name = super::Name::new_inline_ascii(b"Self"); - - #[macro_export] - macro_rules! name { -diff --git a/crates/hir_ty/src/infer.rs b/crates/hir_ty/src/infer.rs -index 9a7785c76..2b53b8297 100644 ---- a/crates/hir_ty/src/infer.rs -+++ b/crates/hir_ty/src/infer.rs -@@ -555,7 +555,7 @@ impl<'a> InferenceContext<'a> { - - fn resolve_lang_item(&self, name: &str) -> Option { - let krate = self.resolver.krate()?; -- let name = SmolStr::new_inline(name); -+ let name = SmolStr::new_inline_from_ascii(name.len(), name.as_bytes()); - self.db.lang_item(krate, name) - } - -diff --git a/crates/mbe/src/syntax_bridge.rs b/crates/mbe/src/syntax_bridge.rs -index d987b2500..a8ad917fb 100644 ---- a/crates/mbe/src/syntax_bridge.rs -+++ b/crates/mbe/src/syntax_bridge.rs -@@ -636,10 +636,7 @@ impl<'a> TreeSink for TtTreeSink<'a> { - let (text, id) = match leaf { - tt::Leaf::Ident(ident) => (ident.text.clone(), ident.id), - tt::Leaf::Punct(punct) => { -- assert!(punct.char.is_ascii()); -- let char = &(punct.char as u8); -- let text = std::str::from_utf8(std::slice::from_ref(char)).unwrap(); -- (SmolStr::new_inline(text), punct.id) -+ (SmolStr::new_inline_from_ascii(1, &[punct.char as u8]), punct.id) - } - tt::Leaf::Literal(lit) => (lit.text.clone(), lit.id), - }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix index b25f74b90f..ca72f91953 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -16,16 +16,9 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; - # FIXME: Temporary fixes for our rust 1.45.0 - cargoPatches = [ - ./downgrade-smol_str.patch # Requires rustc 1.46.0 - ]; - + # FIXME: Temporary fixes for our rust 1.46.0 patches = [ - ./no-track_env_var.patch # Requires rustc 1.47.0 - ./no-match-unsizing-in-const-fn.patch # Requires rustc 1.46.0 - ./no-loop-in-const-fn.patch # Requires rustc 1.46.0 - ./no-option-zip.patch # Requires rustc 1.46.0 + ./no-track_env_var.patch # Requires rustc 1.47.0 ]; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch deleted file mode 100644 index e750b3c4e1..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch +++ /dev/null @@ -1,223 +0,0 @@ -This patch revert 4b989009e3839cfc6f021d1552a46561cee6cde2 (CONST LOOPS ARE HERE). - -diff --git a/crates/parser/src/grammar/expressions.rs b/crates/parser/src/grammar/expressions.rs -index 5f885edfd..e72929f8c 100644 ---- a/crates/parser/src/grammar/expressions.rs -+++ b/crates/parser/src/grammar/expressions.rs -@@ -316,7 +316,7 @@ fn expr_bp(p: &mut Parser, mut r: Restrictions, bp: u8) -> (Option Option<(CompletedMarker, BlockLike)> { - let m; -diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs -index 66a92a4e1..ba6dd2fbc 100644 ---- a/crates/parser/src/grammar/expressions/atom.rs -+++ b/crates/parser/src/grammar/expressions/atom.rs -@@ -15,7 +15,7 @@ use super::*; - // let _ = b"e"; - // let _ = br"f"; - // } --pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[ -+pub(crate) const LITERAL_FIRST: TokenSet = token_set![ - TRUE_KW, - FALSE_KW, - INT_NUMBER, -@@ -25,8 +25,8 @@ pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[ - STRING, - RAW_STRING, - BYTE_STRING, -- RAW_BYTE_STRING, --]); -+ RAW_BYTE_STRING -+]; - - pub(crate) fn literal(p: &mut Parser) -> Option { - if !p.at_ts(LITERAL_FIRST) { -@@ -39,7 +39,7 @@ pub(crate) fn literal(p: &mut Parser) -> Option { - - // E.g. for after the break in `if break {}`, this should not match - pub(super) const ATOM_EXPR_FIRST: TokenSet = -- LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[ -+ LITERAL_FIRST.union(paths::PATH_FIRST).union(token_set![ - T!['('], - T!['{'], - T!['['], -@@ -59,9 +59,9 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet = - T![loop], - T![for], - LIFETIME, -- ])); -+ ]); - --const EXPR_RECOVERY_SET: TokenSet = TokenSet::new(&[LET_KW, R_DOLLAR]); -+const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW, R_DOLLAR]; - - pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> { - if let Some(m) = literal(p) { -diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs -index 22810e6fb..8fd8f3b80 100644 ---- a/crates/parser/src/grammar/items.rs -+++ b/crates/parser/src/grammar/items.rs -@@ -26,7 +26,7 @@ pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) { - } - } - --pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[ -+pub(super) const ITEM_RECOVERY_SET: TokenSet = token_set![ - FN_KW, - STRUCT_KW, - ENUM_KW, -@@ -41,7 +41,7 @@ pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[ - USE_KW, - MACRO_KW, - T![;], --]); -+]; - - pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool) { - let m = p.start(); -diff --git a/crates/parser/src/grammar/paths.rs b/crates/parser/src/grammar/paths.rs -index 5d297e2d6..52562afa4 100644 ---- a/crates/parser/src/grammar/paths.rs -+++ b/crates/parser/src/grammar/paths.rs -@@ -3,7 +3,7 @@ - use super::*; - - pub(super) const PATH_FIRST: TokenSet = -- TokenSet::new(&[IDENT, T![self], T![super], T![crate], T![:], T![<]]); -+ token_set![IDENT, T![self], T![super], T![crate], T![:], T![<]]; - - pub(super) fn is_path_start(p: &Parser) -> bool { - is_use_path_start(p) || p.at(T![<]) -diff --git a/crates/parser/src/grammar/patterns.rs b/crates/parser/src/grammar/patterns.rs -index 796f206e1..07b1d6dd5 100644 ---- a/crates/parser/src/grammar/patterns.rs -+++ b/crates/parser/src/grammar/patterns.rs -@@ -2,18 +2,9 @@ - - use super::*; - --pub(super) const PATTERN_FIRST: TokenSet = -- expressions::LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[ -- T![box], -- T![ref], -- T![mut], -- T!['('], -- T!['['], -- T![&], -- T![_], -- T![-], -- T![.], -- ])); -+pub(super) const PATTERN_FIRST: TokenSet = expressions::LITERAL_FIRST -+ .union(paths::PATH_FIRST) -+ .union(token_set![T![box], T![ref], T![mut], T!['('], T!['['], T![&], T![_], T![-], T![.]]); - - pub(crate) fn pattern(p: &mut Parser) { - pattern_r(p, PAT_RECOVERY_SET); -@@ -83,7 +74,7 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) { - } - - const PAT_RECOVERY_SET: TokenSet = -- TokenSet::new(&[LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]); -+ token_set![LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]; - - fn atom_pat(p: &mut Parser, recovery_set: TokenSet) -> Option { - let m = match p.nth(0) { -diff --git a/crates/parser/src/grammar/types.rs b/crates/parser/src/grammar/types.rs -index 1ea130ac5..9d00eb9b9 100644 ---- a/crates/parser/src/grammar/types.rs -+++ b/crates/parser/src/grammar/types.rs -@@ -2,7 +2,7 @@ - - use super::*; - --pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[ -+pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(token_set![ - T!['('], - T!['['], - T![<], -@@ -16,16 +16,16 @@ pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[ - T![for], - T![impl], - T![dyn], --])); -+]); - --const TYPE_RECOVERY_SET: TokenSet = TokenSet::new(&[ -+const TYPE_RECOVERY_SET: TokenSet = token_set![ - T![')'], - T![,], - L_DOLLAR, - // test_err struct_field_recover - // struct S { f pub g: () } - T![pub], --]); -+]; - - pub(crate) fn type_(p: &mut Parser) { - type_with_bounds_cond(p, true); -diff --git a/crates/parser/src/token_set.rs b/crates/parser/src/token_set.rs -index a68f0144e..994017acf 100644 ---- a/crates/parser/src/token_set.rs -+++ b/crates/parser/src/token_set.rs -@@ -9,21 +9,15 @@ pub(crate) struct TokenSet(u128); - impl TokenSet { - pub(crate) const EMPTY: TokenSet = TokenSet(0); - -- pub(crate) const fn new(kinds: &[SyntaxKind]) -> TokenSet { -- let mut res = 0u128; -- let mut i = 0; -- while i < kinds.len() { -- res |= mask(kinds[i]); -- i += 1 -- } -- TokenSet(res) -+ pub(crate) const fn singleton(kind: SyntaxKind) -> TokenSet { -+ TokenSet(mask(kind)) - } - - pub(crate) const fn union(self, other: TokenSet) -> TokenSet { - TokenSet(self.0 | other.0) - } - -- pub(crate) const fn contains(&self, kind: SyntaxKind) -> bool { -+ pub(crate) fn contains(&self, kind: SyntaxKind) -> bool { - self.0 & mask(kind) != 0 - } - } -@@ -32,10 +26,16 @@ const fn mask(kind: SyntaxKind) -> u128 { - 1u128 << (kind as usize) - } - -+#[macro_export] -+macro_rules! token_set { -+ ($($t:expr),*) => { TokenSet::EMPTY$(.union(TokenSet::singleton($t)))* }; -+ ($($t:expr),* ,) => { token_set!($($t),*) }; -+} -+ - #[test] - fn token_set_works_for_tokens() { - use crate::SyntaxKind::*; -- let ts = TokenSet::new(&[EOF, SHEBANG]); -+ let ts = token_set![EOF, SHEBANG]; - assert!(ts.contains(EOF)); - assert!(ts.contains(SHEBANG)); - assert!(!ts.contains(PLUS)); -diff --git a/xtask/src/install.rs b/xtask/src/install.rs -index d829790d7..b25a6e301 100644 ---- a/xtask/src/install.rs -+++ b/xtask/src/install.rs -@@ -7,7 +7,7 @@ use anyhow::{bail, format_err, Context, Result}; - use crate::not_bash::{pushd, run}; - - // Latest stable, feel free to send a PR if this lags behind. --const REQUIRED_RUST_VERSION: u32 = 46; -+const REQUIRED_RUST_VERSION: u32 = 43; - - pub struct InstallCmd { - pub client: Option, diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-match-unsizing-in-const-fn.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-match-unsizing-in-const-fn.patch deleted file mode 100644 index 3bdd4c8a72..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-match-unsizing-in-const-fn.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/crates/assists/src/handlers/convert_integer_literal.rs b/crates/assists/src/handlers/convert_integer_literal.rs -index ea35e833a..4df80a3c0 100644 ---- a/crates/assists/src/handlers/convert_integer_literal.rs -+++ b/crates/assists/src/handlers/convert_integer_literal.rs -@@ -105,7 +105,7 @@ impl IntegerLiteralBase { - } - } - -- const fn base(&self) -> u32 { -+ fn base(&self) -> u32 { - match self { - Self::Binary => 2, - Self::Octal => 8, -@@ -114,14 +114,14 @@ impl IntegerLiteralBase { - } - } - -- const fn prefix_len(&self) -> usize { -+ fn prefix_len(&self) -> usize { - match self { - Self::Decimal => 0, - _ => 2, - } - } - -- const fn bases() -> &'static [IntegerLiteralBase] { -+ fn bases() -> &'static [IntegerLiteralBase] { - &[ - IntegerLiteralBase::Binary, - IntegerLiteralBase::Octal, diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch deleted file mode 100644 index 5b1089ba9b..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/assists/src/handlers/merge_imports.rs -index fe33cee53..2184a4154 100644 ---- a/crates/assists/src/handlers/merge_imports.rs -+++ b/crates/assists/src/handlers/merge_imports.rs -@@ -32,7 +32,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() - if let Some(use_item) = tree.syntax().parent().and_then(ast::Use::cast) { - let (merged, to_delete) = - next_prev().filter_map(|dir| neighbor(&use_item, dir)).find_map(|use_item2| { -- try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full).zip(Some(use_item2)) -+ Some((try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full)?, use_item2)) - })?; - - rewriter.replace_ast(&use_item, &merged); -@@ -44,7 +44,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() - } else { - let (merged, to_delete) = - next_prev().filter_map(|dir| neighbor(&tree, dir)).find_map(|use_tree| { -- try_merge_trees(&tree, &use_tree, MergeBehaviour::Full).zip(Some(use_tree)) -+ Some((try_merge_trees(&tree, &use_tree, MergeBehaviour::Full)?, use_tree)) - })?; - - rewriter.replace_ast(&tree, &merged); -diff --git a/crates/assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs -index f6025c99a..f9bd31cf3 100644 ---- a/crates/assists/src/utils/insert_use.rs -+++ b/crates/assists/src/utils/insert_use.rs -@@ -274,7 +274,7 @@ fn common_prefix(lhs: &ast::Path, rhs: &ast::Path) -> Option<(ast::Path, ast::Pa - } - res = Some((lhs_curr.clone(), rhs_curr.clone())); - -- match lhs_curr.parent_path().zip(rhs_curr.parent_path()) { -+ match zip(lhs_curr.parent_path(), rhs_curr.parent_path()) { - Some((lhs, rhs)) => { - lhs_curr = lhs; - rhs_curr = rhs; -@@ -452,7 +452,7 @@ fn find_insert_position( - let path_node_iter = scope - .as_syntax_node() - .children() -- .filter_map(|node| ast::Use::cast(node.clone()).zip(Some(node))) -+ .filter_map(|node| Some((ast::Use::cast(node.clone())?, node))) - .flat_map(|(use_, node)| { - let tree = use_.use_tree()?; - let path = tree.path()?; -@@ -989,3 +989,7 @@ use foo::bar::baz::Qux;", - assert_eq!(result.map(|u| u.to_string()), None); - } - } -+ -+fn zip(x: Option, y: Option) -> Option<(T, U)> { -+ Some((x?, y?)) -+} diff --git a/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix b/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix index 114aa6ab12..edf8b853c3 100644 --- a/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix +++ b/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.0.14"; + version = "0.20.1"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = version; - sha256 = "05r88qi8mmbj07wxcpb3fhbl40qscbq1aqb0mnj9bpmi9gf5zll5"; + sha256 = "0kdrhdvh9gxq1zinh5w852f5fjls9902pcrkhkhm2c0vvq7jfass"; }; propagatedBuildInputs = [ requests ]; @@ -27,4 +27,3 @@ buildPythonApplication rec { maintainers = with maintainers; [ wchresta ]; }; } - diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix index 040ac00085..0fdf7ecf96 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.17"; + version = "1.1.23"; src = fetchurl { # To find new versions, visit @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/11/79/08/18185180910529f498f629f5fc08d3d479cdf5c3/epson-inkjet-printer-escpr2-1.1.17-1lsb3.2.src.rpm" - "https://web.archive.org/web/20200726093746if_/https://download3.ebz.epson.net/dsc/f/03/00/11/79/08/18185180910529f498f629f5fc08d3d479cdf5c3/epson-inkjet-printer-escpr2-1.1.17-1lsb3.2.src.rpm" + "https://download3.ebz.epson.net/dsc/f/03/00/12/04/34/22448566e405c21c3f4436dfd8927176add3e680/epson-inkjet-printer-escpr2-1.1.23-1lsb3.2.src.rpm" + "https://web.archive.org/web/20201019154323if_/https://download3.ebz.epson.net/dsc/f/03/00/12/04/34/22448566e405c21c3f4436dfd8927176add3e680/epson-inkjet-printer-escpr2-1.1.23-1lsb3.2.src.rpm" ]; - sha256 = "0bqqc04z9gayas5p7410la5nad7waykqyw1z1imcqimfl4qrz1m6"; + sha256 = "1d5zd8cwgp3n25ramdqwqb770iim7kh4l7hmhf6a6ivpy0cxpwx6"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/BACKPORT-Linux-5.8-compat-__vmalloc.patch b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/BACKPORT-Linux-5.8-compat-__vmalloc.patch deleted file mode 100644 index 780ce83d84..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/BACKPORT-Linux-5.8-compat-__vmalloc.patch +++ /dev/null @@ -1,154 +0,0 @@ -From 6cc95288ccea12ad7b67b2b5b3997dfad8e5b5c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= - -Date: Tue, 9 Jun 2020 01:32:02 +0200 -Subject: [PATCH] BACKPORT: Linux 5.8 compat: __vmalloc() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The `pgprot` argument has been removed from `__vmalloc` in Linux 5.8, -being `PAGE_KERNEL` always now [1]. - -Detect this during configure and define a wrapper for older kernels. - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/mm/vmalloc.c?h=next-20200605&id=88dca4ca5a93d2c09e5bbc6a62fbfc3af83c4fca - -Reviewed-by: Brian Behlendorf -Co-authored-by: Sebastian Gottschall -Co-authored-by: Michael Niewöhner -Signed-off-by: Sebastian Gottschall -Signed-off-by: Michael Niewöhner -Closes #10422 ---- - config/kernel-kmem.m4 | 26 ++++++++++++++++++++++++++ - config/kernel.m4 | 2 ++ - include/spl/sys/kmem.h | 9 +++++++++ - module/spl/spl-kmem-cache.c | 4 ++-- - module/spl/spl-kmem.c | 9 ++++----- - 5 files changed, 43 insertions(+), 7 deletions(-) - -diff --git a/config/kernel-kmem.m4 b/config/kernel-kmem.m4 -index cc055e530..f1c0d2412 100644 ---- a/config/kernel-kmem.m4 -+++ b/config/kernel-kmem.m4 -@@ -56,3 +56,29 @@ AC_DEFUN([SPL_AC_DEBUG_KMEM_TRACKING], [ - AC_MSG_CHECKING([whether detailed kmem tracking is enabled]) - AC_MSG_RESULT([$enable_debug_kmem_tracking]) - ]) -+ -+dnl # -+dnl # 5.8 API, -+dnl # __vmalloc PAGE_KERNEL removal -+dnl # -+AC_DEFUN([ZFS_AC_KERNEL_SRC_VMALLOC_PAGE_KERNEL], [ -+ ZFS_LINUX_TEST_SRC([__vmalloc], [ -+ #include -+ #include -+ ],[ -+ void *p __attribute__ ((unused)); -+ -+ p = __vmalloc(0, GFP_KERNEL, PAGE_KERNEL); -+ ]) -+]) -+ -+AC_DEFUN([ZFS_AC_KERNEL_VMALLOC_PAGE_KERNEL], [ -+ AC_MSG_CHECKING([whether __vmalloc(ptr, flags, pageflags) is available]) -+ ZFS_LINUX_TEST_RESULT([__vmalloc], [ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_VMALLOC_PAGE_KERNEL, 1, [__vmalloc page flags exists]) -+ ],[ -+ AC_MSG_RESULT(no) -+ ]) -+]) -+- -diff --git a/config/kernel.m4 b/config/kernel.m4 -index b67fcef8c..23edfdcd8 100644 ---- a/config/kernel.m4 -+++ b/config/kernel.m4 -@@ -45,6 +45,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [ - ZFS_AC_KERNEL_SRC_SCHED - ZFS_AC_KERNEL_SRC_USLEEP_RANGE - ZFS_AC_KERNEL_SRC_KMEM_CACHE -+ ZFS_AC_KERNEL_SRC_VMALLOC_PAGE_KERNEL - ZFS_AC_KERNEL_SRC_WAIT - ZFS_AC_KERNEL_SRC_INODE_TIMES - ZFS_AC_KERNEL_SRC_INODE_LOCK -@@ -163,6 +164,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [ - ZFS_AC_KERNEL_SCHED - ZFS_AC_KERNEL_USLEEP_RANGE - ZFS_AC_KERNEL_KMEM_CACHE -+ ZFS_AC_KERNEL_VMALLOC_PAGE_KERNEL - ZFS_AC_KERNEL_WAIT - ZFS_AC_KERNEL_INODE_TIMES - ZFS_AC_KERNEL_INODE_LOCK -diff --git a/include/spl/sys/kmem.h b/include/spl/sys/kmem.h -index 72d3a7765..ca15bfe7f 100644 ---- a/include/spl/sys/kmem.h -+++ b/include/spl/sys/kmem.h -@@ -169,6 +169,15 @@ extern void *spl_kmem_alloc(size_t sz, int fl, const char *func, int line); - extern void *spl_kmem_zalloc(size_t sz, int fl, const char *func, int line); - extern void spl_kmem_free(const void *ptr, size_t sz); - -+/* -+ * 5.8 API change, pgprot_t argument removed. -+ */ -+#ifdef HAVE_VMALLOC_PAGE_KERNEL -+#define spl_vmalloc(size, flags) __vmalloc(size, flags, PAGE_KERNEL) -+#else -+#define spl_vmalloc(size, flags) __vmalloc(size, flags) -+#endif -+ - /* - * The following functions are only available for internal use. - */ -diff --git a/module/spl/spl-kmem-cache.c b/module/spl/spl-kmem-cache.c -index d71b4b348..4866b2993 100644 ---- a/module/spl/spl-kmem-cache.c -+++ b/module/spl/spl-kmem-cache.c -@@ -203,7 +203,7 @@ kv_alloc(spl_kmem_cache_t *skc, int size, int flags) - ASSERT(ISP2(size)); - ptr = (void *)__get_free_pages(lflags, get_order(size)); - } else { -- ptr = __vmalloc(size, lflags | __GFP_HIGHMEM, PAGE_KERNEL); -+ ptr = spl_vmalloc(size, lflags | __GFP_HIGHMEM); - } - - /* Resulting allocated memory will be page aligned */ -@@ -1242,7 +1242,7 @@ spl_cache_grow(spl_kmem_cache_t *skc, int flags, void **obj) - * allocation. - * - * However, this can't be applied to KVM_VMEM due to a bug that -- * __vmalloc() doesn't honor gfp flags in page table allocation. -+ * spl_vmalloc() doesn't honor gfp flags in page table allocation. - */ - if (!(skc->skc_flags & KMC_VMEM)) { - rc = __spl_cache_grow(skc, flags | KM_NOSLEEP); -diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c -index cee69ad43..ca1fc145f 100644 ---- a/module/spl/spl-kmem.c -+++ b/module/spl/spl-kmem.c -@@ -172,16 +172,15 @@ spl_kmem_alloc_impl(size_t size, int flags, int node) - * kmem_zalloc() callers. - * - * For vmem_alloc() and vmem_zalloc() callers it is permissible -- * to use __vmalloc(). However, in general use of __vmalloc() -- * is strongly discouraged because a global lock must be -- * acquired. Contention on this lock can significantly -+ * to use spl_vmalloc(). However, in general use of -+ * spl_vmalloc() is strongly discouraged because a global lock -+ * must be acquired. Contention on this lock can significantly - * impact performance so frequently manipulating the virtual - * address space is strongly discouraged. - */ - if ((size > spl_kmem_alloc_max) || use_vmem) { - if (flags & KM_VMEM) { -- ptr = __vmalloc(size, lflags | __GFP_HIGHMEM, -- PAGE_KERNEL); -+ ptr = spl_vmalloc(size, lflags | __GFP_HIGHMEM); - } else { - return (NULL); - } --- -2.25.1 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index 14b0909a18..c6bd7ad933 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -153,9 +153,6 @@ let substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target" done - # Fix pkgconfig. - ln -s ../share/pkgconfig $out/lib/pkgconfig - # Remove tests because they add a runtime dependency on gcc rm -rf $out/share/zfs/zfs-tests @@ -195,10 +192,9 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "0.8.4"; + version = "0.8.5"; - sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; - extraPatches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ]; + sha256 = "0vhd3zs2i83pd59nk0llml4vyk4fc178j6nhg00p6k3f6r0l655b"; }; zfsUnstable = common { @@ -206,9 +202,9 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.0-rc3"; + version = "2.0.0-rc4"; - sha256 = "00fljxs6vacfhzc13bgsrmq6p3agpzcq6waw4iv2m58dr90jhlcz"; + sha256 = "12ydycmmzqm70p6hgmmg7q93j8n1xlkk3j56vvqh1zmazr3sr6r0"; isUnstable = true; }; } diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix b/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix index bf6be8595e..16b760a5ad 100644 --- a/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix +++ b/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix @@ -15,11 +15,11 @@ let in formatSet.generate "test-format-file" config; runBuildTest = name: { drv, expected }: pkgs.runCommandNoCC name {} '' - if diff ${drv} ${builtins.toFile "expected" expected}; then - touch $out + if diff -u '${builtins.toFile "expected" expected}' '${drv}'; then + touch "$out" else - echo "Got: $(cat ${drv})" - echo "Should be: ${expected}" + echo + echo "Got different values than expected; diff above." exit 1 fi ''; @@ -147,9 +147,7 @@ in runBuildTests { foo = "foo" [level1] - [level1.level2] - [level1.level2.level3] level4 = "deep" ''; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 1f54f54483..d6f08ffd91 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -11,7 +11,7 @@ "actiontec" = ps: with ps; [ ]; "adguard" = ps: with ps; [ adguardhome ]; "ads" = ps: with ps; [ pyads ]; - "aftership" = ps: with ps; [ ]; # missing inputs: pyaftership + "aftership" = ps: with ps; [ pyaftership ]; "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ ]; # missing inputs: airly diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index ed9c579d9c..48d58163e4 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.2.0"; + version = "7.2.1"; excludedPackages = [ "release_publisher" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1pzsg6kr5kq5767plji7m6ssy2z9jxjp9zp182baxjd634mmclcx"; + sha256 = "0hf5i7190qvcypr1x8j516k2q90n2fhxvaf84m5axzmyb4i4ym0r"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "003sn06r94m68b6l91cjr3xr3i7hq54ay0gb562i6y5swrfkqqwz"; + sha256 = "15kys49c4kwzh73ar54v9q3277m4vql2pi8y3pji6jq9gpw0piwr"; }; vendorSha256 = "1b33kibvfa1qgalqb9ngxqimcn92cy8sllsc81wc9gmz4giz9mn1"; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix index db07bdc96a..d4a26f086c 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "influxdb"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "influxdata"; repo = pname; rev = "v${version}"; - sha256 = "11zkia43i3in1xv84iz6rm9cfhf4k6nxn144m7dz7a7nv3chi20g"; + sha256 = "1siv31gp7ypjphxjfv91sxzpz2rxk1nn2aj17pgk0cz7c8m59ic7"; }; - vendorSha256 = "097x3z1fhdl5s3ni2qzbqxqr60l6lqcrbikq20fs052dp287q0sp"; + vendorSha256 = "1pylw30dg6ljxm9ykmsqapg1vq71bj1ngdq4arvmmzcdhy1nhmh0"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/routinator/default.nix b/third_party/nixpkgs/pkgs/servers/routinator/default.nix index 6e57ebd42d..e80e27d7a8 100644 --- a/third_party/nixpkgs/pkgs/servers/routinator/default.nix +++ b/third_party/nixpkgs/pkgs/servers/routinator/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "12fgvalv12v8690pxmsdg179r170d4mc1kynsb25fm0zggy838jn"; + sha256 = "1lldrb469vc7l6bkwgxz38n7lyxh74cb88xak5r0sjm1ip5q0glp"; }; - cargoSha256 = "01118mnb5gm0xqi2c8jj3fk8y55jnnyg9zgn2g4xn7f3i8dcczka"; + cargoSha256 = "sha256:19yzx9h02cx5dldliaq814n84f8w0s3nbyjk3pgia2siim5mdv94"; meta = with stdenv.lib; { description = "An RPKI Validator written in Rust"; diff --git a/third_party/nixpkgs/pkgs/servers/unifi/default.nix b/third_party/nixpkgs/pkgs/servers/unifi/default.nix index a43f00973e..bce539ec0f 100644 --- a/third_party/nixpkgs/pkgs/servers/unifi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unifi/default.nix @@ -34,7 +34,7 @@ let description = "Controller for Ubiquiti UniFi access points"; license = licenses.unfree; platforms = platforms.unix; - maintainers = with maintainers; [ erictapen globin ]; + maintainers = with maintainers; [ erictapen globin patryk27 ]; }; }; @@ -52,4 +52,9 @@ in { version = "5.14.23"; sha256 = "1aar05yjm3z5a30x505w4kakbyz35i7mk7xyg0wm4ml6h94d84pv"; }; + + unifiBeta = generic { + version = "6.0.23"; + sha256 = "sha256-t/s0UEk0CgnAeydtLWTgpZjnAJqnyfyESNNVe1d5PHo="; + }; } diff --git a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix index 235f020967..e28d9a73ae 100644 --- a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix @@ -3,7 +3,7 @@ let package = (import ./node.nix { inherit pkgs system; }).package; in package.override rec { - version = "1.14.4"; + version = "1.15.0"; reconstructLock = true; postInstall = '' @@ -20,7 +20,7 @@ package.override rec { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "1gyl4f7wh7796w4789pi0ix5y30677784miwylr8wrfqgb1hmddq"; + sha256 = "1kbrkmam0x2mhqps58xwagp8y3q6zyz0qlx57ys2z2wcs12lpw4r"; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix index 1605e25da6..dfe00bd467 100644 --- a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@babel/cli-7.10.5" = { + "@babel/cli-7.11.6" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.10.5"; + version = "7.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.10.5.tgz"; - sha512 = "j9H9qSf3kLdM0Ao3aGPbGZ73mEA9XazuupcS6cDGWuiyAcANoguhP0r2Lx32H5JGw4sSSoHG3x/mxVnHgvOoyA=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.11.6.tgz"; + sha512 = "+w7BZCvkewSmaRM6H4L2QM3RL90teqEIHDIFXAmrW33+0jhlymnDAEdqVeCZATvxhQuio1ifoGVlJJbIiH9Ffg=="; }; }; "@babel/code-frame-7.10.4" = { @@ -31,22 +31,22 @@ let sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; }; }; - "@babel/core-7.11.4" = { + "@babel/core-7.11.6" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.11.4"; + version = "7.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.11.4.tgz"; - sha512 = "5deljj5HlqRXN+5oJTY7Zs37iH3z3b++KjiKtIsJy1NrjOOVSEaJHEetLBhyu0aQOSNNZ/0IuEAan9GzRuDXHg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz"; + sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg=="; }; }; - "@babel/generator-7.11.4" = { + "@babel/generator-7.11.6" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.11.4"; + version = "7.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.4.tgz"; - sha512 = "Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz"; + sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -274,13 +274,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.11.4" = { + "@babel/parser-7.11.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.11.4"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz"; - sha512 = "MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"; + sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.10.5" = { @@ -832,13 +832,13 @@ let sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; }; }; - "@babel/preset-env-7.11.0" = { + "@babel/preset-env-7.11.5" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz"; - sha512 = "2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz"; + sha512 = "kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA=="; }; }; "@babel/preset-modules-0.1.4" = { @@ -877,22 +877,22 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.11.0" = { + "@babel/traverse-7.11.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz"; - sha512 = "ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz"; + sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ=="; }; }; - "@babel/types-7.11.0" = { + "@babel/types-7.11.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.11.0"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz"; - sha512 = "O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"; + sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -922,6 +922,15 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; + "@eslint/eslintrc-0.1.3" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz"; + sha512 = "4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA=="; + }; + }; "@istanbuljs/load-nyc-config-1.1.0" = { name = "_at_istanbuljs_slash_load-nyc-config"; packageName = "@istanbuljs/load-nyc-config"; @@ -1048,6 +1057,33 @@ let sha512 = "BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ=="; }; }; + "@nodelib/fs.scandir-2.1.3" = { + name = "_at_nodelib_slash_fs.scandir"; + packageName = "@nodelib/fs.scandir"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; + sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="; + }; + }; + "@nodelib/fs.stat-2.0.3" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; + sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="; + }; + }; + "@nodelib/fs.walk-1.2.4" = { + name = "_at_nodelib_slash_fs.walk"; + packageName = "@nodelib/fs.walk"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; + sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; + }; + }; "@serialport/binding-abstract-9.0.1" = { name = "_at_serialport_slash_binding-abstract"; packageName = "@serialport/binding-abstract"; @@ -1156,40 +1192,40 @@ let sha512 = "MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA=="; }; }; - "@types/babel__core-7.1.9" = { + "@types/babel__core-7.1.10" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.9"; + version = "7.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz"; - sha512 = "sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz"; + sha512 = "x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw=="; }; }; - "@types/babel__generator-7.6.1" = { + "@types/babel__generator-7.6.2" = { name = "_at_types_slash_babel__generator"; packageName = "@types/babel__generator"; - version = "7.6.1"; + version = "7.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz"; - sha512 = "bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew=="; + url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz"; + sha512 = "MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ=="; }; }; - "@types/babel__template-7.0.2" = { + "@types/babel__template-7.0.3" = { name = "_at_types_slash_babel__template"; packageName = "@types/babel__template"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz"; - sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; + url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz"; + sha512 = "uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q=="; }; }; - "@types/babel__traverse-7.0.13" = { + "@types/babel__traverse-7.0.15" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.0.13"; + version = "7.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.13.tgz"; - sha512 = "i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz"; + sha512 = "Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A=="; }; }; "@types/color-name-1.1.1" = { @@ -1210,15 +1246,6 @@ let sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ=="; }; }; - "@types/eslint-visitor-keys-1.0.0" = { - name = "_at_types_slash_eslint-visitor-keys"; - packageName = "@types/eslint-visitor-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; - sha512 = "OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag=="; - }; - }; "@types/graceful-fs-4.1.3" = { name = "_at_types_slash_graceful-fs"; packageName = "@types/graceful-fs"; @@ -1264,40 +1291,40 @@ let sha512 = "nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA=="; }; }; - "@types/jest-26.0.10" = { + "@types/jest-26.0.14" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "26.0.10"; + version = "26.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.10.tgz"; - sha512 = "i2m0oyh8w/Lum7wWK/YOZJakYF8Mx08UaKA1CtbmFeDquVhAEdA7znacsVSf2hJ1OQ/OfVMGN90pw/AtzF8s/Q=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz"; + sha512 = "Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg=="; }; }; - "@types/json-schema-7.0.5" = { + "@types/json-schema-7.0.6" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz"; - sha512 = "7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="; }; }; - "@types/nedb-1.8.10" = { + "@types/nedb-1.8.11" = { name = "_at_types_slash_nedb"; packageName = "@types/nedb"; - version = "1.8.10"; + version = "1.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.10.tgz"; - sha512 = "M0ISm1qsNvkdXNZml1r/1bEVqt5SJHF/LFcCtH5dHfsSIG0LEj5FhwK0f4fZy9WPCsXjmrKfpzgEW/bdQuKqmQ=="; + url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.11.tgz"; + sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw=="; }; }; - "@types/node-14.6.2" = { + "@types/node-14.11.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.6.2"; + version = "14.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.6.2.tgz"; - sha512 = "onlIwbaeqvZyniGPfdw/TEhKIh79pz66L1q06WUQqJLnAb6wbjvOtepLYTGHTqzdXgBYIE3ZdmqHDGsRsbBz7A=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz"; + sha512 = "jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA=="; }; }; "@types/normalize-package-data-2.4.0" = { @@ -1309,13 +1336,13 @@ let sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; }; }; - "@types/prettier-2.1.0" = { + "@types/prettier-2.1.1" = { name = "_at_types_slash_prettier"; packageName = "@types/prettier"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.0.tgz"; - sha512 = "hiYA88aHiEIgDmeKlsyVsuQdcFn3Z2VuFd/Xm/HCnGnPD8UFU5BM128uzzRVVGEzKDKYUrRsRH9S2o+NUy/3IA=="; + url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.1.tgz"; + sha512 = "2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ=="; }; }; "@types/serialport-8.0.1" = { @@ -1336,13 +1363,13 @@ let sha512 = "l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw=="; }; }; - "@types/yargs-15.0.5" = { + "@types/yargs-15.0.7" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.5"; + version = "15.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz"; - sha512 = "Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz"; + sha512 = "Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA=="; }; }; "@types/yargs-parser-15.0.0" = { @@ -1354,85 +1381,76 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; - "@typescript-eslint/eslint-plugin-3.10.1" = { + "@typescript-eslint/eslint-plugin-4.2.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "3.10.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.1.tgz"; - sha512 = "PQg0emRtzZFWq6PxBcdxRH3QIQiyFO3WCVpRL3fgj5oQS3CDs3AeAKfv4DxNhzn8ITdNJGJ4D3Qw8eAJf3lXeQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.2.0.tgz"; + sha512 = "zBNRkzvLSwo6y5TG0DVcmshZIYBHKtmzD4N+LYnfTFpzc4bc79o8jNRSb728WV7A4Cegbs+MV5IRAj8BKBgOVQ=="; }; }; - "@typescript-eslint/experimental-utils-2.34.0" = { + "@typescript-eslint/experimental-utils-4.2.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "2.34.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz"; - sha512 = "eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.2.0.tgz"; + sha512 = "5BBj6BjgHEndBaQQpUVzRIPERz03LBc0MCQkHwUaH044FJFL08SwWv/sQftk7gf0ShZ2xZysz0LTwCwNt4Xu3w=="; }; }; - "@typescript-eslint/experimental-utils-3.10.1" = { - name = "_at_typescript-eslint_slash_experimental-utils"; - packageName = "@typescript-eslint/experimental-utils"; - version = "3.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz"; - sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; - }; - }; - "@typescript-eslint/parser-3.10.1" = { + "@typescript-eslint/parser-4.2.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "3.10.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.1.tgz"; - sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.2.0.tgz"; + sha512 = "54jJ6MwkOtowpE48C0QJF9iTz2/NZxfKVJzv1ha5imigzHbNSLN9yvbxFFH1KdlRPQrlR8qxqyOvLHHxd397VA=="; }; }; - "@typescript-eslint/types-3.10.1" = { + "@typescript-eslint/scope-manager-4.2.0" = { + name = "_at_typescript-eslint_slash_scope-manager"; + packageName = "@typescript-eslint/scope-manager"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.2.0.tgz"; + sha512 = "Tb402cxxObSxWIVT+PnBp5ruT2V/36yj6gG4C9AjkgRlZpxrLAzWDk3neen6ToMBGeGdxtnfFLoJRUecGz9mYQ=="; + }; + }; + "@typescript-eslint/types-4.2.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "3.10.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz"; - sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.2.0.tgz"; + sha512 = "xkv5nIsxfI/Di9eVwN+G9reWl7Me9R5jpzmZUch58uQ7g0/hHVuGUbbn4NcxcM5y/R4wuJIIEPKPDb5l4Fdmwg=="; }; }; - "@typescript-eslint/typescript-estree-2.34.0" = { + "@typescript-eslint/typescript-estree-4.2.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "2.34.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz"; - sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.2.0.tgz"; + sha512 = "iWDLCB7z4MGkLipduF6EOotdHNtgxuNKnYD54nMS/oitFnsk4S3S/TE/UYXQTra550lHtlv9eGmp+dvN9pUDtA=="; }; }; - "@typescript-eslint/typescript-estree-3.10.1" = { - name = "_at_typescript-eslint_slash_typescript-estree"; - packageName = "@typescript-eslint/typescript-estree"; - version = "3.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz"; - sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; - }; - }; - "@typescript-eslint/visitor-keys-3.10.1" = { + "@typescript-eslint/visitor-keys-4.2.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "3.10.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz"; - sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.2.0.tgz"; + sha512 = "WIf4BNOlFOH2W+YqGWa6YKLcK/EB3gEj2apCrqLw6mme1RzBy0jtJ9ewJgnrZDB640zfnv8L+/gwGH5sYp/rGw=="; }; }; - "abab-2.0.4" = { + "abab-2.0.5" = { name = "abab"; packageName = "abab"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz"; - sha512 = "Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ=="; + url = "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz"; + sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; }; }; "acorn-7.4.0" = { @@ -1453,13 +1471,13 @@ let sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; }; }; - "acorn-jsx-5.2.0" = { + "acorn-jsx-5.3.1" = { name = "acorn-jsx"; packageName = "acorn-jsx"; - version = "5.2.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; - sha512 = "HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ=="; + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; }; }; "acorn-walk-7.2.0" = { @@ -1480,13 +1498,13 @@ let sha512 = "01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg=="; }; }; - "ajv-6.12.4" = { + "ajv-6.12.5" = { name = "ajv"; packageName = "ajv"; - version = "6.12.4"; + version = "6.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz"; - sha512 = "eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz"; + sha512 = "lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag=="; }; }; "ansi-colors-4.1.1" = { @@ -1624,6 +1642,15 @@ let sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; }; }; + "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"; @@ -1894,13 +1921,13 @@ let sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; }; }; - "browserslist-4.14.0" = { + "browserslist-4.14.5" = { name = "browserslist"; packageName = "browserslist"; - version = "4.14.0"; + version = "4.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz"; - sha512 = "pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz"; + sha512 = "Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA=="; }; }; "bser-2.1.1" = { @@ -1975,13 +2002,13 @@ let sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w=="; }; }; - "caniuse-lite-1.0.30001119" = { + "caniuse-lite-1.0.30001137" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001119"; + version = "1.0.30001137"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001119.tgz"; - sha512 = "Hpwa4obv7EGP+TjkCh/wVvbtNJewxmtg4yVJBLFnxo35vbPapBr138bUWENkb5j5L9JZJ9RXLn4OrXRG/cecPQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz"; + sha512 = "54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw=="; }; }; "capture-exit-2.0.0" = { @@ -2380,13 +2407,13 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-4.1.1" = { + "debug-4.2.0" = { name = "debug"; packageName = "debug"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; - sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; + url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; + sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; }; }; "decamelize-1.2.0" = { @@ -2506,6 +2533,24 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; "detect-libc-1.0.3" = { name = "detect-libc"; packageName = "detect-libc"; @@ -2542,6 +2587,15 @@ let sha512 = "5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig=="; }; }; + "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=="; + }; + }; "doctrine-3.0.0" = { name = "doctrine"; packageName = "doctrine"; @@ -2578,13 +2632,22 @@ let sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "electron-to-chromium-1.3.555" = { + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "electron-to-chromium-1.3.573" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.555"; + version = "1.3.573"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.555.tgz"; - sha512 = "/55x3nF2feXFZ5tdGUOr00TxnUjUgdxhrn+eCJ1FAcoAt+cKQTjQkUC5XF4frMWE1R5sjHk+JueuBalimfe5Pg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.573.tgz"; + sha512 = "oypaNmexr8w0m2GX67fGLQ0Xgsd7uXz7GcwaHZ9eW3ZdQ8uA2+V/wXmLdMTk3gcacbqQGAN7CXWG3fOkfKYftw=="; }; }; "emittery-0.7.1" = { @@ -2623,6 +2686,15 @@ let sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; }; }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; "end-of-stream-1.4.4" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -2650,6 +2722,33 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; + "es-abstract-1.17.6" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz"; + sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; + }; + }; + "es-abstract-1.18.0-next.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.18.0-next.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz"; + sha512 = "elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ=="; + }; + }; + "es-to-primitive-1.2.1" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; + }; + }; "es5-ext-0.10.53" = { name = "es5-ext"; packageName = "es5-ext"; @@ -2704,13 +2803,22 @@ let sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; }; }; - "escalade-3.0.2" = { + "escalade-3.1.0" = { name = "escalade"; packageName = "escalade"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz"; - sha512 = "gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz"; + sha512 = "mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig=="; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; }; }; "escape-string-regexp-1.0.5" = { @@ -2740,13 +2848,13 @@ let sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; }; }; - "eslint-7.7.0" = { + "eslint-7.10.0" = { name = "eslint"; packageName = "eslint"; - version = "7.7.0"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz"; - sha512 = "1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.10.0.tgz"; + sha512 = "BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA=="; }; }; "eslint-config-google-0.14.0" = { @@ -2758,22 +2866,22 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-plugin-jest-23.20.0" = { + "eslint-plugin-jest-24.0.2" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "23.20.0"; + version = "24.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.20.0.tgz"; - sha512 = "+6BGQt85OREevBDWCvhqj1yYA4+BFK4XnRZSGJionuEYmcglMZYLNNBBemwzbqUAckURaHdJSBcjHPyrtypZOw=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.0.2.tgz"; + sha512 = "DSBLNpkKDOpUJQkTGSs5sVJWsu0nDyQ2rYxkr0Eh7nrkc5bMUr/dlDbtTj3l8y6UaCVsem6rryF1OZrKnz1S5g=="; }; }; - "eslint-scope-5.1.0" = { + "eslint-scope-5.1.1" = { name = "eslint-scope"; packageName = "eslint-scope"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz"; - sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w=="; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; }; "eslint-utils-2.1.0" = { @@ -2794,6 +2902,15 @@ let sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; }; + "eslint-visitor-keys-2.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="; + }; + }; "espree-7.3.0" = { name = "espree"; packageName = "espree"; @@ -2821,13 +2938,13 @@ let sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; }; }; - "esrecurse-4.2.1" = { + "esrecurse-4.3.0" = { name = "esrecurse"; packageName = "esrecurse"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; - sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; }; }; "estraverse-4.3.0" = { @@ -2857,6 +2974,15 @@ let sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; "event-emitter-0.3.5" = { name = "event-emitter"; packageName = "event-emitter"; @@ -2866,6 +2992,15 @@ let sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; }; }; + "eventemitter3-4.0.7" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; + }; + }; "exec-sh-0.3.4" = { name = "exec-sh"; packageName = "exec-sh"; @@ -2992,6 +3127,15 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; + "fast-glob-3.2.4" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"; + sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="; + }; + }; "fast-json-stable-stringify-2.1.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; @@ -3019,6 +3163,15 @@ let sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; + "fastq-1.8.0" = { + name = "fastq"; + packageName = "fastq"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz"; + sha512 = "SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q=="; + }; + }; "fb-watchman-2.0.1" = { name = "fb-watchman"; packageName = "fb-watchman"; @@ -3073,6 +3226,15 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; + "finalhandler-1.1.2" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + }; + }; "find-up-4.1.0" = { name = "find-up"; packageName = "find-up"; @@ -3154,6 +3316,15 @@ let sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; }; }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; "fs-constants-1.0.0" = { name = "fs-constants"; packageName = "fs-constants"; @@ -3370,6 +3541,15 @@ let sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; }; }; + "globby-11.0.1" = { + name = "globby"; + packageName = "globby"; + version = "11.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz"; + sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="; + }; + }; "glossy-0.1.7" = { name = "glossy"; packageName = "glossy"; @@ -3424,6 +3604,15 @@ let sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; }; }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; "has-flag-3.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -3505,13 +3694,13 @@ let sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "highlight.js-10.1.2" = { + "highlight.js-10.2.0" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.1.2"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.2.tgz"; - sha512 = "Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.2.0.tgz"; + sha512 = "OryzPiqqNCfO/wtFo619W+nPYALM6u7iCQkum4bqRmmlcTikOkmlL06i009QelynBPAlNByTQU6cBB2cOBQtCw=="; }; }; "hosted-git-info-2.8.8" = { @@ -3541,6 +3730,24 @@ let sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="; }; }; + "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.18.1" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"; + sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; + }; + }; "http-signature-1.2.0" = { name = "http-signature"; packageName = "http-signature"; @@ -3604,6 +3811,15 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; + "ignore-5.1.8" = { + name = "ignore"; + packageName = "ignore"; + version = "5.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; + sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + }; + }; "import-fresh-3.2.1" = { name = "import-fresh"; packageName = "import-fresh"; @@ -3748,6 +3964,15 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; + "is-callable-1.2.2" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz"; + sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="; + }; + }; "is-ci-2.0.0" = { name = "is-ci"; packageName = "is-ci"; @@ -3775,6 +4000,15 @@ let sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; + "is-date-object-1.0.2" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; + }; + }; "is-descriptor-0.1.6" = { name = "is-descriptor"; packageName = "is-descriptor"; @@ -3892,6 +4126,15 @@ let sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; }; }; + "is-negative-zero-2.0.0" = { + name = "is-negative-zero"; + packageName = "is-negative-zero"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; + sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + }; + }; "is-number-3.0.0" = { name = "is-number"; packageName = "is-number"; @@ -3928,6 +4171,15 @@ let sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; }; }; + "is-regex-1.1.1" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz"; + sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="; + }; + }; "is-relative-1.0.0" = { name = "is-relative"; packageName = "is-relative"; @@ -3955,6 +4207,15 @@ let sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; }; + "is-symbol-1.0.3" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; + }; + }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -4405,13 +4666,13 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "json-parse-even-better-errors-2.3.0" = { + "json-parse-even-better-errors-2.3.1" = { name = "json-parse-even-better-errors"; packageName = "json-parse-even-better-errors"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.0.tgz"; - sha512 = "o3aP+RsWDJZayj1SbHNQAI8x0v3T3SKiGoZlNYfbUP1S3omJQ6i9CnqADqkSPaOAxwua4/1YWx5CM7oiChJt2Q=="; + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; }; "json-schema-0.2.3" = { @@ -4432,15 +4693,6 @@ let sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; - }; - }; "json-stable-stringify-without-jsonify-1.0.1" = { name = "json-stable-stringify-without-jsonify"; packageName = "json-stable-stringify-without-jsonify"; @@ -4477,15 +4729,6 @@ let sha512 = "jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg=="; }; }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; - }; - }; "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; @@ -4720,6 +4963,15 @@ let sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; }; }; + "merge2-1.4.1" = { + name = "merge2"; + packageName = "merge2"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; + }; + }; "micromatch-3.1.10" = { name = "micromatch"; packageName = "micromatch"; @@ -4738,6 +4990,15 @@ let sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; }; }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; + }; + }; "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; @@ -4837,13 +5098,13 @@ let sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; }; - "moment-2.27.0" = { + "moment-2.29.0" = { name = "moment"; packageName = "moment"; - version = "2.27.0"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz"; - sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz"; + sha512 = "z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA=="; }; }; "mqtt-4.2.1" = { @@ -4855,13 +5116,13 @@ let sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg=="; }; }; - "mqtt-packet-6.4.0" = { + "mqtt-packet-6.6.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "6.4.0"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.4.0.tgz"; - sha512 = "dNd1RPyBolklOR27hgHhy3TxkDk31ZaDu4ljAgJoHlnVsdACH8guwEZhpk3ZMn6GAdH6ENDLgtE285FHIiXzxA=="; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.6.0.tgz"; + sha512 = "LvghnKMFC70hKWMVykmhJarlO5e7lT3t9s9A2qPCUx+lazL3Mq55U+eCV0eLi7/nRRQYvEUWo/2tTo89EjnCJQ=="; }; }; "ms-2.0.0" = { @@ -4873,6 +5134,15 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + }; + }; "ms-2.1.2" = { name = "ms"; packageName = "ms"; @@ -4981,13 +5251,13 @@ let sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA=="; }; }; - "node-releases-1.1.60" = { + "node-releases-1.1.61" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.60"; + version = "1.1.61"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz"; - sha512 = "gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz"; + sha512 = "DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g=="; }; }; "noop-logger-0.1.1" = { @@ -5107,6 +5377,15 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; + "object-inspect-1.8.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; + sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; + }; + }; "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; @@ -5125,13 +5404,13 @@ let sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; - "object.assign-4.1.0" = { + "object.assign-4.1.1" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz"; + sha512 = "VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA=="; }; }; "object.pick-1.3.0" = { @@ -5143,6 +5422,15 @@ let sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; }; }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; "once-1.4.0" = { name = "once"; packageName = "once"; @@ -5269,6 +5557,15 @@ let sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; }; }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; "pascalcase-0.1.1" = { name = "pascalcase"; packageName = "pascalcase"; @@ -5332,6 +5629,15 @@ let sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; }; + "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=="; + }; + }; "performance-now-2.1.0" = { name = "performance-now"; packageName = "performance-now"; @@ -5512,6 +5818,15 @@ let sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; "rc-1.2.8" = { name = "rc"; packageName = "rc"; @@ -5638,13 +5953,13 @@ let sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; }; }; - "regexpu-core-4.7.0" = { + "regexpu-core-4.7.1" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz"; - sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz"; + sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; }; }; "regjsgen-0.5.2" = { @@ -5746,6 +6061,15 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; + "requires-port-1.0.0" = { + name = "requires-port"; + packageName = "requires-port"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + }; + }; "resolve-1.17.0" = { name = "resolve"; packageName = "resolve"; @@ -5800,6 +6124,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.6.3" = { name = "rimraf"; packageName = "rimraf"; @@ -5827,6 +6160,15 @@ 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=="; + }; + }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -5917,6 +6259,15 @@ let sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; }; }; + "send-0.17.1" = { + name = "send"; + packageName = "send"; + version = "0.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + }; + }; "serialport-9.0.1" = { name = "serialport"; packageName = "serialport"; @@ -5926,6 +6277,15 @@ let sha512 = "35Ms8dqjtAb73lptfEZG2l/nFZOxHt3hUjCHvl+g3Mu737gzFLDpSBrRywBJw4G4eS5ozZ3YcthwYnop1WO+ng=="; }; }; + "serve-static-1.14.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + }; + }; "set-blocking-2.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -5944,6 +6304,15 @@ let sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; }; }; + "setprototypeof-1.1.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + }; "shebang-command-1.2.0" = { name = "shebang-command"; packageName = "shebang-command"; @@ -6187,13 +6556,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.5" = { + "spdx-license-ids-3.0.6" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; + sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="; }; }; "split-string-3.1.0" = { @@ -6259,6 +6628,15 @@ let sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; }; }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; "stealthy-require-1.1.1" = { name = "stealthy-require"; packageName = "stealthy-require"; @@ -6313,6 +6691,24 @@ let sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; + "string.prototype.trimend-1.0.1" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; + }; + }; + "string.prototype.trimstart-1.0.1" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; + }; + }; "string_decoder-1.1.1" = { name = "string_decoder"; packageName = "string_decoder"; @@ -6457,13 +6853,13 @@ let sha512 = "9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg=="; }; }; - "tar-stream-2.1.3" = { + "tar-stream-2.1.4" = { name = "tar-stream"; packageName = "tar-stream"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz"; - sha512 = "Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA=="; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz"; + sha512 = "o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw=="; }; }; "terminal-link-2.1.1" = { @@ -6592,6 +6988,15 @@ let sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; + "toidentifier-1.0.0" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + }; "tough-cookie-2.5.0" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -6754,40 +7159,40 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typedoc-0.19.0" = { + "typedoc-0.19.2" = { name = "typedoc"; packageName = "typedoc"; - version = "0.19.0"; + version = "0.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc/-/typedoc-0.19.0.tgz"; - sha512 = "Rn68JwgDDYyIWl3HXeSsLZcsvxd2anISjhKu64PvID7RETeS2Iwnc4cH60yqc8/N50Xo1d3MHPGYinCPhMMliQ=="; + url = "https://registry.npmjs.org/typedoc/-/typedoc-0.19.2.tgz"; + sha512 = "oDEg1BLEzi1qvgdQXc658EYgJ5qJLVSeZ0hQ57Eq4JXy6Vj2VX4RVo18qYxRWz75ifAaYuYNBUCnbhjd37TfOg=="; }; }; - "typedoc-default-themes-0.11.1" = { + "typedoc-default-themes-0.11.4" = { name = "typedoc-default-themes"; packageName = "typedoc-default-themes"; - version = "0.11.1"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.11.1.tgz"; - sha512 = "1yl8pbhjrLywqGJx9TfT+wzP+ntudPYjgJdpCj+s5ed2etBkqZPOCBMKwpaN9o6pdoFQF195PggqWTLVEkaRQQ=="; + url = "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.11.4.tgz"; + sha512 = "Y4Lf+qIb9NTydrexlazAM46SSLrmrQRqWiD52593g53SsmUFioAsMWt8m834J6qsp+7wHRjxCXSZeiiW5cMUdw=="; }; }; - "typedoc-plugin-markdown-2.4.2" = { + "typedoc-plugin-markdown-3.0.3" = { name = "typedoc-plugin-markdown"; packageName = "typedoc-plugin-markdown"; - version = "2.4.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-2.4.2.tgz"; - sha512 = "BBH+9/Uq5XbsqfzCDl8Jq4iaLXRMXRuAHZRFarAZX7df8+F3vUjDx/WHWoWqbZ/XUFzduLC2Iuy2qwsJX8SQ7A=="; + url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.0.3.tgz"; + sha512 = "cVa9BUkJw5IeadihNDlTy4e5yq1T0ZpNXzc+/vkgxdVJwgt1BQVQHSZYUNDa2R8nrlYmP9yt3ZQDxG9nIg4++A=="; }; }; - "typedoc-plugin-no-inherit-1.1.10" = { + "typedoc-plugin-no-inherit-1.2.0" = { name = "typedoc-plugin-no-inherit"; packageName = "typedoc-plugin-no-inherit"; - version = "1.1.10"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc-plugin-no-inherit/-/typedoc-plugin-no-inherit-1.1.10.tgz"; - sha512 = "BhSFAWlBTh9Bf6PSfruIqdQBM8gd/Gj8hVuRk5pVWkHu4I/SB24LzFr5gAo52ZlaQSeN72+VOkkRD6tNYl8Enw=="; + url = "https://registry.npmjs.org/typedoc-plugin-no-inherit/-/typedoc-plugin-no-inherit-1.2.0.tgz"; + sha512 = "jAAslwDbm5sVpA6EQIg5twYctRi/bnT9TgZ5SwbrNpCD5xCIIylPRX9KxIoi1RJliVgCIAxWbSUzzLKGwJCkeA=="; }; }; "typedoc-plugin-sourcefile-url-1.0.6" = { @@ -6799,22 +7204,22 @@ let sha512 = "xHq9DzkoQywS7FyPneMm2/Hr9GRoCpjSQXkVN0W6SCJKP7fguqg2tasgh+8l5/mW6YSYvqCqEbkSYLbuD4Y6gA=="; }; }; - "typescript-4.0.2" = { + "typescript-4.0.3" = { name = "typescript"; packageName = "typescript"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz"; - sha512 = "e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz"; + sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; }; }; - "uglify-js-3.10.2" = { + "uglify-js-3.10.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.2"; + version = "3.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.2.tgz"; - sha512 = "GXCYNwqoo0MbLARghYjxVBxDCnU0tLqN7IPLdHHbibCb1NI5zBkU2EPcy/GaVxc0BtTjqyGXJCINe6JMR2Dpow=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz"; + sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw=="; }; }; "unc-path-regex-0.1.2" = { @@ -6898,6 +7303,15 @@ let sha512 = "Bay5CkSLcdypcBCsxvHEvaG3mftzT5FlUnRToPWEAVxwYI8NI/8zSJ/Gknlp86MPhV6hBA8I8TBsETj2tssoHQ=="; }; }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; "unset-value-1.0.0" = { name = "unset-value"; packageName = "unset-value"; @@ -6916,13 +7330,13 @@ let sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; }; }; - "uri-js-4.2.2" = { + "uri-js-4.4.0" = { name = "uri-js"; packageName = "uri-js"; - version = "4.2.2"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz"; + sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; }; }; "urix-0.1.0" = { @@ -7069,13 +7483,13 @@ let sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; }; }; - "whatwg-url-8.2.1" = { + "whatwg-url-8.2.2" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.1.tgz"; - sha512 = "ZmVCr6nfBeaMxEHALLEGy0LszYjpJqf6PVNQUQ1qd9Et+q7Jpygd4rGGDXgHjD8e99yLFseD69msHDM4YwPZ4A=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz"; + sha512 = "PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ=="; }; }; "which-1.3.1" = { @@ -7267,33 +7681,42 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; - "zigbee-herdsman-0.12.127" = { + "zigbee-herdsman-0.13.11" = { name = "zigbee-herdsman"; packageName = "zigbee-herdsman"; - version = "0.12.127"; + version = "0.13.11"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.127.tgz"; - sha512 = "NbNwX+83byss1tQpZXydpo9iYuHa3RV88X2vHpmoNnv4WuHBjnSbmL/1sdiUB1URBIGeFgC9MxLiTtqxMyCehQ=="; + url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.11.tgz"; + sha512 = "VgsTcYE9lHyXCaHYgzo0Jbtx69YV34YshfqRrcmst59pMmcGN3Vco3TG9FW7SVIJrsZKtVNKTLaUsxzM/9VcIg=="; }; }; - "zigbee-herdsman-converters-12.0.178" = { + "zigbee-herdsman-converters-12.0.194" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "12.0.178"; + version = "12.0.194"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.178.tgz"; - sha512 = "SOATRwJU8NCWay194BCzDr0+HkgF4ANv8Qw8Xmqbz60YZWsNh9y8tYrVbIbcTdiZKLGzambrmY66DgOntiTxNA=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.194.tgz"; + sha512 = "0g4hZHKGKIgVNxYZ967tbmijMX/GAKt67dUXizFuMlt3bLTJbzDSfSG4b3XMRfvnDVbFU8gyEs841l7UbO1NzA=="; + }; + }; + "zigbee2mqtt-frontend-0.2.17" = { + name = "zigbee2mqtt-frontend"; + packageName = "zigbee2mqtt-frontend"; + version = "0.2.17"; + src = fetchurl { + url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.2.17.tgz"; + sha512 = "t5Alx8m2aLq5lVWKzY3qc7+YwSE1noRyVTjVBTKL/DgbdwCsKZ/D1J1ZdKyAMAPM2GUsqgBGQU+XmDXZ5TDf8A=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.14.4"; + version = "1.15.0"; src = ./.; dependencies = [ sources."@dabh/diagnostics-2.0.2" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."argparse-1.0.10" sources."async-3.2.0" sources."balanced-match-1.0.0" @@ -7320,9 +7743,13 @@ let sources."core-util-is-1.0.2" sources."d-1.0.1" sources."debounce-1.2.0" - sources."debug-4.1.1" + sources."debug-2.6.9" + sources."depd-1.1.2" + sources."destroy-1.0.4" sources."duplexify-3.7.1" + sources."ee-first-1.1.1" sources."enabled-2.0.0" + sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" @@ -7333,8 +7760,11 @@ let ]; }) sources."es6-symbol-3.1.3" + sources."escape-html-1.0.3" sources."esprima-4.0.1" + sources."etag-1.8.1" sources."event-emitter-0.3.5" + sources."eventemitter3-4.0.7" (sources."ext-1.4.0" // { dependencies = [ sources."type-2.1.0" @@ -7346,7 +7776,10 @@ let sources."fast-safe-stringify-2.0.7" sources."fecha-4.2.0" sources."file-uri-to-path-1.0.0" + sources."finalhandler-1.1.2" sources."fn.name-1.1.0" + sources."follow-redirects-1.13.0" + sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."git-last-commit-1.0.0" sources."glob-7.1.6" @@ -7354,6 +7787,8 @@ let sources."glob-stream-6.1.0" sources."glossy-0.1.7" sources."help-me-1.1.0" + sources."http-errors-1.7.3" + sources."http-proxy-1.18.1" sources."humanize-duration-3.23.1" sources."ieee754-1.1.13" sources."inflight-1.0.6" @@ -7370,29 +7805,40 @@ let sources."isarray-1.0.0" sources."js-yaml-3.14.0" sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-1.0.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."jsonify-0.0.0" sources."kuler-2.0.0" sources."leven-2.1.0" - sources."logform-2.2.0" + (sources."logform-2.2.0" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + sources."mime-1.6.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdir-recursive-0.4.0" - sources."moment-2.27.0" - sources."mqtt-4.2.1" - (sources."mqtt-packet-6.4.0" // { + sources."moment-2.29.0" + (sources."mqtt-4.2.1" // { dependencies = [ - sources."safe-buffer-5.2.1" + sources."debug-4.2.0" + sources."ms-2.1.2" ]; }) - sources."ms-2.1.2" + (sources."mqtt-packet-6.6.0" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) + sources."ms-2.0.0" sources."nan-2.14.1" sources."next-tick-1.0.0" sources."object-assign-deep-0.4.0" + sources."on-finished-2.3.0" sources."once-1.4.0" sources."one-time-1.0.0" sources."ordered-read-streams-1.0.1" + sources."parseurl-1.3.3" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.1" @@ -7403,12 +7849,21 @@ let ]; }) sources."punycode-2.1.1" + sources."range-parser-1.2.1" sources."readable-stream-2.3.7" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" + sources."requires-port-1.0.0" sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."semver-7.3.2" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" sources."simple-swizzle-0.2.2" (sources."split2-3.2.2" // { dependencies = [ @@ -7417,19 +7872,22 @@ let }) sources."sprintf-js-1.0.3" sources."stack-trace-0.0.10" + sources."statuses-1.5.0" sources."stream-shift-1.0.1" sources."string_decoder-1.1.1" sources."text-hex-1.0.0" sources."through2-2.0.5" sources."through2-filter-3.0.0" sources."to-absolute-glob-2.0.2" + sources."toidentifier-1.0.0" sources."triple-beam-1.3.0" sources."type-1.2.0" sources."typedarray-0.0.6" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."unix-dgram-2.0.3" - sources."uri-js-4.2.2" + sources."unpipe-1.0.0" + sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" (sources."winston-3.3.3" // { dependencies = [ @@ -7441,13 +7899,13 @@ let sources."wrappy-1.0.2" sources."ws-7.3.1" sources."xtend-4.0.2" - (sources."zigbee-herdsman-0.12.127" // { + (sources."zigbee-herdsman-0.13.11" // { dependencies = [ - sources."@babel/cli-7.10.5" + sources."@babel/cli-7.11.6" sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.11.0" - sources."@babel/core-7.11.4" - sources."@babel/generator-7.11.4" + sources."@babel/core-7.11.6" + sources."@babel/generator-7.11.6" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-compilation-targets-7.10.4" @@ -7473,7 +7931,7 @@ let sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" @@ -7535,15 +7993,22 @@ let sources."@babel/plugin-transform-typescript-7.11.0" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.0" + sources."@babel/preset-env-7.11.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.10.4" sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" + (sources."@eslint/eslintrc-0.1.3" // { + dependencies = [ + sources."globals-12.4.0" + sources."ignore-4.0.6" + sources."strip-json-comments-3.1.1" + ]; + }) sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.2" (sources."@jest/console-26.3.0" // { @@ -7677,6 +8142,9 @@ let sources."supports-color-7.2.0" ]; }) + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" sources."@serialport/binding-abstract-9.0.1" sources."@serialport/binding-mock-9.0.1" sources."@serialport/bindings-9.0.1" @@ -7689,47 +8157,47 @@ let sources."@serialport/stream-9.0.1" sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" - sources."@types/babel__core-7.1.9" - sources."@types/babel__generator-7.6.1" - sources."@types/babel__template-7.0.2" - sources."@types/babel__traverse-7.0.13" + sources."@types/babel__core-7.1.10" + sources."@types/babel__generator-7.6.2" + sources."@types/babel__template-7.0.3" + sources."@types/babel__traverse-7.0.15" sources."@types/color-name-1.1.1" sources."@types/debug-4.1.5" - sources."@types/eslint-visitor-keys-1.0.0" sources."@types/graceful-fs-4.1.3" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/jest-26.0.10" - sources."@types/json-schema-7.0.5" - sources."@types/nedb-1.8.10" - sources."@types/node-14.6.2" + sources."@types/jest-26.0.14" + sources."@types/json-schema-7.0.6" + sources."@types/nedb-1.8.11" + sources."@types/node-14.11.2" sources."@types/normalize-package-data-2.4.0" - sources."@types/prettier-2.1.0" + sources."@types/prettier-2.1.1" sources."@types/serialport-8.0.1" sources."@types/stack-utils-1.0.1" - sources."@types/yargs-15.0.5" + sources."@types/yargs-15.0.7" sources."@types/yargs-parser-15.0.0" - (sources."@typescript-eslint/eslint-plugin-3.10.1" // { + (sources."@typescript-eslint/eslint-plugin-4.2.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/experimental-utils-3.10.1" - sources."@typescript-eslint/parser-3.10.1" - sources."@typescript-eslint/types-3.10.1" - (sources."@typescript-eslint/typescript-estree-3.10.1" // { + sources."@typescript-eslint/experimental-utils-4.2.0" + sources."@typescript-eslint/parser-4.2.0" + sources."@typescript-eslint/scope-manager-4.2.0" + sources."@typescript-eslint/types-4.2.0" + (sources."@typescript-eslint/typescript-estree-4.2.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/visitor-keys-3.10.1" - sources."abab-2.0.4" + sources."@typescript-eslint/visitor-keys-4.2.0" + sources."abab-2.0.5" sources."acorn-7.4.0" sources."acorn-globals-6.0.0" - sources."acorn-jsx-5.2.0" + sources."acorn-jsx-5.3.1" sources."acorn-walk-7.2.0" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.1" // { dependencies = [ @@ -7749,6 +8217,7 @@ let sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-union-2.1.0" sources."array-unique-0.3.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -7805,14 +8274,14 @@ let ]; }) sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.14.0" + sources."browserslist-4.14.5" sources."bser-2.1.1" sources."buffer-5.6.0" sources."buffer-from-1.1.1" sources."cache-base-1.0.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001119" + sources."caniuse-lite-1.0.30001137" sources."capture-exit-2.0.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -7862,7 +8331,7 @@ let }) sources."dashdash-1.14.1" sources."data-urls-2.0.0" - sources."debug-4.1.1" + sources."debug-4.2.0" sources."decamelize-1.2.0" sources."decimal.js-10.2.0" sources."decode-uri-component-0.2.0" @@ -7883,6 +8352,7 @@ let sources."detect-libc-1.0.3" sources."detect-newline-3.1.0" sources."diff-sequences-25.2.6" + sources."dir-glob-3.0.1" sources."doctrine-3.0.0" (sources."domexception-2.0.1" // { dependencies = [ @@ -7890,13 +8360,15 @@ let ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.555" + sources."electron-to-chromium-1.3.573" sources."emittery-0.7.1" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."error-ex-1.3.2" - sources."escalade-3.0.2" + sources."es-abstract-1.18.0-next.0" + sources."es-to-primitive-1.2.1" + sources."escalade-3.1.0" sources."escape-string-regexp-1.0.5" (sources."escodegen-1.14.3" // { dependencies = [ @@ -7907,7 +8379,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-7.7.0" // { + (sources."eslint-7.10.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -7915,9 +8387,11 @@ let sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" + sources."eslint-visitor-keys-1.3.0" sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."has-flag-4.0.0" + sources."ignore-4.0.6" sources."path-key-3.1.1" sources."semver-7.3.2" sources."shebang-command-2.0.0" @@ -7928,17 +8402,29 @@ let sources."which-2.0.2" ]; }) - sources."eslint-scope-5.1.0" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."espree-7.3.0" + sources."eslint-scope-5.1.1" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.0.0" + (sources."espree-7.3.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."exec-sh-0.3.4" @@ -7983,8 +8469,19 @@ let }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" + (sources."fast-glob-3.2.4" // { + dependencies = [ + sources."braces-3.0.2" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."to-regex-range-5.0.1" + ]; + }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" + sources."fastq-1.8.0" sources."fb-watchman-2.0.1" sources."file-entry-cache-5.0.1" sources."file-uri-to-path-1.0.0" @@ -8022,6 +8519,11 @@ let ]; }) sources."globals-11.12.0" + (sources."globby-11.0.1" // { + dependencies = [ + sources."slash-3.0.0" + ]; + }) sources."graceful-fs-4.2.4" sources."growly-1.3.0" (sources."handlebars-4.7.6" // { @@ -8031,6 +8533,7 @@ let }) sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" sources."has-unicode-2.0.1" @@ -8040,7 +8543,7 @@ let sources."kind-of-4.0.0" ]; }) - sources."highlight.js-10.1.2" + sources."highlight.js-10.2.0" sources."hosted-git-info-2.8.8" sources."html-encoding-sniffer-2.0.1" sources."html-escaper-2.0.2" @@ -8048,7 +8551,7 @@ let sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" - sources."ignore-4.0.6" + sources."ignore-5.1.8" (sources."import-fresh-3.2.1" // { dependencies = [ sources."resolve-from-4.0.0" @@ -8070,12 +8573,14 @@ let sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + sources."is-callable-1.2.2" sources."is-ci-2.0.0" (sources."is-data-descriptor-0.1.4" // { dependencies = [ sources."kind-of-3.2.2" ]; }) + sources."is-date-object-1.0.2" (sources."is-descriptor-0.1.6" // { dependencies = [ sources."kind-of-5.1.0" @@ -8087,6 +8592,7 @@ let sources."is-fullwidth-code-point-1.0.0" sources."is-generator-fn-2.1.0" sources."is-glob-4.0.1" + sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -8094,7 +8600,9 @@ let }) sources."is-plain-object-2.0.4" sources."is-potential-custom-element-name-1.0.0" + sources."is-regex-1.1.1" sources."is-stream-1.1.0" + sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" @@ -8449,7 +8957,7 @@ let sources."jsbn-0.1.1" sources."jsdom-16.4.0" sources."jsesc-2.5.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -8474,6 +8982,7 @@ let sources."map-visit-1.0.0" sources."marked-1.1.1" sources."merge-stream-2.0.0" + sources."merge2-1.4.1" sources."micromatch-3.1.10" sources."mime-db-1.44.0" sources."mime-types-2.1.27" @@ -8500,7 +9009,7 @@ let sources."which-2.0.2" ]; }) - sources."node-releases-1.1.60" + sources."node-releases-1.1.61" sources."noop-logger-0.1.1" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" @@ -8516,9 +9025,10 @@ let sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.0" + sources."object.assign-4.1.1" sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -8537,6 +9047,7 @@ let sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" + sources."path-type-4.0.0" sources."performance-now-2.1.0" sources."picomatch-2.2.2" sources."pify-4.0.1" @@ -8577,7 +9088,7 @@ let sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexpp-3.1.0" - sources."regexpu-core-4.7.0" + sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" (sources."regjsparser-0.6.4" // { dependencies = [ @@ -8606,8 +9117,10 @@ let sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" + sources."reusify-1.0.4" sources."rimraf-2.6.3" sources."rsvp-4.8.5" + sources."run-parallel-1.1.9" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -8668,7 +9181,7 @@ let sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -8690,6 +9203,16 @@ let ]; }) sources."string-width-1.0.2" + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-4.0.0" @@ -8713,7 +9236,7 @@ let ]; }) sources."tar-fs-2.1.0" - (sources."tar-stream-2.1.3" // { + (sources."tar-stream-2.1.4" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -8741,13 +9264,17 @@ let sources."type-detect-4.0.8" sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" - sources."typedoc-0.19.0" - sources."typedoc-default-themes-0.11.1" - sources."typedoc-plugin-markdown-2.4.2" - sources."typedoc-plugin-no-inherit-1.1.10" + (sources."typedoc-0.19.2" // { + dependencies = [ + sources."semver-7.3.2" + ]; + }) + sources."typedoc-default-themes-0.11.4" + sources."typedoc-plugin-markdown-3.0.3" + sources."typedoc-plugin-no-inherit-1.2.0" sources."typedoc-plugin-sourcefile-url-1.0.6" - sources."typescript-4.0.2" - sources."uglify-js-3.10.2" + sources."typescript-4.0.3" + sources."uglify-js-3.10.4" sources."unicode-canonical-property-names-ecmascript-1.0.4" sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.2.0" @@ -8765,7 +9292,7 @@ let ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -8784,7 +9311,7 @@ let sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.2.1" + sources."whatwg-url-8.2.2" sources."which-1.3.1" sources."which-module-2.0.0" sources."which-pm-runs-1.0.0" @@ -8822,16 +9349,16 @@ let sources."yargs-parser-18.1.3" ]; }) - (sources."zigbee-herdsman-converters-12.0.178" // { + (sources."zigbee-herdsman-converters-12.0.194" // { dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.11.4" // { + (sources."@babel/core-7.11.6" // { dependencies = [ sources."semver-5.7.1" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.11.4" // { + (sources."@babel/generator-7.11.6" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -8853,7 +9380,7 @@ let sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.11.4" + sources."@babel/parser-7.11.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.10.4" @@ -8866,14 +9393,15 @@ let sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.11.0" // { + (sources."@babel/traverse-7.11.5" // { dependencies = [ sources."globals-11.12.0" ]; }) - sources."@babel/types-7.11.0" + sources."@babel/types-7.11.5" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" + sources."@eslint/eslintrc-0.1.3" (sources."@istanbuljs/load-nyc-config-1.1.0" // { dependencies = [ sources."resolve-from-5.0.0" @@ -8895,33 +9423,43 @@ let sources."@jest/test-sequencer-26.4.2" sources."@jest/transform-26.3.0" sources."@jest/types-26.3.0" + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" - sources."@types/babel__core-7.1.9" - sources."@types/babel__generator-7.6.1" - sources."@types/babel__template-7.0.2" - sources."@types/babel__traverse-7.0.13" + sources."@types/babel__core-7.1.10" + sources."@types/babel__generator-7.6.2" + sources."@types/babel__template-7.0.3" + sources."@types/babel__traverse-7.0.15" sources."@types/color-name-1.1.1" sources."@types/graceful-fs-4.1.3" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.0" - sources."@types/json-schema-7.0.5" - sources."@types/node-14.6.2" + sources."@types/json-schema-7.0.6" + sources."@types/node-14.11.2" sources."@types/normalize-package-data-2.4.0" - sources."@types/prettier-2.1.0" + sources."@types/prettier-2.1.1" sources."@types/stack-utils-1.0.1" - sources."@types/yargs-15.0.5" + sources."@types/yargs-15.0.7" sources."@types/yargs-parser-15.0.0" - sources."@typescript-eslint/experimental-utils-2.34.0" - sources."@typescript-eslint/typescript-estree-2.34.0" - sources."abab-2.0.4" + sources."@typescript-eslint/experimental-utils-4.2.0" + sources."@typescript-eslint/scope-manager-4.2.0" + sources."@typescript-eslint/types-4.2.0" + sources."@typescript-eslint/typescript-estree-4.2.0" + (sources."@typescript-eslint/visitor-keys-4.2.0" // { + dependencies = [ + sources."eslint-visitor-keys-2.0.0" + ]; + }) + sources."abab-2.0.5" sources."acorn-7.4.0" sources."acorn-globals-6.0.0" - sources."acorn-jsx-5.2.0" + sources."acorn-jsx-5.3.1" sources."acorn-walk-7.2.0" sources."agent-base-6.0.1" - sources."ajv-6.12.4" + sources."ajv-6.12.5" sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.1" // { dependencies = [ @@ -8935,6 +9473,7 @@ let sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-union-2.1.0" sources."array-unique-0.3.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -9020,7 +9559,7 @@ let }) sources."dashdash-1.14.1" sources."data-urls-2.0.0" - sources."debug-4.1.1" + sources."debug-4.2.0" sources."decamelize-1.2.0" sources."decimal.js-10.2.0" sources."decode-uri-component-0.2.0" @@ -9036,6 +9575,7 @@ let sources."delayed-stream-1.0.0" sources."detect-newline-3.1.0" sources."diff-sequences-26.3.0" + sources."dir-glob-3.0.1" sources."doctrine-3.0.0" (sources."domexception-2.0.1" // { dependencies = [ @@ -9057,10 +9597,10 @@ let sources."type-check-0.3.2" ]; }) - sources."eslint-7.7.0" + sources."eslint-7.10.0" sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-23.20.0" - sources."eslint-scope-5.1.0" + sources."eslint-plugin-jest-24.0.2" + sources."eslint-scope-5.1.1" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" sources."espree-7.3.0" @@ -9070,7 +9610,11 @@ let sources."estraverse-5.2.0" ]; }) - sources."esrecurse-4.2.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."exec-sh-0.3.4" @@ -9117,8 +9661,10 @@ let }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" + sources."fastq-1.8.0" sources."fb-watchman-2.0.1" sources."file-entry-cache-5.0.1" sources."fill-range-7.0.1" @@ -9143,6 +9689,11 @@ let sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globals-12.4.0" + (sources."globby-11.0.1" // { + dependencies = [ + sources."ignore-5.1.8" + ]; + }) sources."graceful-fs-4.2.4" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -9275,7 +9826,7 @@ let sources."jsbn-0.1.1" sources."jsdom-16.4.0" sources."jsesc-2.5.2" - sources."json-parse-even-better-errors-2.3.0" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -9299,6 +9850,7 @@ let sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."merge-stream-2.0.0" + sources."merge2-1.4.1" sources."micromatch-4.0.2" sources."mime-db-1.44.0" sources."mime-types-2.1.27" @@ -9355,6 +9907,7 @@ let sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-parse-1.0.6" + sources."path-type-4.0.0" sources."performance-now-2.1.0" sources."picomatch-2.2.2" sources."pirates-4.0.1" @@ -9410,8 +9963,10 @@ let sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" + sources."reusify-1.0.4" sources."rimraf-2.6.3" sources."rsvp-4.8.5" + sources."run-parallel-1.1.9" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -9482,7 +10037,7 @@ let sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -9519,7 +10074,7 @@ let }) sources."symbol-tree-3.2.4" sources."table-5.4.6" - sources."tar-stream-2.1.3" + sources."tar-stream-2.1.4" sources."terminal-link-2.1.1" sources."test-exclude-6.0.0" sources."text-table-0.2.0" @@ -9554,7 +10109,7 @@ let sources."has-values-0.1.4" ]; }) - sources."uri-js-4.2.2" + sources."uri-js-4.4.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -9573,7 +10128,7 @@ let sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.2.1" + sources."whatwg-url-8.2.2" sources."which-2.0.2" sources."which-module-2.0.0" sources."word-wrap-1.2.3" @@ -9604,6 +10159,7 @@ let sources."yargs-parser-18.1.3" ]; }) + sources."zigbee2mqtt-frontend-0.2.17" ]; buildInputs = globalBuildInputs; meta = { diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 73fd6ceeb0..d02e626794 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-10-15"; + version = "2020-10-18"; pname = "oh-my-zsh"; - rev = "5b717ab3e4bfb627a936d7c04367a39867734d63"; + rev = "7525b1d533b927bc40e3cfb29e399e5f2e0828d4"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0qm0mdvcvf5s6ypbq7z1x286sdv6ii2yfqvv1dss7zqjbg5j08gz"; + sha256 = "1a92k8yv7zs830z33v9f4aqq1cv2gmvib1x05vb0kzynwv7p3gmd"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix index b4cdde95b8..0fdd73ff55 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "0qsk4pa7xywd6fdwd5v4qwj334hyp3xjlayjzgyhks7a87hdwjgs"; + sha256 = "0zzansnbry73h7b2i4rz4rxc86xiw037n7f3va5gkz0pfdfa9mzi"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "02wd4cw9hd8d96szwx8yxz6bll60f7w1z0xiz7k1h8h12mriaz4w"; + cargoSha256 = "0wky0b9sv4hsj56s001m5gh16r8ms421l7h7xjh117fs87aaj42w"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix index ff9250a2bf..cd581045cc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles +{ stdenv, fetchCrate, rustPlatform, installShellFiles , Security }: rustPlatform.buildRustPackage rec { pname = "hyperfine"; - version = "1.10.0"; + version = "1.11.0"; - src = fetchFromGitHub { - owner = "sharkdp"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "0389lmyipmm4irrl39zw2748f2sdddfzwms4i4763xdykdvi8b57"; + src = fetchCrate { + inherit pname version; + sha256 = "0dla2jzwcxkdx3n4fqkkh6wirqs2f31lvqsw2pjf1jbnnif54mzh"; }; - cargoSha256 = "06scvp7x1yixdadarsm461hbc256spx4aqhmjjn72x7hxn22h9cg"; + cargoSha256 = "12qdllhydd29xh20l5gir6qpj4a1nkzp8ics344rcwj8wsj7g5zw"; nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix index 7446b061e0..546dcb112a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kepubify"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "pgaskin"; repo = pname; rev = "v${version}"; - sha256 = "047pwn7yzm456cs175vgqk2pd6i3iqn8zxp38px3ah15vym2yjnp"; + sha256 = "129izxgvhcybipfgcwzzwsir9zhi7axxadnw822zy5rk2ky4zjpk"; }; - vendorSha256 = "0jzx5midawvzims9ghh8fbslvwcdczvlpf0k6a9q0bdf4wlp2z5n"; + vendorSha256 = "0vwzm1c4kada7mqdkr444gj8c2vkvz7av9wkpgdpjrq0v2h0hpcc"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix index 518ce223ed..426c5f2120 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3bERQ480SuvrjyqlBd9wnE4iIJAbN8HODUj0X+Uxrvs="; + sha256 = "sha256-F1NbzcMoct0mjWKY2itz4cBqVToY7HpoaRzk3l683fY="; }; - cargoSha256 = "sha256-Bq2ytwbdhYeXIUM4tYSfUamhckraH5w34sAQ96ayJxI="; + cargoSha256 = "sha256-eBY+34VEPEAv5bqerxR3i7cJrVb1GtvmWyrM7uuef2E="; buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index 8689e6467f..12b7dda0df 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.16"; + version = "1.2020.19"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0k9dligb0b2kc8rl9k5wp9sh8z1kb8g97v5pfiiwa321lp8y6wpp"; + sha256 = "0lb0gxww7fgbwazfj1z533crryvcgb5vdprpy8j9p6h6x929qaqi"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/iperf/3.nix b/third_party/nixpkgs/pkgs/tools/networking/iperf/3.nix index 4910ff21da..2ca9247314 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/iperf/3.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/iperf/3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iperf"; - version = "3.8.1"; + version = "3.9"; src = fetchurl { url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"; - sha256 = "15pdgnan9krf3dijan9in73ir8rcmhk3iw8085d732is4zrq1c75"; + sha256 = "0f601avdmzpwsa3lbi0ppjhkrdipm5wifhhxy5czf99370k3mdi4"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/waitron/default.nix b/third_party/nixpkgs/pkgs/tools/networking/waitron/default.nix new file mode 100644 index 0000000000..cc28455d06 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/waitron/default.nix @@ -0,0 +1,30 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "waitron-unstable-${version}"; + version = "2020-01-24"; + rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6"; + + goPackagePath = "github.com/ns1/waitron"; + + src = fetchgit { + inherit rev; + url = "https://github.com/ns1/waitron"; + sha256 = "0lgw37iq1cvg3mqc94nzf0027mvv721ay8x6dw3fc814ww8a2hb6"; + }; + + patches = [ + ./staticfiles-directory.patch + ]; + + goDeps = ./deps.nix; + + meta = { + description = "A tool to manage network booting of machines"; + homepage = "https://github.com/ns1/waitron"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ guibert ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/waitron/deps.nix b/third_party/nixpkgs/pkgs/tools/networking/waitron/deps.nix new file mode 100644 index 0000000000..46369c7831 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/waitron/deps.nix @@ -0,0 +1,57 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/flosch/pongo2"; + fetch = { + type = "git"; + url = "https://github.com/flosch/pongo2"; + rev = "bbf5a6c351f4d4e883daa40046a404d7553e0a00"; + sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; + }; + } + { + goPackagePath = "github.com/gorilla/handlers"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/handlers"; + rev = "f08afc1876ad882db8074bcb8a4cc96107d3a5f4"; + sha256 = "1ysm6sw3jqa3h8pb5qpqgh44g91c23n3as277sh0vyp7282290jq"; + }; + } + { + goPackagePath = "github.com/juju/errors"; + fetch = { + type = "git"; + url = "https://github.com/juju/errors"; + rev = "d42613fe1ab9e303fc850e7a19fda2e8eeb6516e"; + sha256 = "0qggzzvh9lzlfk8ixlyw8bw645rh0lrjrd367505hhl6cg18v8yf"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "8c9f31f047a304abedb5614d4a18a843cd5f4a40"; + sha256 = "00f5ja1yslrjclx3sf29mzpcsrpfd15kkw5ygv7n4jsyb4v3xgj6"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "b2ce2384e17bbe0c6d34077efa39dbab3e09123b"; + sha256 = "1yz4cx02377ijlf8mnn84j1dcmlwh8ncx7y3kw1zg2qw0z4x119c"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "53403b58ad1b561927d19068c655246f2db79d48"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; + }; + } +] diff --git a/third_party/nixpkgs/pkgs/tools/networking/waitron/staticfiles-directory.patch b/third_party/nixpkgs/pkgs/tools/networking/waitron/staticfiles-directory.patch new file mode 100644 index 0000000000..b1096487fa --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/waitron/staticfiles-directory.patch @@ -0,0 +1,13 @@ +diff --git a/main.go b/main.go +index 4046911..a126bae 100644 +--- a/main.go ++++ b/main.go +@@ -411,7 +411,7 @@ func main() { + + if configuration.StaticFilesPath != "" { + fs := http.FileServer(http.Dir(configuration.StaticFilesPath)) +- r.Handler("GET", "/files/:filename", http.StripPrefix("/files/", fs)) ++ r.Handler("GET", "/files/*filepath", http.StripPrefix("/files/", fs)) + log.Println("Serving static files from " + configuration.StaticFilesPath) + } + diff --git a/third_party/nixpkgs/pkgs/tools/security/aide/default.nix b/third_party/nixpkgs/pkgs/tools/security/aide/default.nix index 116ada633c..59b7232075 100644 --- a/third_party/nixpkgs/pkgs/tools/security/aide/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/aide/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://aide.sourceforge.net/"; + homepage = "https://aide.github.io/"; description = "A file and directory integrity checker"; - license = licenses.free; + license = licenses.gpl2Plus; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix index 2a2e8c7ec6..773711d1f3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "rustscan"; - version = "1.8.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "RustScan"; repo = pname; rev = "${version}"; - sha256 = "0rkqsh4i58cf18ad97yr4f68s5jg6z0ybz4bw8607lz7cjkfvjay"; + sha256 = "0dhy7b73ipsxsr7wlc3r5yy39i3cjrdszhsw9xwjj31692s3b605"; }; - cargoSha256 = "0mj214f2md7kjknmcayc5dcfmlk2b8mqkn7kxzdis8qv9a5xcbk8"; + cargoSha256 = "00s1iv8yw06647ijw9p3l5n7d899gsks5j8ljag6ha7hgl5vs4ci"; postPatch = '' substituteInPlace src/main.rs \ @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=infer_ulimit_lowering_no_panic" "--skip=google_dns_runs" - "--skip=parse_correct_ips_or_hosts" + "--skip=parse_correct_host_addresses" + "--skip=parse_hosts_file_and_incorrect_hosts" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix index 884a3d90c4..9dbb0ce5fc 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix @@ -2,19 +2,19 @@ python3Packages.buildPythonApplication rec { pname = "ssh-audit"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "jtesta"; repo = pname; rev = "v${version}"; - sha256 = "1z1h9nsgfaxdnkr9dvc0yzc23b3wz436rg2fycg2glwjhhal8az7"; + sha256 = "1k5nv2cdnzd3j2p729vjw6ya0gwwkxhqijs2b7p68wvp0n3y3m77"; }; postPatch = '' - cp ./README.md pypi/sshaudit/ - cp ./ssh-audit.py pypi/sshaudit/sshaudit.py - mv pypi/* . + cp ./README.md packages/sshaudit/ + cp ./ssh-audit.py packages/sshaudit/sshaudit.py + mv packages/* . ls -lah ''; @@ -39,6 +39,6 @@ python3Packages.buildPythonApplication rec { description = "Tool for ssh server auditing"; homepage = "https://github.com/jtesta/ssh-audit"; license = licenses.mit; - maintainers = with maintainers; [ tv ]; + maintainers = with maintainers; [ tv SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix index 78e92e01c6..dceb673067 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "1.7"; + version = "2.0"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "1jkz99i10y6dwc4dyh2vp3p549jscgwjdp6x17mcw561bnam2287"; + sha256 = "0cx650cz4ap1ng25n17pkz0n6zcs87l4bs0mabhqr289rfkf3ddd"; }; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix index 277c7417ce..c89d152625 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix @@ -1,32 +1,47 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security, ansi2html }: +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkgconfig +, asciidoctor +, openssl +, Security +, ansi2html +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.21.1"; + version = "0.22.1"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - hash = "sha256-O7LlbSkxcyHQiTHYB/QBJVlShzTSzud3VJDIQ1ScvM4="; + hash = "sha256-4sM1xT/JQ+yM5tZkGwK7r0gUT5so9o1MnDJ7apZkRd4="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-pvhYKyFraMI4w5nq6L8qs/ONSNDTHElhZnZmD5mmAZs="; + cargoSha256 = "sha256-LoNm2/6/FgTKp95ETODY39D8Ou+9X+IXIy625YW9AFI="; checkInputs = [ ansi2html ]; - checkPhase = '' - # Skip tests that use the network and that include files. - cargo test -- \ - --skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length \ - --skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length \ - --skip magic::tests::detect_mimetype_of_png_image \ - --skip magic::tests::detect_mimetype_of_svg_image \ - --skip resources::tests::read_url_with_http_url_fails_when_status_404 \ - --skip resources::tests::read_url_with_http_url_returns_content_when_status_200 \ - --skip iterm2_tests_render_md_samples_images_md + # Skip tests that use the network and that include files. + checkFlags = [ + "--skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length" + "--skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length" + "--skip magic::tests::detect_mimetype_of_png_image" + "--skip magic::tests::detect_mimetype_of_svg_image" + "--skip resources::tests::read_url_with_http_url_fails_when_status_404" + "--skip resources::tests::read_url_with_http_url_returns_content_when_status_200" + "--skip iterm2_tests_render_md_samples_images_md" + ]; + + postInstall = '' + installManPage $releaseDir/build/mdcat-*/out/mdcat.1 + installShellCompletion --bash $releaseDir/build/mdcat-*/out/completions/mdcat.bash + installShellCompletion --fish $releaseDir/build/mdcat-*/out/completions/mdcat.fish + installShellCompletion --zsh $releaseDir/build/mdcat-*/out/completions/_mdcat ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 9534a53d61..c74f2249fc 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -1999,6 +1999,8 @@ in futhark = haskell.lib.justStaticExecutables haskellPackages.futhark; + inherit (nodePackages) fx; + tllist = callPackage ../development/libraries/tllist { }; fcft = callPackage ../development/libraries/fcft { }; @@ -2366,6 +2368,8 @@ in pixiecore = callPackage ../tools/networking/pixiecore {}; + waitron = callPackage ../tools/networking/waitron {}; + pyCA = python3Packages.callPackage ../applications/video/pyca {}; pyrit = callPackage ../tools/security/pyrit {}; @@ -10017,7 +10021,7 @@ in inherit (beam.interpreters) erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 - elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; + elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; inherit (beam.packages.erlang) rebar rebar3 @@ -10256,7 +10260,7 @@ in pkgs = pkgs.extend (final: _: { }); }; - inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; + inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy36; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); @@ -10264,6 +10268,7 @@ in python37Packages = recurseIntoAttrs python37.pkgs; python38Packages = recurseIntoAttrs python38.pkgs; python39Packages = python39.pkgs; + python310Packages = python310.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; pypy27Packages = pypy27.pkgs; @@ -12041,7 +12046,9 @@ in boost170 = callPackage ../development/libraries/boost/1.70.nix { }; boost171 = callPackage ../development/libraries/boost/1.71.nix { }; boost172 = callPackage ../development/libraries/boost/1.72.nix { }; - boost17x = boost172; + boost173 = callPackage ../development/libraries/boost/1.73.nix { }; + boost174 = callPackage ../development/libraries/boost/1.74.nix { }; + boost17x = boost174; boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; @@ -16635,6 +16642,8 @@ in minio = callPackage ../servers/minio { }; + mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { }; + # Backwards compatibility. mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi; @@ -17245,7 +17254,8 @@ in inherit (callPackages ../servers/unifi { }) unifiLTS - unifiStable; + unifiStable + unifiBeta; unifi = unifiStable; urserver = callPackage ../servers/urserver { }; @@ -20941,6 +20951,11 @@ in goffice = callPackage ../development/libraries/goffice { }; + hydrus = python3Packages.callPackage ../applications/graphics/hydrus { + inherit miniupnpc_2 swftools; + inherit (qt5) wrapQtAppsHook; + }; + jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { jdk = jetbrains.jdk; }) // { diff --git a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix index 139749e7d3..14399d7ac9 100644 --- a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix @@ -96,8 +96,8 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use - # `beam.packages.erlangR22.elixir`. - inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; + # `beam.packages.erlangR23.elixir`. + inherit (packages.erlang) elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; inherit (packages.erlang) lfe lfe_1_2 lfe_1_3; }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 1b0e299fe0..6566a8e42b 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -10984,6 +10984,7 @@ let meta = { description = "Perl extension to detect on which Linux distribution we are running"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; }; }; @@ -11000,6 +11001,7 @@ let meta = { description = "Linux specific special filehandles"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; }; }; @@ -11011,6 +11013,10 @@ let sha256 = "0crlxmaa4lsgdjm5p9ib8rdxiy70qj1s68za3q3v57v8ll6s4hfx"; }; propagatedBuildInputs = [ commonsense ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; }; ListAllUtils = buildPerlPackage { diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 6d2d7bed26..aab9f760db 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -4760,6 +4760,8 @@ in { pyaes = callPackage ../development/python-modules/pyaes { }; + pyaftership = callPackage ../development/python-modules/pyaftership { }; + pyairvisual = callPackage ../development/python-modules/pyairvisual { }; pyalgotrade = callPackage ../development/python-modules/pyalgotrade { };