diff options
Diffstat (limited to 'pkgs')
394 files changed, 8650 insertions, 6451 deletions
diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index bc626cbad1146..7dcc13eb96d53 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib , freetype, libX11, libXrandr, libXinerama, libXext, libXcursor -, fetchpatch +, fetchpatch, fmt , adlplugChip ? "-DADLplug_CHIP=OPL3" , pname ? "ADLplug" }: stdenv.mkDerivation rec { inherit pname; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jpcima"; repo = "ADLplug"; rev = "v${version}"; - sha256 = "0n9srdlgl1j528ap5xmllrqs1w6ibc5yf9sphvl1q9kjnizxrs2c"; + sha256 = "0mqx4bzri8s880v7jwd24nb93m5i3aklqld0b3h0hjnz0lh2qz0f"; fetchSubmodules = true; }; @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = [ adlplugChip ]; + cmakeFlags = [ adlplugChip "-DADLplug_USE_SYSTEM_FMT=ON" ]; buildInputs = [ libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext libXcursor ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig fmt ]; meta = with stdenv.lib; { description = "OPL3 and OPN2 FM Chip Synthesizer"; diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 5090ef6a2ec80..0c38057d56f8f 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -55,13 +55,13 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "6.0"; + version = "6.2"; # don't fetch releases from the GitHub mirror, they are broken src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - sha256 = "162jd96zahl05fdmjwvpdfjxbhd6ifbav6xqa0vv6rsdl4zk395q"; + sha256 = "17jxbqavricy01x4ymq6d302djsqfnv84m7dm4fd8cpka0dqjp1y"; }; patches = [ diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix index de0cae7a21a3a..458fe20937a63 100644 --- a/pkgs/applications/audio/bjumblr/default.nix +++ b/pkgs/applications/audio/bjumblr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BJumblr"; - version = "0.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; - rev = "v${version}"; - sha256 = "14z8113zkwykbhm1a8h2xs972dgifvlfij92b08jckyc7cbz84ys"; + rev = version; + sha256 = "03x1gvri9yk000fvvc8zvvywf38cc41vkyhhp9xby71b23n5wbn0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index f4028807ffc42..26cc8cd78da3e 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "cava"; - version = "0.7.1"; + version = "0.7.2"; buildInputs = [ alsaLib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "0p2g3xxl2n425bghs1qnff30jaj9cba94j2gbhgxmwaxhz26vbk7"; + sha256 = "1chc08spjf5i17n8y48aqzdxsj8vvf0r2l62ldw2pqgw60dacvs1"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix index c97c7cf1a2317..93c0b36bbb096 100644 --- a/pkgs/applications/audio/mellowplayer/default.nix +++ b/pkgs/applications/audio/mellowplayer/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "MellowPlayer"; - version = "3.6.4"; + version = "3.6.5"; src = fetchFromGitLab { owner = "ColinDuquesnoy"; repo = "MellowPlayer"; rev = version; - sha256 = "1ss7s3kal4vzhz7ld0yy2kvp1rk2w3i6fya0z3xd7nff9p31gqvw"; + sha256 = "1fnfqyy52hnh9vwq4rcndcqwh0zsm1sd3vi4h5gzaj4zbniq5v2f"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index c09b3f415d869..df3bf7c215b4f 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }: stdenv.mkDerivation rec { - name = "opusfile-0.11"; + name = "opusfile-0.12"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; - sha256 = "1gq3aszzl5glgbajw5p1f5a1kdyf23w5vjdmwwrk246syin9pkkl"; + sha256 = "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 57d27ee272c64..83952c271bec2 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "projectm"; - version = "3.1.3"; + version = "3.1.7"; src = fetchFromGitHub { owner = "projectM-visualizer"; repo = "projectM"; rev = "v${version}"; - sha256 = "1mjnahr694phksmvc069y89rv85s4l2z9fixkc3l1f5qj2vgn4sy"; + sha256 = "1wm5fym6c1yb972pmil7j9axinqqwrj68cwd2sc7ky8c5z2fsdna"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/real_time_config_quick_scan/default.nix b/pkgs/applications/audio/real_time_config_quick_scan/default.nix index 71ca8c142ad71..5193d2899d307 100644 --- a/pkgs/applications/audio/real_time_config_quick_scan/default.nix +++ b/pkgs/applications/audio/real_time_config_quick_scan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "realTimeConfigQuickScan"; - version = "unstable-2020-08-03"; + version = "unstable-2020-07-23"; src = fetchFromGitHub { owner = "raboof"; repo = pname; - rev = "4b482db17f8d8567ba0abf33459ceb5f756f088c"; - sha256 = "00l69gzwla9gjv5kpklgxlwnl48wnh8h6w0k8i69qr2cxigg4rhj"; + rev = "4697ba093d43d512b74a73b89531cb8c5adaa274"; + sha256 = "16kanzp5i353x972zjkwgi3m8z90wc58613mlfzb0n01djdnm6k5"; }; buildInputs = [ perlPackages.perl makeWrapper ]; @@ -16,28 +16,35 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' + runHook preInstall mkdir -p $out/bin - mkdir -p $out/share/doc + mkdir -p $out/share/$pname + mkdir -p $out/share/doc/$pname # Install Script Files: # *.pm files for i in *.pm; do - install -Dm 755 "$i" "$out/share/$i" + install -Dm 755 "$i" "$out/share/$pname/$i" done # Install doc files: - install -D COPYING "$out/share/doc/COPYING" - install -D README.md "$out/share/doc/README.md" + install -D COPYING "$out/share/doc/$pname/COPYING" + install -D README.md "$out/share/doc/$pname/README.md" # Install Executable scripts: install -Dm 755 realTimeConfigQuickScan.pl "$out/bin/realTimeConfigQuickScan" install -Dm 755 QuickScan.pl "$out/bin/QuickScan" + runHook postInstall + ''; + + postFixup = '' wrapProgram $out/bin/realTimeConfigQuickScan \ - --set PERL5LIB "$out/share" + --set PERL5LIB "$out/share/$pname" wrapProgram $out/bin/QuickScan \ - --set PERL5LIB "$out/share:${with perlPackages; makePerlPath [ Tk ]}" + --set PERL5LIB "$out/share/$pname:${with perlPackages; makePerlPath [ Tk ]}" ''; + meta = with stdenv.lib; { description = "Linux configuration checker for systems to be used for real-time audio"; homepage = "https://github.com/raboof/realtimeconfigquickscan"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux ; }; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index b0a50bbf128e9..2ebf56fee5219 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -1,18 +1,36 @@ -{ stdenv, fetchurl, pkgconfig, libsidplayfp }: +{ stdenv +, lib +, fetchurl +, pkgconfig +, libsidplayfp +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsaLib +, pulseSupport ? stdenv.hostPlatform.isLinux +, libpulseaudio +}: +assert alsaSupport -> alsaLib != null; +assert pulseSupport -> libpulseaudio != null; +let + inherit (lib) optional; + inherit (lib.versions) majorMinor; +in stdenv.mkDerivation rec { - version = "1.4.4"; pname = "sidplayfp"; + version = "2.0.2"; src = fetchurl { - url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${pname}-${version}.tar.gz"; - sha256 = "0arsrg3f0fsinal22qjmj3r6500bcbgqnx26fsz049ldl716kz1m"; + url = "mirror://sourceforge/sidplay-residfp/sidplayfp/${majorMinor version}/${pname}-${version}.tar.gz"; + sha256 = "1s2dfs9z1hwarpfzawg11wax9nh0zcqx4cafwq7iysckyg4scz4k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ optional alsaSupport alsaLib + ++ optional pulseSupport libpulseaudio; + buildInputs = [ libsidplayfp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A SID player using libsidplayfp"; homepage = "https://sourceforge.net/projects/sidplay-residfp/"; license = with licenses; [ gpl2Plus ]; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 25b8f9456a072..5eff8f82e89d0 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr }: +, alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr +, nixosTests }: let @@ -57,6 +58,8 @@ stdenv.mkDerivation rec { cp -r ../doc/* ../*.md $out/share/doc/snapcast ''; + passthru.tests.snapcast = nixosTests.snapcast; + meta = with lib; { description = "Synchronous multi-room audio player"; homepage = "https://github.com/badaix/snapcast"; diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 95adfd8001209..420e267aa82a4 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.21.10"; + version = "0.21.12"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1m210g6db8f09m66v75ia1fdd1dlvs1srgk2jhd3wqbvnmjqa77f"; + sha256 = "1mad3aqfwrxi06135nf8hv13d67nilmxpx4dw5vjcy1zi3lljj1j"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 255cb8aaeabbc..569a9b17045c7 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -2,7 +2,7 @@ , cmake, pkgconfig , boost, miniupnpc, openssl, unbound , zeromq, pcsclite, readline, libsodium, hidapi -, pythonProtobuf, randomx, rapidjson, libusb-compat-0_1 +, protobuf, randomx, rapidjson, libusb-compat-0_1 , CoreData, IOKit, PCSC }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { boost miniupnpc openssl unbound zeromq pcsclite readline libsodium hidapi randomx rapidjson - pythonProtobuf libusb-compat-0_1 + protobuf libusb-compat-0_1 ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index dec3c79550114..5f26fa23bc2ed 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -35,23 +35,30 @@ let gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]; + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + ar p $src data.tar.xz | tar xJ ./usr/ + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv usr/bin usr/share $out + rm -rf $out/share/lintian + + runHook postInstall + ''; + preFixup = '' gappsWrapperArgs+=( - --prefix "PATH" : "${gvfs}/bin" \ + --prefix "PATH" : "${gvfs}/bin" ) ''; - buildCommand = '' - mkdir -p $out/usr/ - ar p $src data.tar.xz | tar -C $out -xJ ./usr - sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/usr/share/applications/${pname}.desktop - mv $out/usr/* $out/ - rm -r $out/share/lintian - rm -r $out/usr/ - sed -i "s/${pname})/.${pname}-wrapped)/" $out/bin/${pname} - - fixupPhase - + postFixup = '' share=$out/share/${pname} patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ @@ -70,6 +77,8 @@ let ln -s ${pkgs.git}/bin/git $dugite/git/libexec/git-core/git find $share -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$share" {} \; + + sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/share/applications/${pname}.desktop ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 37d055e268522..0fb48203b2f21 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -1,6 +1,11 @@ { stdenv, fetchurl, lzip }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation (rec { name = "ed-${version}"; version = "1.16"; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 6a468bd67eb5e..16bc3c22cb4b4 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; - version = "2020.01.16"; + version = "2020.08.04"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; rev = "v${version}"; - sha256 = "16v6z1nzj54j19fraxhb18jdby4zfs1br91gxpg9s2s4nsk0km0b"; + sha256 = "1cgkis8bywy5k8k6j4i3prikpmhh1p6zyklliyxbc89mj64kvx4s"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; diff --git a/pkgs/applications/editors/lite/default.nix b/pkgs/applications/editors/lite/default.nix index d938edaa6e9ed..908ecf2bdd711 100644 --- a/pkgs/applications/editors/lite/default.nix +++ b/pkgs/applications/editors/lite/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "lite"; - version = "1.06"; + version = "1.11"; src = fetchFromGitHub { owner = "rxi"; repo = pname; rev = "v${version}"; - sha256 = "1lw4a6xv8pdlgwnhh870caij4iyzxdyjw4qmm4fswja9mbqkj32f"; + sha256 = "0wxqfb4ly8g7w5qph76xys95b55ackkags8jgd1nasmiyi8gcd5a"; }; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 0d54817c5340c..e56e7d9380732 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "03p7pic7hw9yxxv7fbgls1f42apx3lik2k6mpaz1a109ngyc5kaj"; + sha256 = "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"; }; patches = [ diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 716ec8d06aeed..0ac90a8b3454d 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -116,11 +116,14 @@ let in symlinkJoin { name = "neovim-${stdenv.lib.getVersion neovim}"; + # Remove the symlinks created by symlinkJoin which we need to perform + # extra actions upon postBuild = '' - # Remove the symlinks created by symlinkJoin which we need to perform - # extra actions upon - rm $out/share/applications/nvim.desktop $out/bin/nvim + rm $out/bin/nvim makeWrapper ${lib.escapeShellArgs initialMakeWrapperArgs} ${extraMakeWrapperArgs} + '' + + lib.optionalString stdenv.isLinux '' + rm $out/share/applications/nvim.desktop substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \ --replace 'Name=Neovim' 'Name=WrappedNeovim' diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index c5062ab725a81..4d1cf5dafb762 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "2.2.4"; + version = "2.5.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0xmnfqqdn7p84aksb8yzs14ikgy5driylr6m4p5ffsb6i9aa0i9h"; + sha256 = "0622mh46z3fi6zvipmgj8k4d4gj1c2781l10frk7wqq1sysjrxps"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 2216fe9199dbb..8da44a7a060b7 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-19"; - sha256 = "12ilfdbxllkaa3bs9z86d2nkklqz5c0l57kqj91l2ixjlvra64w0"; + version = "7.0.10-25"; + sha256 = "15y07kgy4mx3qyxsbd9g6s2yaa2mxnfvfzas35jw0vz6qjjyaw5c"; patches = []; }; in diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 22a58e81c97bf..f678e50f4d374 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.5.1"; + version = "13.5.7"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "00ggm867c5005qfm35qf8a94d87ln91irb1ir6012am2k5bn8c8p"; + sha256 = "1b2sb44zsa6g5nnsa7drn4fn61jfz3a3g3bisai85fyjff746ipc"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix new file mode 100644 index 0000000000000..d8ea4924318e7 --- /dev/null +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchFromGitHub, lazarus, fpc, pango, cairo, glib +, atk, gtk2, libX11, gdk-pixbuf, busybox, python3, makeWrapper }: + +with stdenv; + +let + bgrabitmap = fetchFromGitHub { + owner = "bgrabitmap"; + repo = "bgrabitmap"; + rev = "v11.1"; + sha256 = "0bcmiiwly4a7w8p3m5iskzvk8rz87qhc0gcijrdvwg87cafd88gz"; + }; + bgracontrols = fetchFromGitHub { + owner = "bgrabitmap"; + repo = "bgracontrols"; + rev = "v6.7.2"; + sha256 = "0cwxzv0rl6crkf6f67mvga5cn5pyhr6ksm8cqhpxjiqi937dnyxx"; + }; +in stdenv.mkDerivation rec { + pname = "lazpaint"; + version = "7.1.3"; + + src = fetchFromGitHub { + owner = "bgrabitmap"; + repo = "lazpaint"; + rev = "v${version}"; + sha256 = "1sfb5hmhzscz3nv4cmc192jimkg70l4z3q3yxkivhw1hwwsv9cbg"; + }; + + nativeBuildInputs = [ lazarus fpc makeWrapper ]; + + buildInputs = [ pango cairo glib atk gtk2 libX11 gdk-pixbuf ]; + + NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + + buildPhase = '' + cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap + cp -r --no-preserve=mode ${bgracontrols} bgracontrols + + lazbuild --lazarusdir=${lazarus}/share/lazarus \ + --build-mode=Release \ + bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ + bgracontrols/bgracontrols.lpk \ + lazpaintcontrols/lazpaintcontrols.lpk \ + lazpaint/lazpaint.lpi + ''; + + installPhase = '' + # Reuse existing install script + cd lazpaint/release/debian + substituteInPlace makedeb.sh --replace "rm -rf" "ls" + patchShebangs ./makedeb.sh + PATH=$PATH:${busybox}/bin ./makedeb.sh + cp -r staging/usr $out + + # Python is needed for scripts + makeWrapper $out/share/lazpaint/lazpaint $out/bin/lazpaint \ + --prefix PATH : ${stdenv.lib.makeBinPath [ python3 ]} + + substituteInPlace $out/share/applications/lazpaint.desktop \ + --replace /usr/share/pixmaps/lazpaint.png $out/share/pixmaps/lazpaint.png \ + --replace /usr/share/lazpaint/lazpaint $out/bin/lazpaint + ''; + + meta = with stdenv.lib; { + description = "Image editor like PaintBrush or Paint.Net"; + homepage = "https://sourceforge.net/projects/lazpaint/"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 8104b41374a99..ae7499022047d 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "nomacs"; - version = "3.15.1616"; + version = "3.16.224"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "0g1saqf31zncqdiwk7aaf951j3g33bg0vcjcr5mvg600jxiinw8j"; + sha256 = "05d4hqg0gl3g9s2xf1hr7mc7g4cqarcap4nzxxa51fsphw2b8x16"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 7e33769983d3c..4767ff3c84bfc 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -74,7 +74,7 @@ let akregator = callPackage ./akregator.nix {}; ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; - bovo = callPackage ./bovo.nix {}; + bovo = callPackage ./bovo.nix {}; bomber = callPackage ./bomber.nix {}; calendarsupport = callPackage ./calendarsupport.nix {}; dolphin = callPackage ./dolphin.nix {}; @@ -113,6 +113,7 @@ let kdialog = callPackage ./kdialog.nix {}; keditbookmarks = callPackage ./keditbookmarks.nix {}; kfind = callPackage ./kfind.nix {}; + kfloppy = callPackage ./kfloppy.nix {}; kgeography = callPackage ./kgeography.nix {}; kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; diff --git a/pkgs/applications/kde/kfloppy.nix b/pkgs/applications/kde/kfloppy.nix new file mode 100644 index 0000000000000..525520c159bdc --- /dev/null +++ b/pkgs/applications/kde/kfloppy.nix @@ -0,0 +1,20 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kxmlgui }: + +mkDerivation { + name = "kfloppy"; + meta = with lib; { + homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy"; + description = "KFloppy is a utility to format 3.5\" and 5.25\" floppy disks"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kdoctools + kcompletion + kxmlgui + ]; +} diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix index 1c7852fd19f65..e31e61d35ca30 100644 --- a/pkgs/applications/kde/messagelib.nix +++ b/pkgs/applications/kde/messagelib.nix @@ -5,7 +5,7 @@ grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts, kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo, - pimcommon, qca-qt5, qtwebengine, qtwebkit, syntax-highlighting + pimcommon, qca-qt5, qtwebengine, syntax-highlighting }: mkDerivation { @@ -18,7 +18,7 @@ mkDerivation { buildInputs = [ akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap - kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qca-qt5 qtwebkit + kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qca-qt5 syntax-highlighting ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 71404e7354768..e5121ce6e7d9a 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ArchiSteamFarm"; - version = "4.2.3.3"; + version = "4.2.3.6"; src = fetchurl { url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-generic.zip"; - sha256 = "0v69rrs5fr1n5llfx42xkiish52al7kb36fjy3ng0j9qfp3g8pj7"; + sha256 = "1a8baxrb8czndxxi16md1nyl2snfx215yvrygdpcblgngkp2z2y9"; }; nativeBuildInputs = [ unzip makeWrapper jq ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --run "[ -d config ] || cp --no-preserve=mode -r $dist/config ." \ --run "[ -d logs ] || cp --no-preserve=mode -r $dist/logs ." \ --run "[ -d plugins ] || cp --no-preserve=mode -r $dist/plugins ." \ - --run "[ -d www ] || ln -sf $dist/www ." + --run "ln -sf $dist/www ." ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index 4bc56f0c4526f..54c2ab48f6565 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -1,24 +1,30 @@ -{ clipnotify, makeWrapper, xsel, dmenu, utillinux, gawk, stdenv, fetchFromGitHub, lib }: +{ clipnotify, makeWrapper, xsel, dmenu, utillinux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }: let runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ]; in stdenv.mkDerivation rec { pname = "clipmenu"; - version = "6.0.1"; + version = "6.1.0"; src = fetchFromGitHub { owner = "cdown"; repo = "clipmenu"; rev = version; - sha256 = "0053j4i14lz5m2bzc5sch5id5ilr1bl196mp8fp0q8x74w3vavs9"; + sha256 = "0ddj5xcwrdb2qvrndvhv8j6swcqc8dvv5i00pqk35rfk5mrl4hwv"; }; - + + patches = [ + (fetchpatch { + url = "https://github.com/cdown/clipmenu/commit/443b58583ef216e2405e4a38d401f7c36386d21e.patch"; + sha256 = "12m4rpw7jbr31c919llbsmn8dcf7yh9aijln4iym6h2lylzqzzdz"; + }) + ]; + + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ xsel clipnotify ]; installPhase = '' - mkdir -p $out/bin - cp clipdel clipmenu clipmenud $out/bin - for bin in $out/bin/*; do wrapProgram "$bin" --prefix PATH : "${runtimePath}" done diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 2b42c6cc863ff..324c010b8b551 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.1.3"; + version = "7.1.4"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0i8f0rhs11wwx3cy37y9rv61rd451gg138zl8rndri1hdgsz148b"; + sha256 = "0a11hjwngm9i05wjx3qavf1zmlaz13dvhqm54ci4d27qrczywcyr"; }; installPhase = '' diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 8049f79af2d29..ef882ac9b952a 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.14.2"; + version = "1.14.3"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "14a8skaxc4xn2hm8ahp8lzrmwh1f3lbcibvhpprqr3szd6i2p0pf"; + sha256 = "0lyy48za81vfw4a5l7fsczsv889dk829nby941xvswp3scclpvfy"; }; doCheck = false; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 6515b3132d272..656cc6f69b953 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,20 +2,19 @@ let pname = "joplin-desktop"; - version = "1.0.216"; - desktopItem = makeDesktopItem { - name = "Joplin"; - exec = "joplin-desktop"; - type = "Application"; - desktopName = "Joplin"; - }; -in appimageTools.wrapType2 rec { + version = "1.0.233"; name = "${pname}-${version}"; + src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; - sha256 = "17rb7h98h9i2p5kw5gznx5swpz6yxqdxwc9x5cgbkc31vk10iszn"; + sha256 = "1fmk56b9b70ly1r471mhppr8fz1wm2gpxji1v760ynha8fqy7qg1"; }; + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 rec { + inherit name src; profile = '' export LC_ALL=C.UTF-8 @@ -25,9 +24,12 @@ in appimageTools.wrapType2 rec { multiPkgs = null; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications mv $out/bin/{${name},${pname}} + install -m 444 -D ${appimageContents}/joplin.desktop $out/share/applications/joplin.desktop + install -m 444 -D ${appimageContents}/joplin.png \ + $out/share/pixmaps/joplin.png + substituteInPlace $out/share/applications/joplin.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' ''; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 7f607de5ffcc3..ab8448f503d28 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: let pname = "josm"; - version = "16731"; + version = "16812"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0r94jcqciggjwjxfz5q3m81sx6cvh94hq5r9mpw44dvpnyfjj6p6"; + sha256 = "1ld0c87mhifbdnlrr7a9jmgn3s5xklzbpwcl1m6j1lc18ajs1awq"; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; - sha256 = "1ilcqy6ssi1jfnbw9nzpd4qlf2dmskfywy2lfm07y4w4gyjsp6w9"; + sha256 = "0vhawcgzh06k2dfqav28n3sv1ij1ziz6bgi4k7m0diix6ia7hlar"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 1819175012318..b1cdd5e86ea5a 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -136,6 +136,6 @@ buildPythonApplication rec { license = licenses.gpl3; changelog = "https://sw.kovidgoyal.net/kitty/changelog.html"; platforms = platforms.darwin ++ platforms.linux; - maintainers = with maintainers; [ tex rvolosatovs ma27 Luflosi ]; + maintainers = with maintainers; [ tex rvolosatovs Luflosi ]; }; } diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix index 9df4c59717cc0..6b23d1d0437f2 100644 --- a/pkgs/applications/misc/kondo/default.nix +++ b/pkgs/applications/misc/kondo/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kondo"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "tbillington"; repo = pname; rev = "v${version}"; - sha256 = "1rrg0xfm3vn5jh861r4ismrga673g7v6qnzl2v1haflgjhvdazwd"; + sha256 = "0kl2zn6ir3w75ny25ksgxl93vlyb13gzx2795zyimqqnsrdpbbrf"; }; - cargoSha256 = "1y7g8gw9hsm997d6i99c3dj2gb8y8cgws5001n85f9bpnlvvmf9y"; + cargoSha256 = "1ax81a2828z3yla1psg5xi8ild65m6zcsvx48ncz902mpzqlj92b"; meta = with stdenv.lib; { description = "Save disk space by cleaning unneeded files from software projects"; diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index f391c3621a1f4..52db4d0c6cc66 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "1j3jk76rd0sc9sd9zrd24q3636559wd809yfnb9bv5jmvn9s1bkz"; + sha256 = "1823nl9hgsa9l04ra1drj3c7r8s5ybx6c06d9ijpwqz191sz2jg2"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix new file mode 100644 index 0000000000000..e403ccea0da30 --- /dev/null +++ b/pkgs/applications/misc/navi/default.nix @@ -0,0 +1,29 @@ +{ rustPlatform, fetchFromGitHub, lib, fzf, makeWrapper }: + +rustPlatform.buildRustPackage rec { + pname = "navi"; + version = "2.7.1"; + + src = fetchFromGitHub { + owner = "denisidoro"; + repo = "navi"; + rev = "v${version}"; + sha256 = "12p9l41k7isaapr0xbsm7brkjrv7i8826y029i12psz92nsynk29"; + }; + + cargoSha256 = "11dc3gc7fyikbbgacmljhysr2sl7lmq6w3bsfcf2cqny39r25yp0"; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/navi --prefix PATH : ${lib.makeBinPath [ fzf ]} + ''; + + meta = with lib; { + description = "An interactive cheatsheet tool for the command-line and application launchers"; + homepage = "https://github.com/denisidoro/navi"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ cust0dian ]; + }; +} diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index b9529981c7ca3..f3dafb78bcaf9 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -1,31 +1,43 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig -, libuuid, cppunit, protobuf3_1, zlib, avahi, libmicrohttpd -, perl, python36 # Replace by python3 after the next update +{ stdenv +, fetchFromGitHub +, autoreconfHook +, bison +, flex +, pkgconfig +, libuuid +, cppunit +, protobuf +, zlib +, avahi +, libmicrohttpd +, perl +, python3 }: stdenv.mkDerivation rec { pname = "ola"; - version = "0.10.7"; + version = "unstable-2020-07-17"; src = fetchFromGitHub { owner = "OpenLightingProject"; repo = "ola"; - rev = version; - sha256 = "18krwrw7w1qzwih8gnmv7r4sah5ppvq7ax65r7l5yjxn3ihwp2kf"; + rev = "e2cd699c7792570500578fd092fb6bfb3d511023"; # HEAD of "0.10" branch + sha256 = "17a3z3zhx00rjk58icd3zlqfw3753f3y8bwy2sza0frdim09lqr4"; }; nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; - buildInputs = [ libuuid cppunit protobuf3_1 zlib avahi libmicrohttpd python36 ]; + buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ]; propagatedBuildInputs = [ - (python36.pkgs.protobuf.override { protobuf = protobuf3_1; }) - python36.pkgs.numpy + python3.pkgs.protobuf + python3.pkgs.numpy ]; configureFlags = [ "--enable-python-libs" ]; meta = with stdenv.lib; { description = "A framework for controlling entertainment lighting equipment."; - maintainers = [ maintainers.globin ]; + homepage = "https://www.openlighting.org/ola/"; + maintainers = with maintainers; [ globin ]; license = with licenses; [ lgpl21 gpl2Plus ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 05dc4c429b616..a95e5226f9bdf 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool +{ stdenv, fetchFromGitHub, fetchFromGitLab +, autoconf, automake, gettext, intltool , libtool, pkgconfig, wrapGAppsHook, wrapPython, gobject-introspection , gtk3, python, pygobject3, pyxdg @@ -18,11 +19,16 @@ let stdenv.mkDerivation rec { inherit pname version src meta; - patches = [ + patches = stdenv.lib.optionals (pname != "gammastep") [ # https://github.com/jonls/redshift/pull/575 ./575.patch ]; + postPatch = stdenv.lib.optionalString (pname == "gammastep") '' + substituteInPlace configure.ac \ + --replace "[gammastep], [2.0]" "[gammastep], [${version}]" + ''; + nativeBuildInputs = [ autoconf automake @@ -62,10 +68,15 @@ let # the geoclue agent may inspect these paths and expect them to be # valid without having the correct $PATH set - postInstall = '' + postInstall = if (pname == "gammastep") then '' + substituteInPlace $out/share/applications/gammastep.desktop \ + --replace 'Exec=gammastep' "Exec=$out/bin/gammastep" + substituteInPlace $out/share/applications/gammastep-indicator.desktop \ + --replace 'Exec=gammastep-indicator' "Exec=$out/bin/gammastep-indicator" + '' else '' substituteInPlace $out/share/applications/redshift.desktop \ --replace 'Exec=redshift' "Exec=$out/bin/redshift" - substituteInPlace $out/share/applications/redshift.desktop \ + substituteInPlace $out/share/applications/redshift-gtk.desktop \ --replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk" ''; @@ -118,4 +129,24 @@ rec { homepage = "https://github.com/minus7/redshift"; }; }; + + gammastep = mkRedshift rec { + pname = "gammastep"; + version = "2.0.1"; + + src = fetchFromGitLab { + owner = "chinstrap"; + repo = pname; + rev = "v${version}"; + sha256 = "1ky4h892sg2mfbwwq5xv0vnjflsl2x3nsy5q456r1kyk1gwkj0rg"; + }; + + meta = redshift.meta // { + name = "${pname}-${version}"; + longDescription = "Gammastep" + + stdenv.lib.removePrefix "Redshift" redshift.meta.longDescription; + homepage = "https://gitlab.com/chinstrap/gammastep"; + maintainers = [ stdenv.lib.maintainers.primeos ] ++ redshift.meta.maintainers; + }; + }; } diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 5c1cce192163a..b0722e18eeaad 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, openssl, qttools +{ stdenv, lib, fetchpatch, fetchFromGitHub, cmake, openssl, qttools , ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver , xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, avahi-compat , withGUI ? true, wrapQtAppsHook }: @@ -14,7 +14,14 @@ stdenv.mkDerivation rec { sha256 = "1jk60xw4h6s5crha89wk4y8rrf1f3bixgh5mzh3cq3xyrkba41gh"; }; - patches = [ ./build-tests.patch + patches = [ + ./build-tests.patch + (fetchpatch { + name = "CVE-2020-15117.patch"; + url = "https://github.com/symless/synergy-core/commit/" + + "0a97c2be0da2d0df25cb86dfd642429e7a8bea39.patch"; + sha256 = "03q8m5n50fms7fjfjgmqrgy9mrxwi9kkz3f3vlrs2x5h21dl6bmj"; + }) ] ++ lib.optional stdenv.isDarwin ./macos_build_fix.patch; # Since the included gtest and gmock don't support clang and the diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/applications/networking/browsers/amfora/default.nix index bbfef294ccaa4..d2d8de375a745 100644 --- a/pkgs/applications/networking/browsers/amfora/default.nix +++ b/pkgs/applications/networking/browsers/amfora/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "amfora"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "makeworld-the-better-one"; repo = "amfora"; rev = "v${version}"; - sha256 = "0bnjwsyi6l9p27rajwh0nq53zi4km7qpgyb08q17j0vd87gpdhka"; + sha256 = "1z4r1yqy5nkfa7yqcsqpqfdcghw8idryzb3s6d6ibca47r0qlcvw"; }; - vendorSha256 = "1rj2m3rg8ixclj5jr0nmp266vwj1mg5ampxn04i3wgaayy49dbdi"; + vendorSha256 = "0xj2s14dq10fwqqxjn4d8x6zljd5d15gjbja2gb75rfv09s4fdgv"; meta = with lib; { description = "A fancy terminal browser for the Gemini protocol"; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c74b7e25090db..2429baba4b366 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, llvmPackages_9, llvmPackages_10 -, makeWrapper, ed, gnugrep +, makeWrapper, ed, gnugrep, coreutils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire_0_2 @@ -196,7 +196,7 @@ in stdenv.mkDerivation { '' + '' # libredirect causes chromium to deadlock on startup - export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" + export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | ${coreutils}/bin/tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | ${coreutils}/bin/tr '\n' ':')" export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 2f86870ea8ae0..4ecdec77ddbb3 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -177,7 +177,8 @@ stdenv.mkDerivation ({ # included we need to look in a few places. # TODO: generalize this process for other use-cases. - BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ + BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-crt1-cflags) \ + $(< ${stdenv.cc}/nix-support/libc-cflags) \ $(< ${stdenv.cc}/nix-support/cc-cflags) \ $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ ${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \ diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index e4a6f63b01493..02390c081493a 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.119.1"; + version = "0.125.1"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "1j9b0xw59w5ailwa7dqgbsdigviw8ng5r4jbsk9b80izcig805zz"; + sha256 = "0ym9q1rww3r54czkrckdd1ahlym6n61l2563nmj48hkn5d4qxqbm"; }; - vendorSha256 = "11bw10s5wifzw2cy1100hyjv4xv7an7b05lcw6sphwyy56gsp2fy"; + vendorSha256 = "04mga3jc2c01daygjcn245mv30lc2ibax0mpb1wjk3s8lkl4cxcz"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index e4197a50ef154..e04d799248ef7 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -1,18 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub, go-bindata }: +{ lib, buildGoModule, fetchFromGitHub, go-bindata, installShellFiles }: buildGoModule rec { pname = "istioctl"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "0xga0vjr2nfbxwbawly8vg9vnpavxbmc1agg2a3cp1ncmzfrgpcx"; + sha256 = "0njchcb58lxk0cixk2rz4qj7b0zpp6zf3i5dda43j4hfsb37mifj"; }; - vendorSha256 = "15l9z2a8p46jvmkl0vvm6s196mlics0qgmpm3yq3bn6cqnybdsij"; + vendorSha256 = "0cc0lmjsxrn3f78k95wklf3yn5k7h8slwnwmssy1i1h0bkcg1bai"; - nativeBuildInputs = [ go-bindata ]; + nativeBuildInputs = [ go-bindata installShellFiles ]; # Bundle charts preBuild = '' @@ -28,10 +28,17 @@ buildGoModule rec { "istio.io/pkg/version.buildTag=${version}" "istio.io/pkg/version.buildHub=docker.io/istio" ]; - in ["-ldflags=${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; + in ["-ldflags=-s -w ${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; subPackages = [ "istioctl/cmd/istioctl" ]; + postInstall = '' + $out/bin/istioctl collateral --man --bash --zsh + installManPage *.1 + installShellCompletion istioctl.bash + installShellCompletion --zsh _istioctl + ''; + meta = with lib; { description = "Istio configuration command line utility for service operators to debug and diagnose their Istio mesh"; homepage = "https://istio.io/latest/docs/reference/commands/istioctl"; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 2f93d566d3571..c9b63b49d4240 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -1,24 +1,35 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: buildGoModule rec { pname = "jx"; - version = "2.1.90"; + version = "2.1.121"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "1m2gq1hh8fjgxwx2sipq56q5mlz0m3npnbsw103n2kq4xv1qf3f6"; + sha256 = "0bjpnh962w5wz4gj5my9g52dawxj8zccvpkxlxy1n7c3dkzjxx5j"; }; - vendorSha256 = "0kj6x7323fx1qhrlg789a21mh1fvhil7ng2fhmbmlwq0fcrngdnj"; + vendorSha256 = "0l9djgvnrgdnw7nsf05yq7qpzzzm3gasgh9a7dyc16pp2kxvza6k"; subPackages = [ "cmd/jx" ]; + nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = '' -ldflags= + -s -w -X github.com/jenkins-x/jx/pkg/version.Version=${version} - -X github.com/jenkins-x/jx/pkg/version.Revision=${version} + -X github.com/jenkins-x/jx/pkg/version.Revision=${src.rev} + -X github.com/jenkins-x/jx/pkg/version.GitTreeState=clean + ''; + + postInstall = '' + for shell in bash zsh; do + $out/bin/jx completion $shell > jx.$shell + installShellCompletion jx.$shell + done ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index 46fc928b2054e..c92b98d813948 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "1l5mpml6pf37b76wdq6il00k5q6rvw9ds7807m103k27p7pcqgdx"; + sha256 = "1pgv15zgv30dpv148bn6x0anv9q6x78y6ldmzarb9fbjpk6j0wxl"; }; - vendorSha256 = "1yb6dwbnimqfamdg57vq68q853fq04qfnh3sfbjg82sd8pz8069g"; + vendorSha256 = "0l8xdnv2m6byd5dwvs3zgcj1lsci7ax4xvx178a8a78sgkqalvmq"; postInstall = '' rm $out/bin/{mdtogo,formula} diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index c51e62b30b9bf..d967c741fca61 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kube-router"; - version = "1.0.0"; + version = "1.0.1"; goPackagePath = "github.com/cloudnativelabs/kube-router"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "0b6rsiq3pwp7wknmblgd8kszh9bd7nhvlsnyyamqnhlfjl97929x"; + sha256 = "00bypaccv8q9xdcz6vlvl1qxqxqssl21bs4nkd1a6q8b4jpl339z"; }; buildFlagsArray = '' diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 56fda026192ad..4ba54dbb8c71c 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.23.31"; + version = "0.23.32"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "1wpb749hc6pbmxcba1k4yrwcg8547rnsskxb45bzqyqyj1nj775s"; + sha256 = "1pa3k0hjdb5bj0bp4aj3lfcgz98l3wd9kfa12rn9zzbcmp087kih"; }; vendorSha256 = "1xn7c6y32vpanqvf1sfpw6bs73dbjniavjbf00j0vx83bfyklsr4"; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 18f154d3ff741..b852eb02feca1 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -4,13 +4,14 @@ with pythonPackages; buildPythonApplication rec { pname = "rss2email"; - version = "3.11"; + version = "3.12.1"; - propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ]; + propagatedBuildInputs = [ feedparser html2text ]; + checkInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "1vk5slp2mhmc1qj30igqkyq3z5h2bl1ayhafqrjapa6cg6rbvhrn"; + sha256 = "0zqpibh31rl6xlfw9y66d9hfhwrnzy5cjzbksczyw3lh4dfzsql0"; }; outputs = [ "out" "man" "doc" ]; @@ -39,7 +40,7 @@ buildPythonApplication rec { description = "A tool that converts RSS/Atom newsfeeds to email."; homepage = "https://pypi.python.org/pypi/rss2email"; license = licenses.gpl2; - maintainers = with maintainers; [ jb55 Profpatsch ]; + maintainers = with maintainers; [ jb55 Profpatsch ekleog ]; }; passthru.tests = { smoke-test = nixosTests.rss2email; diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/applications/networking/gopher/sacc/default.nix new file mode 100644 index 0000000000000..71726056a5544 --- /dev/null +++ b/pkgs/applications/networking/gopher/sacc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, ncurses +, patches ? [] # allow users to easily override config.def.h +}: + +stdenv.mkDerivation rec { + pname = "sacc"; + version = "1.01"; + + src = fetchgit { + url = "git://bitreich.org/sacc"; + rev = version; + sha256 = "0n6ghbi715m7hrxzqggx1bpqj8h7569s72b9bzk6m4gd29jaq9hz"; + }; + + inherit patches; + + buildInputs = [ ncurses ]; + + postPatch = '' + substituteInPlace config.mk \ + --replace curses ncurses \ + --replace "/usr/local" "$out" + ''; + + meta = with stdenv.lib; { + description = "A terminal gopher client"; + homepage = "gopher://bitreich.org/1/scm/sacc"; + license = licenses.isc; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index a79065a0f8a8a..b10e2ed1a1db3 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,30 +7,30 @@ in { pname = "discord"; binaryName = "Discord"; desktopName = "Discord"; - version = "0.0.10"; + version = "0.0.11"; src = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "0kx92i8naqr3algmyy3wyzbh8146z7gigxwf1nbpg1gl16wlplaq"; + sha256 = "1saqwigi1gjgy4q8rgnwyni57aaszi0w9vqssgyvfgzff8fpcx54"; }; }; ptb = callPackage ./base.nix rec { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; - version = "0.0.20"; + version = "0.0.21"; src = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "0wn2qdv0a4n59xl451y7fcq11klp2g63qwx40qkshllvnf5lzzsx"; + sha256 = "1i164wpi07d45w19i7l5hs47crc29k3plg4y9kc97x75rhh4xym1"; }; }; canary = callPackage ./base.nix rec { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.105"; + version = "0.0.106"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1jc2zr8q33ras5mkifg19kcxpb84vsqx01rj66w62hsjw1nsbidg"; + sha256 = "1bqlf7iixdy6c7lhbva4lizvhd6w0xqn69izxcy26wk35xcqgfh8"; }; }; }.${branch} diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 074dcc0fdb7c5..148e06fa88e58 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.2", + "version": "1.7.3", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -43,13 +43,10 @@ "electron-devtools-installer": "^2.2.4", "electron-notarize": "^0.2.0", "eslint": "7.3.1", - "eslint-config-google": "^0.7.1", "eslint-config-matrix-org": "^0.1.2", - "eslint-plugin-babel": "^4.1.2", "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "8.0.0", "mkdirp": "^1.0.3", "needle": "^2.5.0", "node-pre-gyp": "^0.15.0", diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index f9596f3a098c9..f1c5ff1bfd4fc 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -98,14 +98,6 @@ }; } { - name = "_babel_runtime___runtime_7.9.2.tgz"; - path = fetchurl { - name = "_babel_runtime___runtime_7.9.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz"; - sha1 = "d90df0583a3a252f09aaa619665367bae518db06"; - }; - } - { name = "_babel_template___template_7.10.4.tgz"; path = fetchurl { name = "_babel_template___template_7.10.4.tgz"; @@ -378,14 +370,6 @@ }; } { - name = "another_json___another_json_0.2.0.tgz"; - path = fetchurl { - name = "another_json___another_json_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz"; - sha1 = "b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"; - }; - } - { name = "ansi_align___ansi_align_2.0.0.tgz"; path = fetchurl { name = "ansi_align___ansi_align_2.0.0.tgz"; @@ -706,14 +690,6 @@ }; } { - name = "base_x___base_x_3.0.7.tgz"; - path = fetchurl { - name = "base_x___base_x_3.0.7.tgz"; - url = "https://registry.yarnpkg.com/base-x/-/base-x-3.0.7.tgz"; - sha1 = "1c5a7fafe8f66b4114063e8da102799d4e7c408f"; - }; - } - { name = "base64_js___base64_js_1.3.1.tgz"; path = fetchurl { name = "base64_js___base64_js_1.3.1.tgz"; @@ -802,22 +778,6 @@ }; } { - name = "browser_request___browser_request_0.3.3.tgz"; - path = fetchurl { - name = "browser_request___browser_request_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz"; - sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17"; - }; - } - { - name = "bs58___bs58_4.0.1.tgz"; - path = fetchurl { - name = "bs58___bs58_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz"; - sha1 = "be161e76c354f6f788ae4071f63f34e8c4f0a42a"; - }; - } - { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; path = fetchurl { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; @@ -1282,14 +1242,6 @@ }; } { - name = "content_type___content_type_1.0.4.tgz"; - path = fetchurl { - name = "content_type___content_type_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; - sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; - }; - } - { name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; path = fetchurl { name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; @@ -1906,14 +1858,6 @@ }; } { - name = "eslint_config_google___eslint_config_google_0.7.1.tgz"; - path = fetchurl { - name = "eslint_config_google___eslint_config_google_0.7.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.7.1.tgz"; - sha1 = "5598f8498e9e078420f34b80495b8d959f651fb2"; - }; - } - { name = "eslint_config_matrix_org___eslint_config_matrix_org_0.1.2.tgz"; path = fetchurl { name = "eslint_config_matrix_org___eslint_config_matrix_org_0.1.2.tgz"; @@ -1962,14 +1906,6 @@ }; } { - name = "eslint_plugin_babel___eslint_plugin_babel_4.1.2.tgz"; - path = fetchurl { - name = "eslint_plugin_babel___eslint_plugin_babel_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.1.2.tgz"; - sha1 = "79202a0e35757dd92780919b2336f1fa2fe53c1e"; - }; - } - { name = "eslint_plugin_babel___eslint_plugin_babel_5.3.1.tgz"; path = fetchurl { name = "eslint_plugin_babel___eslint_plugin_babel_5.3.1.tgz"; @@ -3698,14 +3634,6 @@ }; } { - name = "loglevel___loglevel_1.6.6.tgz"; - path = fetchurl { - name = "loglevel___loglevel_1.6.6.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz"; - sha1 = "0ee6300cc058db6b3551fa1c4bf73b83bb771312"; - }; - } - { name = "loose_envify___loose_envify_1.4.0.tgz"; path = fetchurl { name = "loose_envify___loose_envify_1.4.0.tgz"; @@ -3778,14 +3706,6 @@ }; } { - name = "matrix_js_sdk___matrix_js_sdk_8.0.0.tgz"; - path = fetchurl { - name = "matrix_js_sdk___matrix_js_sdk_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.0.tgz"; - sha1 = "78efb071ed1f6430553a9d6937d7bcfbae24cce8"; - }; - } - { name = "meant___meant_1.0.1.tgz"; path = fetchurl { name = "meant___meant_1.0.1.tgz"; @@ -4906,14 +4826,6 @@ }; } { - name = "qs___qs_6.9.1.tgz"; - path = fetchurl { - name = "qs___qs_6.9.1.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.9.1.tgz"; - sha1 = "20082c65cb78223635ab1a9eaca8875a29bf8ec9"; - }; - } - { name = "qs___qs_6.5.2.tgz"; path = fetchurl { name = "qs___qs_6.5.2.tgz"; @@ -5074,14 +4986,6 @@ }; } { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; - }; - } - { name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; path = fetchurl { name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; @@ -6098,14 +6002,6 @@ }; } { - name = "unhomoglyph___unhomoglyph_1.0.3.tgz"; - path = fetchurl { - name = "unhomoglyph___unhomoglyph_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.3.tgz"; - sha1 = "8d3551622b57754e10a831bf81442d7f15d1ddfd"; - }; - } - { name = "unique_filename___unique_filename_1.1.1.tgz"; path = fetchurl { name = "unique_filename___unique_filename_1.1.1.tgz"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index aa9541071af60..03990f166ae0b 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0wjr5pd25c31f2w48amqvfmd720ih8hfr1rzd8mljvqb1fbakry3"; + sha256 = "0vlh89kilnpg90kdxlikfak03zdwhwj754xskgb27jal0iaw0r8s"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 715eef4229ae2..66194d9d246da 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { description = "Jitsi Meet desktop application powered by Electron"; homepage = "https://github.com/jitsi/jitsi-meet-electron"; license = licenses.asl20; - maintainers = with maintainers; [ prusnak ]; + maintainers = teams.jitsi.members; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 4fb6b1852a42d..dad995b25578f 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { description = "Open Source Video Calls and Chat"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; []; + maintainers = teams.jitsi.members; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 781847a4fd8c8..90e2b201ebbe1 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.34.4"; # Please backport all updates to the stable channel. + version = "1.34.5"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0250ys1lvfl417n8z9w3z6vqflzdlg0sff8l7wbzhv87nnc9kzg9"; + sha256 = "1s8nksrkfivsf9r460ifxsf8l7bnc1zix5yj39kvnx0mbync8lg1"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index fbafd819f83df..bdcaf3bd6085f 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.62.0.85"; + version = "8.63.0.76"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -65,7 +65,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "0qlm2hbshxgycczv227bbj2fbiw3b76rp24mh8amhq4xbscazl38"; + sha256 = "0gmrk1giabr53imiwdflf6ykwpcj2q5zn3bynvrncnhivsbvaavy"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index bebafe4319323..777aabf021b70 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -41,7 +41,7 @@ let pname = "slack"; version = { x86_64-darwin = "4.8.0"; - x86_64-linux = "4.7.0"; + x86_64-linux = "4.8.0"; }.${system} or throwSystem; src = let @@ -53,7 +53,7 @@ let }; x86_64-linux = fetchurl { url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1nwyl70caaz9k0hccfpkjli0jjc6m9zbjb3nf4bwmykpbxbzr9w3"; + sha256 = "0q8qpz5nwhps7y5gq1bl8hjw7vsk789srrv39hzc7jrl8f1bxzk0"; }; }.${system} or throwSystem; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index c68a403639129..db5774038e474 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -175,7 +175,8 @@ stdenv.mkDerivation rec { # included we need to look in a few places. # TODO: generalize this process for other use-cases. - BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ + BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-crt1-cflags) \ + $(< ${stdenv.cc}/nix-support/libc-cflags) \ $(< ${stdenv.cc}/nix-support/cc-cflags) \ $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ ${ diff --git a/pkgs/applications/networking/openbazaar/client.nix b/pkgs/applications/networking/openbazaar/client.nix index 07f374097f245..f011f9aef4ea9 100644 --- a/pkgs/applications/networking/openbazaar/client.nix +++ b/pkgs/applications/networking/openbazaar/client.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "openbazaar-client"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; - sha256 = "1p190az8llqh3089aygwash10wqqqfnjl2wvksn6bvx5wm5dpg1p"; + sha256 = "04wwljaiqm8rsdrzngqrzrjzfrjsrfsaa60c904zhbhmsqc7y4f1"; }; dontBuild = true; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 5abee0108ec30..23a0c76026cbe 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring , makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib -, libpulseaudio, libopus, libogg, jansson }: +, libpulseaudio, libopus, libogg, jansson, libsodium }: stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "0zhz3dd4mr6k7wlcxw2xclq8p8l4ia5nlg78dylyz6lbz96h2lsm"; + sha256 = "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3"; }; enableParallelBuilding = true; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool makeWrapper ]; buildInputs = [ adns curl gmp gnutls libextractor libgcrypt libgnurl libidn - libmicrohttpd libunistring libxml2 ncurses gettext + libmicrohttpd libunistring libxml2 ncurses gettext libsodium sqlite zlib libpulseaudio libopus libogg jansson ]; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { homepage = "https://gnunet.org/"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ pstn vrthra ]; platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix new file mode 100644 index 0000000000000..d7c15889fec73 --- /dev/null +++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl +, gnome3 +, gnunet +, gnutls +, gtk3 +, libextractor +, libgcrypt +, libxml2 +, pkg-config +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "gnunet-gtk"; + inherit (gnunet) version; + + src = fetchurl { + url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; + sha256 = "1zdzgq16h77w6ybwg3lqjsjr965np6iqvncqvkbj07glqd4wss0j"; + }; + + nativeBuildInputs= [ + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gnome3.glade + gnunet + gnutls + gtk3 + libextractor + libgcrypt + libxml2 + ]; + + patchPhase = "patchShebangs pixmaps/icon-theme-installer"; + + meta = gnunet.meta // { + description = "GNUnet GTK User Interface"; + homepage = "https://git.gnunet.org/gnunet-gtk.git"; + }; +} diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 4af8e526cd2c5..8489b414cbc59 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ettercap"; - version = "0.8.3"; + version = "0.8.3.1"; src = fetchFromGitHub { owner = "Ettercap"; repo = "ettercap"; rev = "v${version}"; - sha256 = "0m40bmbrv9a8qlg54z3b5f8r541gl9vah5hm0bbqcgyyljpg39bz"; + sha256 = "1sdf1ssa81ib6k0mc5m2jzbjl4jd1yv6ahv5dwx2x9w4b2pyqg1c"; }; strictDeps = true; diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index ff284da3ce856..c1d459a2df584 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "elementary-planner"; - version = "2.4.5"; + version = "2.4.6"; src = fetchFromGitHub { owner = "alainm23"; repo = "planner"; rev = version; - sha256 = "0jj901b2v4vfgv0i7d02xhhylfh6rcanaybk52i7ci92ff2gzgcb"; + sha256 = "0z0997yq809wbsk3w21xv4fcrgqcb958qdlksf4rhzhfnwbiii6y"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix new file mode 100644 index 0000000000000..30d1e3dbac5d1 --- /dev/null +++ b/pkgs/applications/office/gtg/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, fetchFromGitHub +, meson +, python3Packages +, ninja +, gtk3 +, wrapGAppsHook +, glib +, itstool +, gettext +, pango +, gdk-pixbuf +, gobject-introspection +}: + +python3Packages.buildPythonApplication rec { + pname = "gtg"; + version = "unstable-2020-08-02"; + + src = fetchFromGitHub { + owner = "getting-things-gnome"; + repo = "gtg"; + rev = "6623731f301c1b9c7b727e009f4a6462ad381c68"; + sha256 = "14gxgg4nl0ki3dn913041jpyfhxsj90fkd55z6mmpyklhr8mwss1"; + }; + + + nativeBuildInputs = [ + meson + ninja + itstool + gettext + wrapGAppsHook + gobject-introspection + ]; + + buildInputs = [ + glib + gtk3 + pango + gdk-pixbuf + ]; + + propagatedBuildInputs = with python3Packages; [ + pycairo + pygobject3 + lxml + dbus-python + gst-python + liblarch + ]; + + format = "other"; + strictDeps = false; # gobject-introspection does not run with strictDeps (https://github.com/NixOS/nixpkgs/issues/56943) + + meta = with stdenv.lib; { + description = " A personal tasks and TODO-list items organizer."; + longDescription = '' + "Getting Things GNOME" (GTG) is a personal tasks and ToDo list organizer inspired by the "Getting Things Done" (GTD) methodology. + GTG is intended to help you track everything you need to do and need to know, from small tasks to large projects. + ''; + homepage = "https://wiki.gnome.org/Apps/GTG"; + downloadPage = "https://github.com/getting-things-gnome/gtg/releases"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ oyren ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 6ac092f27e2b7..a0a558f5ed8e1 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -1,37 +1,48 @@ -{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python +{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python , texinfo, gnused, usePython ? true }: stdenv.mkDerivation rec { pname = "ledger"; - version = "3.1.3"; + version = "3.2.1"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger"; rev = "v${version}"; - sha256 = "0bfnrqrd6wqgsngfpqi30xh6yy86pwl25iwzrqy44q31r0zl4mm3"; + sha256 = "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ (boost.override { enablePython = usePython; }) - gmp mpfr libedit python texinfo gnused + gmp mpfr libedit python gnused ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake texinfo ]; enableParallelBuilding = true; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_DOCS:BOOL=ON" - (stdenv.lib.optionalString usePython "-DUSE_PYTHON=true") - ]; + (lib.optionalString usePython "-DUSE_PYTHON=true") + ] ++ lib.optionals (usePython && stdenv.isDarwin) [ + # Fix python lookup on Darwin. Not necessary after + # https://github.com/NixOS/nixpkgs/pull/94090 lands in master + "-DPython_ROOT_DIR=${python}" + ]; - postBuild = '' - make doc + # by default, it will query the python interpreter for it's sitepackages location + # however, that would write to a different nixstore path, pass our own sitePackages location + prePatch = lib.optionalString usePython '' + substituteInPlace src/CMakeLists.txt \ + --replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${python.sitePackages}"' ''; - meta = with stdenv.lib; { + installTargets = [ "doc" "install" ]; + + meta = with lib; { homepage = "https://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; license = licenses.bsd3; diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 7cadceab56114..d4a7d8372e892 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "limesuite"; - version = "20.01.0"; + version = "20.07.1"; src = fetchFromGitHub { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "01z4idcby2lm34bbnpbp400ski7p61jjiir6sy6dalnvsl52m7vx"; + sha256 = "14mxqc350j3rk1202n0ax1rfx49sy40965zj90d4pnakbgz5xr7g"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix index ed94693db41fe..b49debdb1af0b 100644 --- a/pkgs/applications/radio/soapyremote/default.nix +++ b/pkgs/applications/radio/soapyremote/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, soapysdr, avahi }: let - version = "0.5.1"; + version = "0.5.2"; in stdenv.mkDerivation { pname = "soapyremote"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapyRemote"; rev = "soapy-remote-${version}"; - sha256 = "1qlpjg8mh564q26mni8g6bb8w9nj7hgcq86278fszxpwpnk3jsvk"; + sha256 = "124sy9v08fm51ds1yzrxspychn34y0rl6y48mzariianazvzmfax"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index e6bcb4470bbd1..99bac0c4b7a59 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.23.1"; + version = "2.23.3"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "1g4539x2081jgrbn207nsimpq9q5izd4z6cx7s8lr8p8ab8spbmk"; + sha256 = "08wgi0hijfbchr2srmndxq3h2fijvyvr8b6zv680fpcjixm5bbhf"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/applications/science/electronics/csxcad/default.nix new file mode 100644 index 0000000000000..adc6a60be8532 --- /dev/null +++ b/pkgs/applications/science/electronics/csxcad/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, fetchFromGitHub +, cmake +, fparser +, tinyxml +, hdf5 +, cgal_5 +, vtk +, boost +, gmp +, mpfr +}: + +stdenv.mkDerivation rec { + pname = "csxcad"; + version = "unstable-2020-02-08"; + + src = fetchFromGitHub { + owner = "thliebig"; + repo = "CSXCAD"; + rev = "ef6e40931dbd80e0959f37c8e9614c437bf7e518"; + sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb"; + }; + + patches = [./searchPath.patch ]; + + buildInputs = [ + cgal_5 + boost + gmp + mpfr + vtk + fparser + tinyxml + hdf5 + ]; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A C++ library to describe geometrical objects"; + homepage = "https://github.com/thliebig/CSXCAD"; + license = licenses.lgpl3; + maintainers = with maintainers; [ matthuszagh ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/electronics/csxcad/searchPath.patch b/pkgs/applications/science/electronics/csxcad/searchPath.patch new file mode 100644 index 0000000000000..2fc0d77b3202b --- /dev/null +++ b/pkgs/applications/science/electronics/csxcad/searchPath.patch @@ -0,0 +1,11 @@ +--- CSXCAD/matlab/searchBinary.m 2019-07-14 09:24:02.154291745 -0700 ++++ CSXCAD/matlab/searchBinary.m 2019-07-14 09:20:20.900248280 -0700 +@@ -33,7 +33,7 @@ + + % try all search paths + for n=1:numel(searchpath) +- binary_location = [searchpath{n} name]; ++ binary_location = [searchpath{n} filesep name]; + if exist(binary_location, 'file') + return + end diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index a0442db7fed28..275100ac7fd48 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig +{ mkDerivation, stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig , qtbase, qtsvg, qtserialport, boost, libgit2 }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "fritzing"; version = "0.9.3b"; diff --git a/pkgs/applications/science/electronics/hyp2mat/default.nix b/pkgs/applications/science/electronics/hyp2mat/default.nix new file mode 100644 index 0000000000000..1fa2c23b56988 --- /dev/null +++ b/pkgs/applications/science/electronics/hyp2mat/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchFromGitHub +, bison +, flex +, gengetopt +, help2man +, groff +, libharu +, autoreconfHook +, pkgconfig +, libpng +, zlib +}: + +stdenv.mkDerivation rec { + pname = "hyp2mat"; + version = "0.0.17"; + + src = fetchFromGitHub { + owner = "koendv"; + repo = "hyp2mat"; + rev = "v${version}"; + sha256 = "04bd2vrn8y1izir7pwl34a60cg2v05baqcrmpfdx5fvf33bbflaj"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + libharu + libpng + zlib + bison + flex + gengetopt + help2man + groff + ]; + + configureFlags = [ "--enable-library" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Import Hyperlynx Boardsim files to openEMS, an open source 3D full-wave electromagnetic field solver"; + homepage = https://github.com/koendv/hyp2mat; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ matthuszagh ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index a10b34e0a6093..51dc5fffdec8a 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -5,7 +5,7 @@ # - The exact version can be specified through the `version` argument to # the derivation; it defaults to the latest stable version. -{ stdenv, fetchFromGitHub, writeText, pkgconfig +{ stdenv, fetchFromGitHub, writeText, pkgconfig, gnumake42 , ocamlPackages, ncurses , buildIde ? !(stdenv.isDarwin && stdenv.lib.versionAtLeast version "8.10") , glib, gnome3, wrapGAppsHook @@ -107,7 +107,9 @@ self = stdenv.mkDerivation { inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ stdenv.lib.optional (!versionAtLeast "8.6") gnumake42 + ; buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ] ++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5 ++ [ ocamlPackages.num ] diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 886ecdb76cebc..224795f2a6666 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.16.5"; + version = "3.18.4"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0s1ay6qgpkxhygfbfrl1cw2pd8bpgw2dw71rzhza20ndqwk8nqs5"; + sha256 = "1pmc2wi1pa346w89ayrrjv9xk6v6myg2zmx1wj4pd9qxv7ivrbsn"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix new file mode 100644 index 0000000000000..80fc8127cd2f0 --- /dev/null +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, installShellFiles +, blas +, gfortran +, lapack +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "finalfusion-utils"; + version = "0.11.2"; + + src = fetchFromGitHub { + owner = "finalfusion"; + repo = pname; + rev = version; + sha256 = "1y2ik3qj2wbjnnk7bbglwbvyvbm5zfk7mbd1gpxg4495nzlf2jhf"; + }; + + cargoSha256 = "19yay31f76ns1d6b6k9mgw5mrl8zg69y229ca6ssyb2z82gyhsnw"; + + # Enables build against a generic BLAS. + cargoBuildFlags = [ + "--features" + "netlib" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ + blas + gfortran.cc.lib + lapack + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; + + postInstall = '' + # Install shell completions + for shell in bash fish zsh; do + $out/bin/finalfusion completions $shell > finalfusion.$shell + done + installShellCompletion finalfusion.{bash,fish,zsh} + ''; + + meta = with stdenv.lib; { + description = "Utility for converting, quantizing, and querying word embeddings"; + homepage = "https://github.com/finalfusion/finalfusion-utils/"; + license = licenses.asl20; + maintainers = with maintainers; [ danieldk ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 2d103f627454f..a8928433c349b 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "0y3gkan5v0d6637yf5p5a9dklyv5zngw7a8pyqzj4ixys72ixg20"; + sha256 = "1i4ddz2fivn5h35059b68z3lfw48psak79aab6pk7d8iamz4njb9"; }; - cargoSha256 = "15sh2lsc16nf9w7sp3avy77f4vyj0rdsm6m1bn60y8gmv2r16v6i"; + cargoSha256 = "1na6wqjm69diwhkyxlzk0jm3qwkdrah3w6i8p7dhzrsx434lhmya"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 5686b1c6f3f5c..e370fcd5b4242 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.27.0"; + version = "2.28.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1ybk39ylvs32lywq7ra4l2kdr5izc80r9461hwfnw8pssxs9gjkk"; + sha256 = "17a311vzimqn1glc9d7x82rhb1mb81m5rr4g8xji8idaafid39fz"; }; outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc"; diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 33048c95b670d..b0e14859eeddd 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.1.3"; + version = "1.2.2"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "16s09d2kpw0v0kyr2ada99qmsi0pqnsiis22mzq69hay0hdg8p1n"; + sha256 = "1kspz2fhryyjhn6gqf029rv0386a1ga08sf6g0l6smivw628k71l"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 3c46db6352e86..07af9341646aa 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,53 +1,56 @@ -{ stdenv, fetchurl, itstool, python3, intltool, wrapGAppsHook -, libxml2, gobject-introspection, gtk3, gtksourceview, gnome3 -, gsettings-desktop-schemas, dbus, xvfb_run +{ stdenv +, fetchurl +, gettext +, itstool +, python3 +, meson +, ninja +, wrapGAppsHook +, libxml2 +, pkg-config +, desktop-file-utils +, gobject-introspection +, gtk3 +, gtksourceview4 +, gnome3 +, gsettings-desktop-schemas }: python3.pkgs.buildPythonApplication rec { pname = "meld"; - version = "3.20.2"; + version = "3.21.0"; + + format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0a0x156zr3w2yg0rnhwy39giy3xnfm6sqcfa4xcw4i6ahvwqa2dc"; + sha256 = "toARTVq3kzJFSf1Y9OsgLY4oDAYzoLdl7ebfs0FgqBs="; }; nativeBuildInputs = [ - intltool itstool libxml2 gobject-introspection wrapGAppsHook + meson + ninja + gettext + itstool + libxml2 + pkg-config + desktop-file-utils + gobject-introspection + wrapGAppsHook ]; + buildInputs = [ - gtk3 gtksourceview gsettings-desktop-schemas gnome3.adwaita-icon-theme + gtk3 + gtksourceview4 + gsettings-desktop-schemas + gnome3.adwaita-icon-theme gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now ]; - propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ]; - checkInputs = [ xvfb_run python3.pkgs.pytest dbus gtksourceview gtk3 ]; - - installPhase = '' - runHook preInstall - ${python3.interpreter} setup.py install --prefix=$out - runHook postInstall - ''; - - checkPhase = '' - runHook preCheck - - # Unable to create user data directory '/homeless-shelter/.local/share' for storing the recently used files list: Permission denied - mkdir test-home - export HOME=$(pwd)/test-home - # GLib.GError: gtk-icon-theme-error-quark: Icon 'meld-change-apply-right' not present in theme Adwaita - export XDG_DATA_DIRS="$out/share:$XDG_DATA_DIRS" - - # ModuleNotFoundError: No module named 'meld' - export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH - - # Gtk-CRITICAL **: gtk_icon_theme_get_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - py.test - - runHook postCheck - ''; + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + pycairo + ]; passthru = { updateScript = gnome3.updateScript { @@ -58,7 +61,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "Visual diff and merge tool"; homepage = "http://meldmerge.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ jtojnar mimame ]; }; diff --git a/pkgs/applications/video/obs-studio/wlrobs.nix b/pkgs/applications/video/obs-studio/wlrobs.nix index 77ef09d3c24d2..99486a9ccc0c3 100644 --- a/pkgs/applications/video/obs-studio/wlrobs.nix +++ b/pkgs/applications/video/obs-studio/wlrobs.nix @@ -13,12 +13,12 @@ assert dmabufSupport -> libdrm != null && libGL != null; stdenv.mkDerivation { pname = "obs-wlrobs"; - version = "20200111"; + version = "20200622"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wlrobs"; - rev = "8345bf985e390896d89e35e2feae1fa37722f4be"; - sha256 = "0j01wkhwhhla4qx8mwyrq2qj9cfhxksxaq2k8rskmy2qbdkvvdpb"; + rev = "1d3acaaf64049da3da9721aa8b9b47582fe0081b"; + sha256 = "0qrcf8024r4ynfjw0zx8vn59ygx9q5rb196s6nyxmy3gkv2lfxlq"; }; buildInputs = [ libX11 libGL libdrm meson ninja pkgconfig wayland obs-studio ]; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index bae218d1cad74..3ee0193b0892e 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "1jqdv3kij2q97qn4niqxxgfva9ajr4wjgx40qk5yhs01d3g0qgmd"; + sha256 = "0rnli16nh5m3a8jjkkm1k4f896yk1k1rg48rjiajqhfrr98qwr0f"; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index a8d63a0ca40c1..ecd282d6f7d98 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -14,13 +14,13 @@ buildGoPackage rec { pname = "runc"; - version = "1.0.0-rc91"; + version = "1.0.0-rc92"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "1hg3hbbjsz76q1piz86q8la6dym86d65xd7h6q12krfmwd2lbhkw"; + sha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94"; }; goPackagePath = "github.com/opencontainers/runc"; diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 52f5228104376..7c7bdbe22a784 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "bspwm"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "baskerville"; repo = "bspwm"; rev = version; - sha256 = "1i7crmljk1vra1r6alxvj6lqqailjjcv0llyg7a0gm23rbv4a42g"; + sha256 = "0qlv7b4c2mmjfd65y100d11x8iqyg5f6lfiws3cgmpjidhdygnxc"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 3888e10f25856..b37a83648ae55 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.18.1"; + version = "4.18.2"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0z709cianlzw0x0qwq4361347354xd9ckj1v7vjvhb1zh3x91gws"; + sha256 = "030jym6b8b07yf4y6pb806hg8k77zsprv569gy0r72rh5zb1g1mj"; }; nativeBuildInputs = [ which pkgconfig makeWrapper installShellFiles ]; diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index bdee6688a7407..9e1aacfaf8239 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation { nm -an "$libblas" | cut -f3 -d' ' > symbols for symbol in ${toString blasFortranSymbols}; do - grep "^$symbol_$" symbols || { echo "$symbol" was not found in "$libblas"; exit 1; } + grep -q "^$symbol_$" symbols || { echo "$symbol" was not found in "$libblas"; exit 1; } done cp -L "$libblas" $out/lib/libblas${canonicalExtension} diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 04be3f408ee1b..94589131b70ed 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -33,10 +33,14 @@ NIX_CFLAGS_COMPILE_@suffixSalt@="-B@out@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@" # Export and assign separately in order that a failing $(..) will fail # the script. -if [ -e @out@/nix-support/libc-cflags ]; then +if [[ "$cInclude" = 1 ]] && [ -e @out@/nix-support/libc-cflags ]; then NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" fi +if [ -e @out@/nix-support/libc-crt1-cflags ]; then + NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/libc-crt1-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" +fi + if [ -e @out@/nix-support/libcxx-cxxflags ]; then NIX_CXXSTDLIB_COMPILE_@suffixSalt@+=" $(< @out@/nix-support/libcxx-cxxflags)" fi diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 3f9f099f3bc1f..7e734f57773ee 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -17,16 +17,6 @@ fi source @out@/nix-support/utils.bash -# Flirting with a layer violation here. -if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then - source @bintools@/nix-support/add-flags.sh -fi - -# Put this one second so libc ldflags take priority. -if [ -z "${NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then - source @out@/nix-support/add-flags.sh -fi - # Parse command line options and set several variables. # For instance, figure out if linker flags should be passed. @@ -37,6 +27,7 @@ cc1=0 # shellcheck disable=SC2193 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 cppInclude=1 +cInclude=1 expandResponseParams "$@" declare -i n=0 @@ -63,6 +54,7 @@ while (( "$n" < "$nParams" )); do elif [ "$p" = -nostdlib ]; then isCpp=-1 elif [ "$p" = -nostdinc ]; then + cInclude=0 cppInclude=0 elif [ "$p" = -nostdinc++ ]; then cppInclude=0 @@ -111,6 +103,15 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then params=(${rest+"${rest[@]}"}) fi +# Flirting with a layer violation here. +if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then + source @bintools@/nix-support/add-flags.sh +fi + +# Put this one second so libc ldflags take priority. +if [ -z "${NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then + source @out@/nix-support/add-flags.sh +fi # Clear march/mtune=native -- they bring impurity. if [ "$NIX_ENFORCE_NO_NATIVE_@suffixSalt@" = 1 ]; then diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 1fef3c4590862..c2a06219f1d3d 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -287,7 +287,7 @@ stdenv.mkDerivation { + optionalString (libc != null) ('' touch "$out/nix-support/libc-cflags" touch "$out/nix-support/libc-ldflags" - echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-cflags + echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags '' + optionalString (!(cc.langD or false)) '' echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags '' + optionalString (isGNU && (!(cc.langD or false))) '' @@ -429,7 +429,7 @@ stdenv.mkDerivation { + optionalString (libc != null && targetPlatform.isAvr) '' for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do - echo "-B${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags + echo "-B${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-crt1-cflags done '' diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix new file mode 100644 index 0000000000000..5a87893d9726f --- /dev/null +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix @@ -0,0 +1,175 @@ +{ stdenv +, lib +, makeSetupHook +, makeWrapper +, gobject-introspection +, gtk3 +, librsvg +, dconf +, callPackage +, wrapGAppsHook +, writeTextFile +}: + +makeSetupHook { + deps = lib.optionals (!stdenv.isDarwin) [ + # It is highly probable that a program will use GSettings, + # at minimum through GTK file chooser dialogue. + # Let’s add a GIO module for “dconf” GSettings backend + # to avoid falling back to “memory” backend. This is + # required for GSettings-based settings to be persisted. + # Unfortunately, it also requires the user to have dconf + # D-Bus service enabled globally (e.g. through a NixOS module). + dconf.lib + ] ++ [ + # TODO: remove this, packages should depend on GTK explicitly. + gtk3 + + # librsvg provides a module for gdk-pixbuf to allow rendering + # SVG icons. Most icon themes are SVG-based and so are some + # graphics in GTK (e.g. cross for closing window in window title bar) + # so it is pretty much required for applications using GTK. + librsvg + + # We use the wrapProgram function. + makeWrapper + ]; + substitutions = { + passthru.tests = let + sample-project = ./tests/sample-project; + + testLib = callPackage ./tests/lib.nix { }; + inherit (testLib) expectSomeLineContainingYInFileXToMentionZ; + in rec { + # Simple derivation containing a program and a daemon. + basic = stdenv.mkDerivation { + name = "basic"; + + src = sample-project; + + nativeBuildInputs = [ wrapGAppsHook ]; + + installFlags = [ "bin-foo" "libexec-bar" ]; + }; + + # The wrapper for executable files should add path to dconf GIO module. + basic-contains-dconf = let + tested = basic; + in testLib.runTest "basic-contains-dconf" ( + testLib.skip stdenv.isDarwin '' + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GIO_EXTRA_MODULES=" "${dconf.lib}/lib/gio/modules"} + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GIO_EXTRA_MODULES=" "${dconf.lib}/lib/gio/modules"} + '' + ); + + # Simple derivation containing a gobject-introspection typelib. + typelib-Mahjong = stdenv.mkDerivation { + name = "typelib-Mahjong"; + + src = sample-project; + + installFlags = [ "typelib-Mahjong" ]; + }; + + # Simple derivation using a typelib. + typelib-user = stdenv.mkDerivation { + name = "typelib-user"; + + src = sample-project; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + typelib-Mahjong + ]; + + installFlags = [ "bin-foo" "libexec-bar" ]; + }; + + # Testing cooperation with gobject-introspection setup hook, + # which should populate GI_TYPELIB_PATH variable with paths + # to typelibs among the derivation’s dependencies. + # The resulting GI_TYPELIB_PATH should be picked up by the wrapper. + typelib-user-has-gi-typelib-path = let + tested = typelib-user; + in testLib.runTest "typelib-user-has-gi-typelib-path" '' + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GI_TYPELIB_PATH=" "${typelib-Mahjong}/lib/girepository-1.0"} + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GI_TYPELIB_PATH=" "${typelib-Mahjong}/lib/girepository-1.0"} + ''; + + # Simple derivation containing a gobject-introspection typelib in lib output. + typelib-Bechamel = stdenv.mkDerivation { + name = "typelib-Bechamel"; + + outputs = [ "out" "lib" ]; + + src = sample-project; + + makeFlags = [ + "LIBDIR=${placeholder "lib"}/lib" + ]; + + installFlags = [ "typelib-Bechamel" ]; + }; + + # Simple derivation using a typelib from non-default output. + typelib-multiout-user = stdenv.mkDerivation { + name = "typelib-multiout-user"; + + src = sample-project; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + typelib-Bechamel + ]; + + installFlags = [ "bin-foo" "libexec-bar" ]; + }; + + # Testing cooperation with gobject-introspection setup hook, + # which should populate GI_TYPELIB_PATH variable with paths + # to typelibs among the derivation’s dependencies, + # even when they are not in default output. + # The resulting GI_TYPELIB_PATH should be picked up by the wrapper. + typelib-multiout-user-has-gi-typelib-path = let + tested = typelib-multiout-user; + in testLib.runTest "typelib-multiout-user-has-gi-typelib-path" '' + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GI_TYPELIB_PATH=" "${typelib-Bechamel.lib}/lib/girepository-1.0"} + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GI_TYPELIB_PATH=" "${typelib-Bechamel.lib}/lib/girepository-1.0"} + ''; + + # Simple derivation that contains a typelib as well as a program using it. + typelib-self-user = stdenv.mkDerivation { + name = "typelib-self-user"; + + src = sample-project; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + installFlags = [ "typelib-Cow" "bin-foo" "libexec-bar" ]; + }; + + # Testing cooperation with gobject-introspection setup hook, + # which should add the path to derivation’s own typelibs + # to GI_TYPELIB_PATH variable. + # The resulting GI_TYPELIB_PATH should be picked up by the wrapper. + # https://github.com/NixOS/nixpkgs/issues/85515 + typelib-self-user-has-gi-typelib-path = let + tested = typelib-self-user; + in testLib.runTest "typelib-self-user-has-gi-typelib-path" '' + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GI_TYPELIB_PATH=" "${typelib-self-user}/lib/girepository-1.0"} + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GI_TYPELIB_PATH=" "${typelib-self-user}/lib/girepository-1.0"} + ''; + }; + }; +} ./wrap-gapps-hook.sh diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/lib.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/lib.nix new file mode 100644 index 0000000000000..1757bdbbe2500 --- /dev/null +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/lib.nix @@ -0,0 +1,30 @@ +{ runCommand +}: + +rec { + runTest = name: body: runCommand name { } '' + set -o errexit + ${body} + touch $out + ''; + + skip = cond: text: + if cond then '' + echo "Skipping test $name" > /dev/stderr + '' else text; + + fail = text: '' + echo "FAIL: $name: ${text}" > /dev/stderr + exit 1 + ''; + + expectSomeLineContainingYInFileXToMentionZ = file: filter: expected: '' + if ! cat "${file}" | grep "${filter}"; then + ${fail "The file “${file}” should include a line containing “${filter}”."} + fi + + if ! cat "${file}" | grep "${filter}" | grep ${expected}; then + ${fail "The file “${file}” should include a line containing “${filter}” that also contains “${expected}”."} + fi + ''; +} diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/sample-project/Makefile b/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/sample-project/Makefile new file mode 100644 index 0000000000000..5d234db11a0b9 --- /dev/null +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/sample-project/Makefile @@ -0,0 +1,30 @@ +PREFIX = $(out) +BINDIR = $(PREFIX)/bin +LIBEXECDIR = $(PREFIX)/libexec +LIBDIR = $(PREFIX)/lib +TYPELIBDIR = $(LIBDIR)/girepository-1.0 + +all: + echo "Compiling…" +install: + echo "Installing…" + +bin: + mkdir -p $(BINDIR) +# Adds `bin-${foo}` targets, that install `${foo}` executable to `$(BINDIR)`. +bin-%: bin + touch $(BINDIR)/$(@:bin-%=%) + chmod +x $(BINDIR)/$(@:bin-%=%) + +libexec: + mkdir -p $(LIBEXECDIR) +# Adds `libexec-${foo}` targets, that install `${foo}` executable to `$(LIBEXECDIR)`. +libexec-%: libexec + touch $(LIBEXECDIR)/$(@:libexec-%=%) + chmod +x $(LIBEXECDIR)/$(@:libexec-%=%) + +typelib: + mkdir -p $(TYPELIBDIR) +# Adds `typelib-${foo}` targets, that install `${foo}-1.0.typelib` file to `$(TYPELIBDIR)`. +typelib-%: typelib + touch $(TYPELIBDIR)/$(@:typelib-%=%)-1.0.typelib diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh index 1a46e075dbe76..1a46e075dbe76 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 25a111c5804ae..93f5698e55537 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,20 +1,21 @@ { lib, fetchzip }: let - version = "1.052"; + version = "1.054"; in fetchzip { name = "recursive-${version}"; - url = "https://github.com/arrowtype/recursive/releases/download/${version}/Recursive-Beta_${version}.zip"; + url = "https://github.com/arrowtype/recursive/releases/download/${version}/ArrowType-Recursive-${version}.zip"; postFetch = '' mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 + unzip -j $downloadedFile \*.otf -x __MACOSX/\* -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -x __MACOSX/\* -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.woff2 -x __MACOSX/\* -d $out/share/fonts/woff2 ''; - sha256 = "1kam7wcn0rg89gw52pn174sz0r9lc2kjdz88l0jg20gwa3bjbpc6"; + sha256 = "12ld0w7x5lyvymrnqzfj74a3m6knv7i1795bvnpyljmxxkacscnl"; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index fe64325013c55..9227ceb491584 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200702"; + version = "20200801"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "0p1grfgnmqawayk15qxnl09jai96avx9731qladmcbm2lik4qdpl"; + sha256 = "0w9ks8izxv7mkh82fnclfcdf6mif991dsbbnxsqmcbvljrmjval2"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 3d36f51ab1453..69beaa3cee7ae 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "marco"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hcbyv8czymhwz5q9rwig7kkhlhik6y080bls736f3wsbqnnirc2"; + sha256 = "109b41pjrc1b4slw6sx1lakdhrc46x829vczzk4bz3j15kcszg54"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix index d2c68d3cb7b2c..da424d04da908 100644 --- a/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix +++ b/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "kwin-tiling"; - version = "2.2"; + version = "2.4"; src = fetchFromGitHub { owner = "kwin-scripts"; repo = "kwin-tiling"; rev = "v${version}"; - sha256 = "1sx64xv7g9yh3j26zxxrbndv79xam9jq0vs00fczgfv2n0m7j7bl"; + sha256 = "095slpvipy0zcmbn0l7mdnl9g74jaafkr2gqi09b0by5fkvnbh37"; }; # This is technically not needed, but we might as well clean up diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index 1d119014cab61..43d729b9e0956 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.14.2"; + version = "4.14.4"; - sha256 = "1zzc4q1j55hjljksmlyghk58bx7kxyq3scihsr9zgyqc24ww1ks3"; + sha256 = "0nk3qw1accvxrzy00qs06nnlpxjv6p1srkvjn2ad4xrw9ix9ywkb"; nativeBuildInputs = [ exo librsvg ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 00b497c918d8f..e9cfbd50f9120 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-timer-plugin"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "16vypwwjwfk7nn4n16rfgn0z78jqrmbgxmc1r46269lrwd1m6kif"; + sha256 = "1qr4m3n2l3rvsizsr3h7fyfajszfalqm7rhvjx2yjj8r3f8x4ljb"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 859a580bb70ba..ac9f22a9a0cc3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.4.4"; + version = "2.4.6"; rev-prefix = "v"; - sha256 = "08b82j9xp3vzjlc740s9svcjkbsal71ggp23y7dvjqppch7sdxzw"; + sha256 = "03asfaxqbhawzb3870az7qgid5y7cg3ip8h6r4z8kavcd0b7x4ii"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 3ac4f5363195e..7284e5b531d81 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-05-15"; - git-version = "4.9.3-1109-g3c4d40de"; + version = "unstable-2020-07-29"; + git-version = "4.9.3-1232-gbba388b8"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "3c4d40de908ae03ca0e3d854edc2234ef401b36c"; - sha256 = "1c9a6rys2kiiqb79gvw29nv3dwwk6hmi1q4jk1whcx7mds7q5dvr"; + rev = "bba388b80ca62a77883a8936d64b03316808696a"; + sha256 = "0iqlp1mvxz8g32kqrqm0phnnp1i5c4jrapqh2wqwa8fh1vgnizg1"; }; gambit-params = gambit-support.unstable-params; } diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 978ad75a3d266..5f0a69583a180 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -31,6 +31,11 @@ , buildPackages }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + # LTO needs libelf and zlib. assert libelf != null -> zlib != null; diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 4b14cdb94cdd8..4558702084481 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -61,7 +61,7 @@ if test "$noSysDirs" = "1"; then if [[ -e "${!curCC}/nix-support/orig-libc" ]]; then # Figure out what extra compiling flags to pass to the gcc compilers # being generated to make sure that they use our libc. - extraFlags=($(< "${!curCC}/nix-support/libc-cflags")) + extraFlags=($(< "${!curCC}/nix-support/libc-crt1-cflags") $(< "${!curCC}/nix-support/libc-cflags")) # The path to the Libc headers libc_devdir="$(< "${!curCC}/nix-support/orig-libc-dev")" diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index 85b854e19b9a0..fff4901480070 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -17,3 +17,35 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' '' + lib.optionalString langAda '' export PATH=${gnatboot}/bin:$PATH '' + +# NOTE 2020/3/18: This environment variable prevents configure scripts from +# detecting the presence of aligned_alloc on Darwin. There are many facts that +# collectively make this fix necessary: +# - Nix uses a fixed set of standard library headers on all MacOS systems, +# regardless of their actual version. (Nix uses version 10.12 headers.) +# - Nix uses the native standard library binaries for the build system. That +# means the standard library binaries may not exactly match the standard +# library headers. +# - The aligned_alloc procedure is present in MacOS 10.15 (Catalina), but not +# in earlier versions. Therefore on Catalina systems, aligned_alloc is +# linkable (i.e. present in the binary libraries) but not present in the +# headers. +# - Configure scripts detect a procedure's existence by checking whether it is +# linkable. They do not check whether it is present in the headers. +# - GCC throws an error during compilation because aligned_alloc is not +# defined in the headers---even though the linker can see it. +# +# This fix would not be necessary if ANY of the above were false: +# - If Nix used native headers for each different MacOS version, aligned_alloc +# would be in the headers on Catalina. +# - If Nix used the same libary binaries for each MacOS version, aligned_alloc +# would not be in the library binaries. +# - If Catalina did not include aligned_alloc, this wouldn't be a problem. +# - If the configure scripts looked for header presence as well as +# linkability, they would see that aligned_alloc is missing. +# - If GCC allowed implicit declaration of symbols, it would not fail during +# compilation even if the configure scripts did not check header presence. +# ++ lib.optionalString (hostPlatform.isDarwin) '' + export ac_cv_func_aligned_alloc=no +'' diff --git a/pkgs/development/compilers/gerbil/gerbil-crypto.nix b/pkgs/development/compilers/gerbil/gerbil-crypto.nix new file mode 100644 index 0000000000000..12f4726f1c62e --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-crypto.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-crypto"; + version = "unstable-2020-08-01"; + git-version = "0.0-6-ga228862"; + gerbil-package = "clan/crypto"; + gerbil = gerbil-unstable; + gerbilInputs = [gerbil-support.gerbilPackages-unstable.gerbil-utils]; + buildInputs = [pkgs.secp256k1 pkgs.pkg-config]; + gambit-params = gambit-support.unstable-params; + version-path = "version"; + softwareName = "Gerbil-crypto"; + src = fetchFromGitHub { + owner = "fare"; + repo = "gerbil-crypto"; + rev = "a22886260849ec92c3a34bfeedc1574e41e49e33"; + sha256 = "0qbanw2vnw2ymmr4pr1jap29cyc3icbhyq0apibpfnj2znns7w47"; + }; + meta = { + description = "Gerbil Crypto: Extra Cryptographic Primitives for Gerbil"; + homepage = "https://github.com/fare/gerbil-crypto"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix new file mode 100644 index 0000000000000..9b90cc053e1ec --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix @@ -0,0 +1,28 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-ethereum"; + version = "unstable-2020-08-02"; + git-version = "0.0-15-g7cd2dd7"; + gerbil-package = "mukn/ethereum"; + gerbil = gerbil-unstable; + gerbilInputs = with gerbil-support.gerbilPackages-unstable; + [gerbil-utils gerbil-crypto gerbil-poo gerbil-persist]; + buildInputs = []; + gambit-params = gambit-support.unstable-params; + version-path = "version"; + softwareName = "Gerbil-ethereum"; + src = fetchFromGitHub { + owner = "fare"; + repo = "gerbil-ethereum"; + rev = "7cd2dd7436b11917d0729dbafe087cfa8ec38f86"; + sha256 = "0qq3ch2dg735yrj3l2c9pb9qlvz98x3vjfi2xyr4fwr78smpqgb5"; + }; + meta = { + description = "Gerbil Ethereum: a Scheme alternative to web3.js"; + homepage = "https://github.com/fare/gerbil-ethereum"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/gerbil-persist.nix b/pkgs/development/compilers/gerbil/gerbil-persist.nix new file mode 100644 index 0000000000000..1be6684bf440d --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-persist.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-persist"; + version = "unstable-2020-08-02"; + git-version = "0.0-4-ga3b2bd1"; + gerbil-package = "clan/persist"; + gerbil = gerbil-unstable; + gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto gerbil-poo]; + buildInputs = []; + gambit-params = gambit-support.unstable-params; + version-path = "version"; + softwareName = "Gerbil-persist"; + src = fetchFromGitHub { + owner = "fare"; + repo = "gerbil-persist"; + rev = "a3b2bd104612db0e4492737f09f72adea6684483"; + sha256 = "0mc01wva26ww1i7n8naa95mfw7i6lj8qg0bwsik7gb3dsj2acjvh"; + }; + meta = { + description = "Gerbil Persist: Persistent data and activities"; + homepage = "https://github.com/fare/gerbil-persist"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/gerbil-poo.nix b/pkgs/development/compilers/gerbil/gerbil-poo.nix new file mode 100644 index 0000000000000..55673368eead1 --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-poo.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-ethereum"; + version = "unstable-2020-08-02"; + git-version = "0.0-13-g1014154"; + gerbil-package = "clan/poo"; + gerbil = gerbil-unstable; + gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto]; + buildInputs = []; + gambit-params = gambit-support.unstable-params; + version-path = "version"; + softwareName = "Gerbil-POO"; + src = fetchFromGitHub { + owner = "fare"; + repo = "gerbil-poo"; + rev = "1014154fe4943dfbec7524666c831b601ba88559"; + sha256 = "0g8l5mi007n07qs79m9h3h3am1p7h0kzq7yb49h562b8frh5gp97"; + }; + meta = { + description = "Gerbil POO: Prototype Object Orientation for Gerbil Scheme"; + homepage = "https://github.com/fare/gerbil-poo"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index 4e94b6e65de14..e3f4bb0e0d254 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -5,6 +5,10 @@ rec { # Gerbil libraries gerbilPackages-unstable = { gerbil-utils = callPackage ./gerbil-utils.nix { }; + gerbil-crypto = callPackage ./gerbil-crypto.nix { }; + gerbil-poo = callPackage ./gerbil-poo.nix { }; + gerbil-persist = callPackage ./gerbil-persist.nix { }; + gerbil-ethereum = callPackage ./gerbil-ethereum.nix { }; }; # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. @@ -13,21 +17,26 @@ rec { # Use this function to create a Gerbil library. See gerbil-utils as an example. gerbilPackage = { - pname, version, src, meta, package, - git-version ? "", version-path ? "config/version.ss", + pname, version, src, meta, gerbil-package, + git-version ? "", version-path ? "", gerbil ? pkgs.gerbil-unstable, gambit-params ? pkgs.gambit-support.stable-params, gerbilInputs ? [], buildInputs ? [], - softwareName ? "" } : + softwareName ? ""} : let buildInputs_ = buildInputs; in gccStdenv.mkDerivation rec { inherit src meta pname version; + passthru = { inherit gerbil-package version-path ;}; buildInputs = [ gerbil ] ++ gerbilInputs ++ buildInputs_; postPatch = '' set -e ; - if [ -n "${version-path}" ] ; then - echo '(import :clan/utils/version)\n(register-software "${softwareName}" "${git-version}")\n' > "${version-path}" + if [ -n "${version-path}.ss" ] ; then + echo -e '(import :clan/versioning${builtins.concatStringsSep "" + (map (x : if x.passthru.version-path != "" + then " :${x.passthru.gerbil-package}/${x.passthru.version-path}" else "") + gerbilInputs) + })\n(register-software "${softwareName}" "v${git-version}")\n' > "${passthru.version-path}.ss" fi patchShebangs . ; ''; diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/development/compilers/gerbil/gerbil-utils.nix index 075a63d7bf4c3..7e1a9bf05574a 100644 --- a/pkgs/development/compilers/gerbil/gerbil-utils.nix +++ b/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -2,17 +2,18 @@ gerbil-support.gerbilPackage { pname = "gerbil-utils"; - version = "unstable-2020-05-17"; - git-version = "33ef720"; - package = "clan"; + version = "unstable-2020-08-02"; + git-version = "0.2-21-g7e7d053"; + gerbil-package = "clan"; gerbil = gerbil-unstable; gambit-params = gambit-support.unstable-params; - version-path = ""; + version-path = "version"; + softwareName = "Gerbil-utils"; src = fetchFromGitHub { owner = "fare"; repo = "gerbil-utils"; - rev = "33ef720799ba98dc9eec773c662f070af4bac016"; - sha256 = "0dsb97magbxzjqqfzwq4qwf7i80llv0s1dsy9nkzkvkq8drxlmqf"; + rev = "7e7d053ec5e78cc58d38cb03baf554d83b31b0c6"; + sha256 = "078vqdcddfavqq0d9pw430iz1562cgx1ck3fw6dpwxjkyc6m4bms"; }; meta = { description = "Gerbil Clan: Community curated Collection of Common Utilities"; diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 9de6dc42907a6..7b54438b5c9a2 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-unstable, gambit-support }: callPackage ./build.nix rec { - version = "unstable-2020-05-17"; - git-version = "0.16-1-g36a31050"; + version = "unstable-2020-08-02"; + git-version = "0.16-120-g3f248e13"; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "36a31050f6c80e7e1a49dfae96a57b2ad0260698"; - sha256 = "0k3fypam9qx110sjxgzxa1mdf5b631w16s9p5v37cb8ll26vqfiv"; + rev = "3f248e139dfa11be74284fc812253fbecafbaf31"; + sha256 = "18v192cypj0nbmfcyflm8qnwp27qwy65m0a19ggs47wwbzhgvgqh"; }; inherit gambit-support; gambit = gambit-unstable; diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index 63a0af69a2327..1788ac2d96f0c 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -27,6 +27,7 @@ let cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++14" "-DCLANGD_BUILD_XPC=OFF" + "-DLLVM_ENABLE_RTTI=ON" ] ++ stdenv.lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 1016398992fbb..a2641e7ea49ca 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -27,6 +27,7 @@ let cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" + "-DLLVM_ENABLE_RTTI=ON" ] ++ stdenv.lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index e2f7166354ae5..27d2106a3a09c 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -27,6 +27,7 @@ let cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" + "-DLLVM_ENABLE_RTTI=ON" ] ++ stdenv.lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index 18ea46ea39c40..a1b83aa099e42 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -27,6 +27,7 @@ let cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" + "-DLLVM_ENABLE_RTTI=ON" ] ++ stdenv.lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 3b398628e567c..3fb43c02d8cf1 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -28,6 +28,7 @@ let cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" "-DCLANGD_BUILD_XPC=OFF" + "-DLLVM_ENABLE_RTTI=ON" ] ++ stdenv.lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index c938a01f8979e..9bc7a88e9123f 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -28,6 +28,7 @@ let cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" "-DCLANGD_BUILD_XPC=OFF" + "-DLLVM_ENABLE_RTTI=ON" ] ++ stdenv.lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix index 9efeab499ea27..74e3d354f12a7 100644 --- a/pkgs/development/compilers/ocaml/4.11.nix +++ b/pkgs/development/compilers/ocaml/4.11.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "11"; - patch_version = "0+beta2"; - sha256 = "1n39qfwvpwlhp9m73zi9hrk9ny9g6spy9apc36n2ydpf5dn7pg75"; + patch_version = "0+beta3"; + sha256 = "18lpgirxil00pgy805cyi97v6ycmg93sdvbkc60i35ili030v1f7"; } diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index b2f86343d0a99..5011fd39e2f01 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -10,16 +10,17 @@ let major = "11"; - update = ".0.7"; - build = "ga"; + minor = "0"; + update = "8"; + build = "10"; openjdk = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${major}${update}-${build}"; + version = "${major}.${minor}.${update}+${build}"; src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "14daacng9ndxf4kmvsn7nracwfiwwmw5rha8rkk3723pfk9g8q7p"; + sha256 = "1sdncn1bk4h8xxfnmrl1125maqy6mc0v0y1dyifwsa04wasj9hbz"; }; nativeBuildInputs = [ pkgconfig autoconf ]; diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 063976d8765fc..e51e554026756 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -10,7 +10,7 @@ let major = "14"; - update = ".0.1"; + update = ".0.2"; build = "-ga"; openjdk = stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ let src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "0ic7dcrzk62jc65yrshs6xlclmsha7z52bia5s2bkllw1zpmdmip"; + sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3"; }; nativeBuildInputs = [ pkgconfig autoconf ]; diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index 460eaab16199e..fdea10dcd7e46 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -6,5 +6,5 @@ import ./jdk-linux-base.nix { sha256.armv7l-linux = "13dih7zyfgj90bkhnfxhpm88d9kqqrj6w5rzpidmxrjwrsnlndp9"; sha256.aarch64-linux = "0zzhs4pcnjss2561b8zrrnacpkb8p49ca0lpdw7hzgsjjj1y146n"; jceName = "jce_policy-8.zip"; - sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; + sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w"; } diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 734a94f769056..65d8920c4a4c4 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , fetchurl, file, python3 -, llvm_9, darwin, cmake, rust, rustPlatform +, llvm_10, darwin, cmake, rust, rustPlatform , pkgconfig, openssl , which, libffi , withBundledLLVM ? false @@ -14,12 +14,12 @@ let inherit (stdenv.lib) optionals optional optionalString; inherit (darwin.apple_sdk.frameworks) Security; - llvmSharedForBuild = pkgsBuildBuild.llvm_9.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvm_9.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvm_9.override { enableSharedLibraries = true; }; + llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvm_10.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvm_10.override { enableSharedLibraries = true; }; # For use at runtime - llvmShared = llvm_9.override { enableSharedLibraries = true; }; + llvmShared = llvm_10.override { enableSharedLibraries = true; }; in stdenv.mkDerivation rec { pname = "rustc"; inherit version; diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index d3f126052f5d4..9b0602270672e 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { - version = "0.23.0-RC1"; + version = "0.26.0-RC1"; pname = "dotty-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; - sha256 = "0c64dw2qp8mhgsll8viqaiy34wq1ablkbc4bi813a1r4nqg57sv0"; + sha256 = "16njy9f0lk7q5x5w1k4yqy644005w4cxhq20r8i2qslhxjndz66f"; }; propagatedBuildInputs = [ jre ncurses.dev ] ; diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index b838aa59177e1..3340d99b6f161 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -260,8 +260,8 @@ stdenv.mkDerivation { ''; buildPhase = '' - # gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found - export NIX_CFLAGS_COMPILE="$(< $NIX_CC/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" + # explicitly include C++ headers to prevent errors where stdlib.h is not found from cstdlib + export NIX_CFLAGS_COMPILE="$(< ${clang}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" # During the Swift build, a full local LLVM build is performed and the resulting clang is invoked. # This compiler is not using the Nix wrappers, so it needs some help to find things. export NIX_LDFLAGS_BEFORE="-rpath ${clang.cc.gcc.lib}/lib -L${clang.cc.gcc.lib}/lib $NIX_LDFLAGS_BEFORE" diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index 20ce0b5ff5eea..6a1e5b9e76e4b 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -20,13 +20,6 @@ llvmPackages.stdenv.mkDerivation rec { zlib ]; - patches = [ - (substituteAll { - src = ./llvm10_polly.patch; - llvm_extras = "-Wl,${llvmPackages.llvm}/lib/LLVMPolly.so"; - }) - ]; - preBuild = '' export HOME=$TMPDIR; ''; diff --git a/pkgs/development/compilers/zig/llvm10_polly.patch b/pkgs/development/compilers/zig/llvm10_polly.patch deleted file mode 100644 index 72449c35d91ff..0000000000000 --- a/pkgs/development/compilers/zig/llvm10_polly.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 97608cddf..e451c0711 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -369,4 +369,5 @@ target_link_libraries(zig_cpp LINK_PUBLIC - ${CLANG_LIBRARIES} - ${LLD_LIBRARIES} - ${LLVM_LIBRARIES} -+ @llvm_extras@ - ) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 31c7e319579de..c32cda5ee09d7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -564,18 +564,6 @@ self: super: { bustle = overrideCabal super.bustle (drv: { buildDepends = [ pkgs.libpcap ]; buildTools = with pkgs.buildPackages; [ gettext perl help2man ]; - patches = [ - # fix build - # https://gitlab.freedesktop.org/bustle/bustle/merge_requests/14 - (pkgs.fetchpatch { - url = "https://gitlab.freedesktop.org/bustle/bustle/commit/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch"; - sha256 = "0v9cvbmrma5jcqcg1narpm1549h0cg8mr6i00qxmq0x6hs04dnwa"; - }) - (pkgs.fetchpatch { - url = "https://gitlab.freedesktop.org/bustle/bustle/commit/aae6843f51f54679d440fb3813e61355dc8406b9.patch"; - sha256 = "1a8hr38hd1gdkqhsy56hyl7njw8ci79iigr81aalkb7hn4ckvh2a"; - }) - ]; postInstall = '' make install PREFIX=$out ''; diff --git a/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch b/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch new file mode 100644 index 0000000000000..2b7f8b6a53b1e --- /dev/null +++ b/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch @@ -0,0 +1,190 @@ +From 43d23211dd7d22b5264ed06d446f89d632125da8 Mon Sep 17 00:00:00 2001 +From: Keshav Kini <keshav.kini@gmail.com> +Date: Sat, 30 May 2020 21:27:47 -0700 +Subject: [PATCH 1/2] Fix some paths for Nix build + +--- + books/build/features.sh | 1 + + .../ipasir/load-ipasir-sharedlib-raw.lsp | 16 +++---- + books/projects/smtlink/config.lisp | 2 +- + books/projects/smtlink/examples/examples.lisp | 4 +- + books/projects/smtlink/smtlink-config | 2 +- + .../cl+ssl-20181018-git/src/reload.lisp | 48 ++----------------- + .../shellpool-20150505-git/src/main.lisp | 20 +------- + 7 files changed, 15 insertions(+), 78 deletions(-) + +diff --git a/books/build/features.sh b/books/build/features.sh +index c8493d51a..def853f53 100755 +--- a/books/build/features.sh ++++ b/books/build/features.sh +@@ -84,6 +84,7 @@ fi + + + echo "Determining whether an ipasir shared library is installed" 1>&2 ++IPASIR_SHARED_LIBRARY=${IPASIR_SHARED_LIBRARY:-@libipasirglucose4@/lib/libipasirglucose4.so} + if [[ $IPASIR_SHARED_LIBRARY != '' ]]; + then + if [[ -e $IPASIR_SHARED_LIBRARY ]]; +diff --git a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp +index c6b0b3185..5ac5c675a 100644 +--- a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp ++++ b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp +@@ -28,13 +28,9 @@ + ; + ; Original authors: Sol Swords <sswords@centtech.com> + +-(er-let* ((libname (acl2::getenv$ "IPASIR_SHARED_LIBRARY" acl2::*the-live-state*))) +- (if libname +- (handler-case +- (cffi::load-foreign-library libname) +- (error () (er hard? 'load-ipasir-shardlib-raw +- "Couldn't load the specified ipasir shared library, ~s0." +- libname))) +- (er hard? 'load-ipasir-shardlib-raw +- "Couldn't load an ipasir library because the ~ +- IPASIR_SHARED_LIBRARY environment variable was unset."))) ++(let ((libname "@libipasirglucose4@/lib/libipasirglucose4.so")) ++ (handler-case ++ (cffi::load-foreign-library libname) ++ (error () (er hard? 'load-ipasir-shardlib-raw ++ "Couldn't load the specified ipasir shared library, ~s0." ++ libname)))) +diff --git a/books/projects/smtlink/config.lisp b/books/projects/smtlink/config.lisp +index c74073174..8d92355f7 100644 +--- a/books/projects/smtlink/config.lisp ++++ b/books/projects/smtlink/config.lisp +@@ -51,7 +51,7 @@ where the system books are.")) + (make-smtlink-config :interface-dir interface-dir + :smt-module "ACL2_to_Z3" + :smt-class "ACL22SMT" +- :smt-cmd "/usr/bin/env python" ++ :smt-cmd "python" + :pythonpath ""))) + + ;; ----------------------------------------------------------------- +diff --git a/books/projects/smtlink/examples/examples.lisp b/books/projects/smtlink/examples/examples.lisp +index bc66e0165..24f0d639c 100644 +--- a/books/projects/smtlink/examples/examples.lisp ++++ b/books/projects/smtlink/examples/examples.lisp +@@ -75,7 +75,7 @@ Subgoal 2 + Subgoal 2.2 + Subgoal 2.2' + Using default SMT-trusted-cp... +-; SMT solver: `/usr/bin/env python /tmp/py_file/smtlink.w59zR`: 0.52 sec, 7,904 bytes ++; SMT solver: `python /tmp/py_file/smtlink.w59zR`: 0.52 sec, 7,904 bytes + Proved! + Subgoal 2.2'' + Subgoal 2.1 +@@ -139,7 +139,7 @@ read back into ACL2. Below are the outputs from this clause processor called + + @({ + Using default SMT-trusted-cp... +-; SMT solver: `/usr/bin/env python /tmp/py_file/smtlink.w59zR`: 0.52 sec, 7,904 bytes ++; SMT solver: `python /tmp/py_file/smtlink.w59zR`: 0.52 sec, 7,904 bytes + Proved! + }) + +diff --git a/books/projects/smtlink/smtlink-config b/books/projects/smtlink/smtlink-config +index 0d2703545..0f58904ea 100644 +--- a/books/projects/smtlink/smtlink-config ++++ b/books/projects/smtlink/smtlink-config +@@ -1 +1 @@ +-smt-cmd=/usr/bin/env python ++smt-cmd=python +diff --git a/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp b/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp +index 3f6aa35d0..ac4012363 100644 +--- a/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp ++++ b/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp +@@ -20,54 +20,12 @@ + (in-package :cl+ssl) + + (cffi:define-foreign-library libcrypto +- (:openbsd "libcrypto.so") +- (:darwin (:or "/opt/local/lib/libcrypto.dylib" ;; MacPorts +- "/sw/lib/libcrypto.dylib" ;; Fink +- "/usr/local/opt/openssl/lib/libcrypto.dylib" ;; Homebrew +- "/usr/local/lib/libcrypto.dylib" ;; personalized install +- "libcrypto.dylib" ;; default system libcrypto, which may have insufficient crypto +- "/usr/lib/libcrypto.dylib"))) ++ (t "@openssl@/lib/libcrypto.so")) + + (cffi:define-foreign-library libssl +- (:windows (:or "libssl32.dll" "ssleay32.dll")) +- ;; The default OS-X libssl seems have had insufficient crypto algos +- ;; (missing TLSv1_[1,2]_XXX methods, +- ;; see https://github.com/cl-plus-ssl/cl-plus-ssl/issues/56) +- ;; so first try to load possible custom installations of libssl +- (:darwin (:or "/opt/local/lib/libssl.dylib" ;; MacPorts +- "/sw/lib/libssl.dylib" ;; Fink +- "/usr/local/opt/openssl/lib/libssl.dylib" ;; Homebrew +- "/usr/local/lib/libssl.dylib" ;; personalized install +- "libssl.dylib" ;; default system libssl, which may have insufficient crypto +- "/usr/lib/libssl.dylib")) +- (:solaris (:or "/lib/64/libssl.so" +- "libssl.so.0.9.8" "libssl.so" "libssl.so.4")) +- ;; Unlike some other systems, OpenBSD linker, +- ;; when passed library name without versions at the end, +- ;; will locate the library with highest macro.minor version, +- ;; so we can just use just "libssl.so". +- ;; More info at https://github.com/cl-plus-ssl/cl-plus-ssl/pull/2. +- (:openbsd "libssl.so") +- ((and :unix (not :cygwin)) (:or "libssl.so.1.0.2m" +- "libssl.so.1.0.2k" +- "libssl.so.1.0.2" +- "libssl.so.1.0.1l" +- "libssl.so.1.0.1j" +- "libssl.so.1.0.1e" +- "libssl.so.1.0.1" +- "libssl.so.1.0.0q" +- "libssl.so.1.0.0" +- "libssl.so.0.9.8ze" +- "libssl.so.0.9.8" +- "libssl.so.10" +- "libssl.so.4" +- "libssl.so")) +- (:cygwin "cygssl-1.0.0.dll") +- (t (:default "libssl3"))) +- +-(cffi:define-foreign-library libeay32 +- (:windows "libeay32.dll")) ++ (t "@openssl@/lib/libssl.so")) + ++(cffi:define-foreign-library libeay32) + + (unless (member :cl+ssl-foreign-libs-already-loaded + *features*) +diff --git a/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp b/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp +index cda8dc94c..11035ea09 100644 +--- a/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp ++++ b/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp +@@ -106,26 +106,8 @@ + ; Glue + + +-#-sbcl + (defun find-bash () +- #+windows "bash.exe" +- #-windows "bash") +- +-#+sbcl +-;; SBCL (on Linux, at least) won't successfully run "bash" all by itself. So, +-;; on SBCL, try to find a likely bash. BOZO this probably isn't great. It +-;; would be better to search the user's PATH for which bash to use. +-(let ((found-bash)) +- (defun find-bash () +- (or found-bash +- (let ((paths-to-try '("/bin/bash" +- "/usr/bin/bash" +- "/usr/local/bin/bash"))) +- (loop for path in paths-to-try do +- (when (cl-fad::file-exists-p path) +- (setq found-bash path) +- (return-from find-bash path))) +- (error "Bash not found among ~s" paths-to-try))))) ++ "@bash@/bin/bash") + + #+(or allegro lispworks) + (defstruct bashprocess +-- +2.25.4 + diff --git a/pkgs/development/interpreters/acl2/0002-Restrict-RDTSC-to-x86.patch b/pkgs/development/interpreters/acl2/0002-Restrict-RDTSC-to-x86.patch new file mode 100644 index 0000000000000..74af5adef6493 --- /dev/null +++ b/pkgs/development/interpreters/acl2/0002-Restrict-RDTSC-to-x86.patch @@ -0,0 +1,29 @@ +From b0ccf68f277d0bd5e6fc9d41742f31ddda99a955 Mon Sep 17 00:00:00 2001 +From: Keshav Kini <keshav.kini@gmail.com> +Date: Mon, 1 Jun 2020 21:42:24 -0700 +Subject: [PATCH 2/2] Restrict RDTSC to x86 + +Backported from [1]. According to Curtis Dunham, this should fix the ACL2 base +system build on ARM. + +[1]: https://github.com/acl2/acl2/commit/292fa2ccc6217e6307d7bb8373eb90f5d258ea5e +--- + memoize-raw.lisp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/memoize-raw.lisp b/memoize-raw.lisp +index 205e78653..478198dee 100644 +--- a/memoize-raw.lisp ++++ b/memoize-raw.lisp +@@ -189,7 +189,7 @@ + ;; RDTSC nonsense, but we still can report mysterious results since we have no + ;; clue about which core we are running on in CCL (or, presumably, SBCL). + +-#+(or ccl sbcl) ++#+(and (or ccl sbcl) x86-64) + (eval-when + (:execute :compile-toplevel :load-toplevel) + (when #+ccl (fboundp 'ccl::rdtsc) +-- +2.25.4 + diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 39b243a0ce6a9..e3c62aae98337 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,15 +1,19 @@ -{ stdenv, fetchFromGitHub, - # perl, which, nettools, - sbcl }: - -let hashes = { - "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r"; - "8.3" = "0c0wimaf16nrr3d6cxq6p7nr7rxffvpmn66hkpwc1m6zpcipf0y5"; -}; -revs = { - "8.0" = "8.0"; - "8.3" = "8.3"; -}; +{ stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll +, sbcl, bash, which, perl, nettools +, openssl, glucose, minisat, abc-verifier, z3, python2 +, certifyBooks ? true +} @ args: + +let + # Disable immobile space so we don't run out of memory on large books; see + # http://www.cs.utexas.edu/users/moore/acl2/current/HTML/installation/requirements.html#Obtaining-SBCL + sbcl = args.sbcl.override { disableImmobileSpace = true; }; + + # Wrap to add `-model` argument because some of the books in 8.3 need this. + # Fixed upstream (https://github.com/acl2/acl2/commit/0359538a), so this can + # be removed in ACL2 8.4. + glucose = writeShellScriptBin "glucose" ''exec ${args.glucose}/bin/glucose -model "$@"''; + in stdenv.mkDerivation rec { pname = "acl2"; version = "8.3"; @@ -17,62 +21,117 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "acl2-devel"; repo = "acl2-devel"; - rev = revs.${version}; - sha256 = hashes.${version}; + rev = "${version}"; + sha256 = "0c0wimaf16nrr3d6cxq6p7nr7rxffvpmn66hkpwc1m6zpcipf0y5"; }; - buildInputs = [ sbcl - # which perl nettools + libipasirglucose4 = callPackage ./libipasirglucose4 { }; + + patches = [ + (substituteAll { + src = ./0001-Fix-some-paths-for-Nix-build.patch; + inherit bash libipasirglucose4; + openssl = openssl.out; + }) + ./0002-Restrict-RDTSC-to-x86.patch ]; + buildInputs = [ + # ACL2 itself only needs a Common Lisp compiler/interpreter: + sbcl + ] ++ stdenv.lib.optionals certifyBooks [ + # To build community books, we need Perl and a couple of utilities: + which perl nettools + # Some of the books require one or more of these external tools: + openssl.out glucose minisat abc-verifier libipasirglucose4 + z3 (python2.withPackages (ps: [ ps.z3 ])) + ]; + + # NOTE: Parallel building can be memory-intensive depending on the number of + # concurrent jobs. For example, this build has been seen to use >120GB of + # RAM on an 85 core machine. enableParallelBuilding = true; - phases = "unpackPhase installPhase"; + preConfigure = '' + # When certifying books, ACL2 doesn't like $HOME not existing. + export HOME=$(pwd)/fake-home + '' + stdenv.lib.optionalString certifyBooks '' + # Some books also care about $USER being nonempty. + export USER=nobody + ''; - installSuffix = "acl2"; + postConfigure = '' + # ACL2 and its books need to be built in place in the out directory because + # the proof artifacts are not relocatable. Since ACL2 mostly expects + # everything to exist in the original source tree layout, we put it in + # $out/share/${pname} and create symlinks in $out/bin as necessary. + mkdir -p $out/share/${pname} + cp -pR . $out/share/${pname} + cd $out/share/${pname} + ''; + + preBuild = "mkdir -p $HOME"; + makeFlags="LISP=${sbcl}/bin/sbcl"; + + doCheck = true; + checkTarget = "mini-proveall"; installPhase = '' - mkdir -p $out/share/${installSuffix} mkdir -p $out/bin - cp -R . $out/share/${installSuffix} - cd $out/share/${installSuffix} + ln -s $out/share/${pname}/saved_acl2 $out/bin/${pname} + '' + stdenv.lib.optionalString certifyBooks '' + ln -s $out/share/${pname}/books/build/cert.pl $out/bin/${pname}-cert + ln -s $out/share/${pname}/books/build/clean.pl $out/bin/${pname}-clean + ''; - # make ACL2 image - make LISP=${sbcl}/bin/sbcl + preDistPhases = [ (if certifyBooks then "certifyBooksPhase" else "removeBooksPhase") ]; - # The community books don't build properly under Nix yet. - rm -rf books - #make ACL2=$out/share/saved_acl2 USE_QUICKLISP=1 regression-everything + certifyBooksPhase = '' + # Certify the community books + pushd $out/share/${pname}/books + makeFlags="ACL2=$out/share/${pname}/saved_acl2" + buildFlags="everything" + buildPhase + popd + ''; - cp saved_acl2 $out/bin/acl2 + removeBooksPhase = '' + # Delete the community books + rm -rf $out/share/${pname}/books ''; - meta = { + meta = with stdenv.lib; { description = "An interpreter and a prover for a Lisp dialect"; longDescription = '' - ACL2 is a logic and programming language in which you can model - computer systems, together with a tool to help you prove - properties of those models. "ACL2" denotes "A Computational - Logic for Applicative Common Lisp". - - ACL2 is part of the Boyer-Moore family of provers, for which its - authors have received the 2005 ACM Software System Award. - - NOTE: In nixpkgs, the community books that usually ship with - ACL2 have been removed because it is not currently possible to - build them with Nix. - ''; + ACL2 is a logic and programming language in which you can model computer + systems, together with a tool to help you prove properties of those + models. "ACL2" denotes "A Computational Logic for Applicative Common + Lisp". + + ACL2 is part of the Boyer-Moore family of provers, for which its authors + have received the 2005 ACM Software System Award. + + This package installs the main ACL2 executable ${pname}, as well as the + build tools cert.pl and clean.pl, renamed to ${pname}-cert and + ${pname}-clean. + + '' + (if certifyBooks then '' + The community books are also included and certified with the `make + everything` target. + '' else '' + The community books are not included in this package. + ''); homepage = "http://www.cs.utexas.edu/users/moore/acl2/"; downloadPage = "https://github.com/acl2-devel/acl2-devel/releases"; - # There are a bunch of licenses in the community books, but since - # they currently get deleted during the build, we don't mention - # their licenses here. ACL2 proper is released under a BSD - # 3-clause license. - #license = with stdenv.lib.licenses; - #[ free bsd3 mit gpl2 llgpl21 cc0 publicDomain ]; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ kini raskin ]; - platforms = stdenv.lib.platforms.all; - broken = stdenv.isAarch64 && stdenv.isLinux; + license = with licenses; [ + # ACL2 itself is bsd3 + bsd3 + ] ++ optionals certifyBooks [ + # The community books are mostly bsd3 or mit but with a few + # other things thrown in. + mit gpl2 llgpl21 cc0 publicDomain unfreeRedistributable + ]; + maintainers = with maintainers; [ kini raskin ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/0001-Support-shared-library-build.patch b/pkgs/development/interpreters/acl2/libipasirglucose4/0001-Support-shared-library-build.patch new file mode 100644 index 0000000000000..c78fa1ab925a3 --- /dev/null +++ b/pkgs/development/interpreters/acl2/libipasirglucose4/0001-Support-shared-library-build.patch @@ -0,0 +1,46 @@ +From 0f48e046f44624f4d4d8255ac5bd26397a38f16c Mon Sep 17 00:00:00 2001 +From: Keshav Kini <keshav.kini@gmail.com> +Date: Sun, 23 Feb 2020 14:09:30 -0800 +Subject: [PATCH] Support shared library build + +Patch taken from [the ACL2 Books documentation][1]. + +- Add " -fPIC" to the CXXFLAGS to build position-independent code, + required for shared libraries. + +- Add the line "export CXXFLAGS" below the setting of CXXFLAGS, so that + those flags apply to the recursive make of the core solver library. + +- Fix a typo: replace the occurrence of "CXXLAGS" with "CXXFLAGS". + +[1]: http://www.cs.utexas.edu/users/moore/acl2/v8-2/combined-manual/index.html?topic=IPASIR____BUILDING-AN-IPASIR-SOLVER-LIBRARY +--- + makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/makefile b/makefile +index 07121de..4e85c4b 100755 +--- a/makefile ++++ b/makefile +@@ -29,7 +29,8 @@ TARGET=libipasir$(SIG).a + + CXX=g++ + +-CXXFLAGS= -g -std=c++11 -Wall -DNDEBUG -O3 ++CXXFLAGS= -g -std=c++11 -Wall -DNDEBUG -O3 -fPIC ++export CXXFLAGS + + #-----------------------------------------------------------------------# + #- REQUIRED TOP RULES --------------------------------------------------# +@@ -67,7 +68,7 @@ libipasir$(SIG).a: .FORCE + #-----------------------------------------------------------------------# + + ipasir$(NAME)glue.o: ipasir$(NAME)glue.cc ipasir.h makefile +- $(CXX) -g -std=c++11 $(CXXLAGS) \ ++ $(CXX) -g -std=c++11 $(CXXFLAGS) \ + -DVERSION=\"$(VERSION)\" \ + -I$(DIR) -I$(DIR)/core -c ipasir$(NAME)glue.cc + +-- +2.23.1 + diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix new file mode 100644 index 0000000000000..5186cd69584e1 --- /dev/null +++ b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, zlib, unzip }: + +stdenv.mkDerivation rec { + pname = "libipasirglucose4"; + # This library has no version number AFAICT (beyond generally being based on + # Glucose 4.x), but it was submitted to the 2017 SAT competition so let's use + # that as the version number, I guess. + version = "2017"; + + src = fetchurl { + url = "https://baldur.iti.kit.edu/sat-competition-2017/solvers/incremental/glucose-ipasir.zip"; + sha256 = "0xchgady9vwdh8frmc8swz6va53igp2wj1y9sshd0g7549n87wdj"; + }; + nativeBuildInputs = [ unzip ]; + + buildInputs = [ zlib ]; + + sourceRoot = "sat/glucose4"; + patches = [ ./0001-Support-shared-library-build.patch ]; + + postBuild = '' + g++ -shared -Wl,-soname,libipasirglucose4.so -o libipasirglucose4.so \ + ipasirglucoseglue.o libipasirglucose4.a + ''; + + installPhase = '' + install -D libipasirglucose4.so $out/lib/libipasirglucose4.so + ''; + + meta = with stdenv.lib; { + description = "Shared library providing IPASIR interface to the Glucose SAT solver"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ kini ]; + }; +} diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index f0de3f6409188..08db1b077a3d7 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper }: let - version = "0.8"; + version = "0.9"; name = "chibi-scheme-${version}"; in stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "ashinn"; repo = "chibi-scheme"; rev = version; - sha256 = "0269d5fhaz7nqjb41vh7yz63mp5s4z08fn4sspwc06z32xksigw9"; + sha256 = "1lnap41gl9vg82h557f4rlr69jgmd2gh0iqs6cxm77d39kv1scb8"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 6ce5eb905fc84..e4511da498c7a 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -2,15 +2,15 @@ let # The version number here is whatever is reported by the RUBY_VERSION string -rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; +rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.2.12.0"; + version = "9.2.13.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "013c1q1n525y9ghp369z1jayivm9bw8c1x0g5lz7479hqhj62zrh"; + sha256 = "0n5glz6xm3skrfihzn3g5awdxpjsqn2k8k46gv449rk2l50w5a3k"; }; buildInputs = [ makeWrapper ]; @@ -46,11 +46,12 @@ jruby = stdenv.mkDerivation rec { libPath = "lib/${rubyEngine}/${rubyVersion.libDir}"; }; - meta = { + meta = with stdenv.lib; { description = "Ruby interpreter written in Java"; homepage = "http://jruby.org/"; - license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ]; - platforms = stdenv.lib.platforms.unix; + license = with licenses; [ cpl10 gpl2 lgpl21 ]; + platforms = platforms.unix; + maintainers = [ maintainers.fzakaria ]; }; }; in jruby.overrideAttrs (oldAttrs: { diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 9690dfac2f209..27ccb6f22c69b 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -2,6 +2,11 @@ , enableThreading ? true, coreutils, makeWrapper }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + with lib; let diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index e6c8b301c0b06..d26d060da72a5 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -36,6 +36,11 @@ , enableOptimizations ? (!stdenv.isDarwin) }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + assert x11Support -> tcl != null && tk != null && xorgproto != null diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 6e9bbb45e4b91..1a04f9d0e4859 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -107,10 +107,10 @@ in { sourceVersion = { major = "3"; minor = "8"; - patch = "3"; + patch = "5"; suffix = ""; }; - sha256 = "0r2qg4pdvv52ld5dd95fl6lzzsxxxhbsxmymwcphh6624g3mxayz"; + sha256 = "1c43dbv9lvlp3ynqmgdi4rh8q94swanhqarqrdx62zmigpakw073"; inherit (darwin) configd; inherit passthruFun; }; @@ -121,9 +121,9 @@ in { major = "3"; minor = "9"; patch = "0"; - suffix = "a4"; + suffix = "b5"; }; - sha256 = "0qzy0wlq0izxk8ii28gy70v138g6xnz9sgsxpyayls2j04l6b5vz"; + sha256 = "0r0m82srq4z44dahczd1cv6wgmxcpqbn5dyd8czcpk2pp9ydgqbc"; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 1db01c0d77583..b62df6e837b87 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "7.7"; # always change at once with ./minimal.nix + version = "7.8"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "0cx5h3k0n58cb442qzp3jlc7n1b9dbaxv9blg2rjil2rn119yrb2"; + sha256 = "19z3dayybcra277s4gk2mppalwawd93f2b16xyrb6d7rbbfz7j9j"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index a4a7a5c12cd47..02aed6e8929c9 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "1lxcd4ix8q3089xql48hwccxvcpkinfxwxnc6fhcjdgzqcyxh3ln"; + sha256 = "0bbglf9vfacpm2hn3lskhvc8cpg6z088fbnzpqsn17z8qdk8yvb3"; }; meta = oldAttrs.meta // { diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index 4b280cc186217..6e863e4eebabe 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, gettext, attr }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { name = "acl-2.2.53"; diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 497262c04d713..d69d475f7370e 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, gettext }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { name = "attr-2.4.48"; @@ -14,10 +19,7 @@ stdenv.mkDerivation rec { patches = [ # fix fakechroot: https://github.com/dex4er/fakechroot/issues/57 - (fetchurl { - url = "https://git.savannah.nongnu.org/cgit/attr.git/patch/?id=14adc898a36948267bfe5c63b399996879e94c98"; - sha256 = "0gja54fz79a9ma6b4mprnjxq77l5yg2z9xknlwhmkcrfnam02qxp"; - }) + ./syscall.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/attr/syscall.patch b/pkgs/development/libraries/attr/syscall.patch new file mode 100644 index 0000000000000..be2cfb3928b45 --- /dev/null +++ b/pkgs/development/libraries/attr/syscall.patch @@ -0,0 +1,120 @@ +From 14adc898a36948267bfe5c63b399996879e94c98 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agruenba@redhat.com> +Date: Fri, 17 Aug 2018 14:07:31 +0200 +Subject: Switch back to syscall() + +Switch back to syscall() for the *xattr system calls. The current +mechanism of forwarding those calls to glibc breaks libraries like +libfakeroot (fakeroot) and libasan (the gcc address sanitizer; gcc +-fsanitize=address). + +Those libraries provide wrappers for functions defined in other shared +libraries, usually glibc, do their own processing, and forward calls to +the original symbols looke dup via dlsym(RTLD_NEXT, "symbol_name"). In +our case, dlsym returns the libattr_*xattr wrappers. However, when our +wrappers try calling glibc, they end up calling the libfakeroot / +libasan wrappers instead because those override the original symbols => +recursion. + +The libattr_*xattr wrappers will only be used when symbols are looked up +at runtime (dlopen / dlsym). Programs linking against libattr will +directly use the glibc provided symbols. Therefore, the slightly worse +performance of syscall() won't affect any of the "normal" users of +libattr. +--- + libattr/syscalls.c | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) + +diff --git a/libattr/syscalls.c b/libattr/syscalls.c +index 3013aa0..721ad7f 100644 +--- a/libattr/syscalls.c ++++ b/libattr/syscalls.c +@@ -22,6 +22,8 @@ + + #include "config.h" + ++#include <unistd.h> ++#include <sys/syscall.h> + #include <sys/xattr.h> + + #ifdef HAVE_VISIBILITY_ATTRIBUTE +@@ -31,67 +33,67 @@ + int libattr_setxattr(const char *path, const char *name, + void *value, size_t size, int flags) + { +- return setxattr(path, name, value, size, flags); ++ return syscall(__NR_setxattr, path, name, value, size, flags); + } + + int libattr_lsetxattr(const char *path, const char *name, + void *value, size_t size, int flags) + { +- return lsetxattr(path, name, value, size, flags); ++ return syscall(__NR_lsetxattr, path, name, value, size, flags); + } + + int libattr_fsetxattr(int filedes, const char *name, + void *value, size_t size, int flags) + { +- return fsetxattr(filedes, name, value, size, flags); ++ return syscall(__NR_fsetxattr, filedes, name, value, size, flags); + } + + ssize_t libattr_getxattr(const char *path, const char *name, + void *value, size_t size) + { +- return getxattr(path, name, value, size); ++ return syscall(__NR_getxattr, path, name, value, size); + } + + ssize_t libattr_lgetxattr(const char *path, const char *name, + void *value, size_t size) + { +- return lgetxattr(path, name, value, size); ++ return syscall(__NR_lgetxattr, path, name, value, size); + } + + ssize_t libattr_fgetxattr(int filedes, const char *name, + void *value, size_t size) + { +- return fgetxattr(filedes, name, value, size); ++ return syscall(__NR_fgetxattr, filedes, name, value, size); + } + + ssize_t libattr_listxattr(const char *path, char *list, size_t size) + { +- return listxattr(path, list, size); ++ return syscall(__NR_listxattr, path, list, size); + } + + ssize_t libattr_llistxattr(const char *path, char *list, size_t size) + { +- return llistxattr(path, list, size); ++ return syscall(__NR_llistxattr, path, list, size); + } + + ssize_t libattr_flistxattr(int filedes, char *list, size_t size) + { +- return flistxattr(filedes, list, size); ++ return syscall(__NR_flistxattr, filedes, list, size); + } + + int libattr_removexattr(const char *path, const char *name) + { +- return removexattr(path, name); ++ return syscall(__NR_removexattr, path, name); + } + + int libattr_lremovexattr(const char *path, const char *name) + { +- return lremovexattr(path, name); ++ return syscall(__NR_lremovexattr, path, name); + } + + int libattr_fremovexattr(int filedes, const char *name) + { +- return fremovexattr(filedes, name); ++ return syscall(__NR_fremovexattr, filedes, name); + } + + #ifdef HAVE_VISIBILITY_ATTRIBUTE diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index 5324fe0685d66..c2b2725c19cc7 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCODE_COVERAGE=OFF" ]; meta = with stdenv.lib; { description = "Reader for AES SOFA files to get better HRTFs"; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 02f0872cee3f4..2751565670af5 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, writeTextDir }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + let self = stdenv.mkDerivation rec { name = "c-ares-1.15.0"; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 94aee7749ce5f..a356d7be1a9e8 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { name = "expat-2.2.8"; diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix index 2a11d835a6b53..486a24defd1b5 100644 --- a/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-cflags) -O2" + EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-crt1-cflags) $(cat $NIX_CC/nix-support/libc-cflags) -O2" extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_BINTOOLS/nix-support/libc-ldflags) $(cat $NIX_BINTOOLS/nix-support/libc-ldflags-before)" for i in $extraLDFlags; do diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 684bad14dda51..169506e66cc02 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.0.5"; + version = "2.1.3"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1j6c6vmnip24pxafk29y312vif1xlryymv7aaxgqp9ca3s91nlrf"; + sha256 = "0sdqv4j1jjjc2nxnd9h7r4w66bdjl5ksvfia4i4cjj7jfl0hhynl"; }; configureFlags = [ diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 6adc147c6accc..46e52c7988e68 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,5 +1,10 @@ { stdenv, lib, fetchurl, libiconv, xz, fetchpatch }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { pname = "gettext"; version = "0.20.1"; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 8afea21729a1b..0b2f34c7b765c 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -17,6 +17,11 @@ but the exact set depends on the library version and the configuration. */ +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + { stdenv, lib , buildPackages , fetchurl diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index c5fffa09bf0b3..f4432cfc5b87e 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -3,6 +3,11 @@ , buildPackages , withStatic ? false }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + let inherit (stdenv.lib) optional; in let self = stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index ab497eadb6d67..b0fe149b6f06f 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags, abseil-cpp }: stdenv.mkDerivation rec { - version = "1.29.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.31.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "1n604grkf2amzrmwcz6am0rpbp3yfb062lpgmhv943hj8wk7xw27"; + sha256 = "1h7gmhkjijfkpqhz8vswhkz2gkphs638g10dlkayic8xg9xdl4gj"; fetchSubmodules = true; }; patches = [ diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 823c123d52adc..d27021280a331 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintl +, gobject-introspection , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. , ApplicationServices, CoreText , withCoreText ? false @@ -36,10 +37,16 @@ stdenv.mkDerivation { # not auto-detected by default "--with-graphite2=${if withGraphite2 then "yes" else "no"}" "--with-icu=${if withIcu then "yes" else "no"}" + "--with-gobject=yes" + "--enable-introspection=yes" ] ++ stdenv.lib.optional withCoreText "--with-coretext=yes"; - nativeBuildInputs = [ pkgconfig libintl ]; + nativeBuildInputs = [ + gobject-introspection + libintl + pkgconfig + ]; buildInputs = [ glib freetype cairo ] # recommended by upstream ++ stdenv.lib.optionals withCoreText [ ApplicationServices CoreText ]; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 113a49138e15a..d0afea119df01 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "hivex"; - version = "1.3.18"; + version = "1.3.19"; src = fetchurl { url = "http://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; - sha256 = "0ibl186l6rd9qj4rqccfwbg1nnx6z07vspkhk656x6zav67ph7la"; + sha256 = "0qppahpf7jq950nf8ial47h90nyqgnsffsj3zgdjjwkn958wq0ji"; }; patches = [ ./hivex-syms.patch ]; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index e5a593a7ff459..004d7d2227c1a 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -8,6 +8,11 @@ , staticOnly ? false }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + let libOnly = type == "lib"; in diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 740248a7ae8f0..5bd311af2d85b 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation { pname = "kmsxx"; - version = "2020-02-14"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "tomba"; repo = "kmsxx"; fetchSubmodules = true; - rev = "7c5e645112a899ad018219365c3898b0e896353f"; - sha256 = "1hj4gk4gwlvpjprjbrmrbrzqjhdgszsndrb1i4f9z7mjvdv8gij2"; + rev = "38bee3092f2d477f1baebfcae464f888d3d04bbe"; + sha256 = "0xz4m9bk0naawxwpx5cy1j3cm6c8c9m5y551csk88y88x1g0z0xh"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 4e4afe96d54e9..2b56f973b5db6 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -2,6 +2,11 @@ , fetchurl, autoreconfHook, gettext }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { name = "libelf-0.8.13"; diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 74aa8133a99f1..1ea0615dc2341 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, static ? false }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { pname = "libev"; version="4.33"; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index eecffeba23da4..d7dad6d956d7d 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -3,6 +3,11 @@ }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { name = "libffi-3.3"; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 92cde8aef4cf4..3a4737d483bf5 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "0mkzdzdxjxjl794rblq4mq33wmb8ikqmfswbqdbr8gw2kw4wlhdl"; + sha256 = "10x7fgb114r4gikdg6flszl3kwzcb9y5qa7sj9936mk0zxhjaylz"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python3 addOpenGLRunpath ]; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index a0df28a66993e..e936f3fd92a2a 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libiconv }: stdenv.mkDerivation rec { - name = "libidn-1.35"; + name = "libidn-1.36"; src = fetchurl { url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "07pyy0afqikfq51z5kbzbj9ldbd12mri0zvx0mfv3ds6bc0g26pi"; + sha256 = "0f20n634whpmdwr81c2r0vxxjwchgkvhsr1i8s2bm0ad6h473dhl"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 1fc0bd9b39954..c5af2d16bb21b 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -1,5 +1,10 @@ { fetchurl, stdenv, libiconv, libunistring, help2man, buildPackages }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 9bd909d3f6e86..36838341fe212 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, nasm, enableStatic ? false }: +{ stdenv, fetchurl, fetchpatch, cmake, nasm, enableStatic ? false, enableShared ? true }: stdenv.mkDerivation rec { @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_STATIC=${if enableStatic then "1" else "0"}" + "-DENABLE_SHARED=${if enableShared then "1" else "0"}" ]; doInstallCheck = true; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index c160b678be74c..4a7a228150cec 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmicrohttpd"; - version = "0.9.70"; + version = "0.9.71"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; - sha256 = "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h"; + sha256 = "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78"; }; outputs = [ "out" "dev" "devdoc" "info" ]; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 235474c0ca1f7..c0459e393fa73 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -2,6 +2,11 @@ , gmp, mpfr }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + let version = "1.1.0"; in diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index e57f279883957..dc3e5e30c7434 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config @@ -24,6 +25,18 @@ stdenv.mkDerivation rec { sha256 = "1yhf9xyxdawbihsx89dpjlac800wrmpwx63rphad2nj225y9q40f"; }; + patches = [ + # to work with latest glslang, remove on release >2.72.0 + (fetchpatch { + url = "https://code.videolan.org/videolan/libplacebo/-/commit/523056828ab86c2f17ea65f432424d48b6fdd389.patch"; + sha256 = "051vhd0l3yad1fzn5zayi08kqs9an9j8p7m63kgqyfv1ksnydpcs"; + }) + (fetchpatch { + url = "https://code.videolan.org/videolan/libplacebo/-/commit/82e3be1839379791b58e98eb049415b42888d5b0.patch"; + sha256 = "0nklj9gfiwkbbj6wfm1ck33hphaxrvzb84c4h2nfj88bapnlm90l"; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 7acda3c0a8f6c..95f7beff88adc 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,34 +1,41 @@ -{ stdenv, fetchurl, pkgconfig -, docSupport ? true, doxygen ? null, graphviz ? null }: +{ stdenv +, lib +, fetchurl +, pkgconfig +, docSupport ? true +, doxygen ? null +, graphviz ? null +}: assert docSupport -> doxygen != null && graphviz != null; - +let + inherit (lib) optionals optionalString; + inherit (lib.versions) majorMinor; +in stdenv.mkDerivation rec { pname = "libsidplayfp"; - major = "1"; - minor = "8"; - level = "7"; - version = "${major}.${minor}.${level}"; + version = "2.0.4"; src = fetchurl { - url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${pname}-${version}.tar.gz"; - sha256 = "14k1sbdcbhykwfcadq5lbpnm9xp2r7vs7fyi84h72g89y8pjg0da"; + url = "mirror://sourceforge/sidplay-residfp/${pname}/${majorMinor version}/${pname}-${version}.tar.gz"; + sha256 = "0d866czmnmhnhb2j37rlrdphjdi2b75kak9barm9xqwg2z0nmmhz"; }; nativeBuildInputs = [ pkgconfig ] - ++ stdenv.lib.optionals docSupport [ doxygen graphviz ]; + ++ optionals docSupport [ doxygen graphviz ]; installTargets = [ "install" ] - ++ stdenv.lib.optionals docSupport [ "doc" ]; + ++ optionals docSupport [ "doc" ]; - outputs = [ "out" ] ++ stdenv.lib.optionals docSupport [ "doc" ]; + outputs = [ "out" ] + ++ optionals docSupport [ "doc" ]; - postInstall = stdenv.lib.optionalString docSupport '' + postInstall = optionalString docSupport '' mkdir -p $doc/share/doc/libsidplayfp mv docs/html $doc/share/doc/libsidplayfp/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A library to play Commodore 64 music derived from libsidplay2"; homepage = "https://sourceforge.net/projects/sidplay-residfp/"; license = with licenses; [ gpl2Plus ]; diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index f0cc73ba4e95c..5f300ef51997d 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -1,5 +1,10 @@ { fetchurl, stdenv, libiconv }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { pname = "libunistring"; version = "0.9.10"; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 3462c423ffde0..aca345e6bbffb 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot" "multiple_listen" "delayed_accept" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" - "tty_pty" "condvar_5" "hrtime" + "tty_pty" "condvar_5" "hrtime" "udp_multicast_join" # Tests that fail when sandboxing is enabled. "fs_event_close_in_callback" "fs_event_watch_dir" "fs_event_error_reporting" "fs_event_watch_dir_recursive" "fs_event_watch_file" diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 75e3439db813e..d5f20f6761c2c 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mailcore2"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "MailCore"; repo = "mailcore2"; rev = version; - sha256 = "0yxynvfmifpw9hdhv499a813hb2ynan74r353lhcdajkkm7w8br5"; + sha256 = "0a69q11z194fdfwyazjyyylx57sqs9j4lz7jwh5qcws8syqgb23z"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 0b0db12c09cda..10540e5e30397 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.1.3"; + version = "20.1.4"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "1w9b6sl82a3birmpgzn1xx6biggpvynr4hmyzxvj30pfdgabhwlq"; + sha256 = "1zlrczmmkcy42w332rfmlicihlnrxmkrnkpb21sl98725cf2f038"; }; prePatch = "patchShebangs ."; @@ -58,6 +58,7 @@ stdenv.mkDerivation { ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ./opencl-install-dir.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch + ./link-radv-with-ld_args_build_id.patch ] # do not prefix user provided dri-drivers-path ++ lib.optional (lib.versionOlder version "19.0.0") (fetchpatch { url = "https://gitlab.freedesktop.org/mesa/mesa/commit/f6556ec7d126b31da37c08d7cb657250505e01a0.patch"; diff --git a/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch b/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch new file mode 100644 index 0000000000000..e6182009ba846 --- /dev/null +++ b/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch @@ -0,0 +1,26 @@ +From 00f3c6d1b771c11ecc08c3d8bd793a51d6e64166 Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Sun, 26 Jul 2020 17:29:49 -0300 +Subject: [PATCH] link radv with ld_args_build_id + +This is needed for radv_device_get_cache_uuid to work correctly. +--- + src/amd/vulkan/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build +index efcf2dd6c89..590f286b8cb 100644 +--- a/src/amd/vulkan/meson.build ++++ b/src/amd/vulkan/meson.build +@@ -173,7 +173,7 @@ libvulkan_radeon = shared_library( + ], + c_args : [c_vis_args, no_override_init_args, radv_flags], + cpp_args : [cpp_vis_args, radv_flags], +- link_args : [ld_args_bsymbolic, ld_args_gc_sections], ++ link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections], + install : true, + ) + +-- +2.27.0 + diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index ceba71ae06ae2..9fc717ef38af5 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, gmp }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { version = "4.0.2"; pname = "mpfr"; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 939f137ac3e91..3294674e178e3 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -12,6 +12,11 @@ , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + assert enableHpack -> jansson != null; assert enableAsioLib -> boost != null; assert enableGetAssets -> libxml2 != null; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 9ab89aaefbfef..8a16803fd8bf3 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -2,7 +2,7 @@ , CoreServices ? null , buildPackages }: -let version = "4.26"; in +let version = "4.27"; in stdenv.mkDerivation { pname = "nspr"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "0gbp3g9p4nhf0zrlvqi5883sqb9zdw0wk83lccpgskxphlni97gw"; + sha256 = "16z82qc1l4cqn66p59ai0dy9ycllywn4jlxhip1a605bns952jbd"; }; patches = [ diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a7b014acc89a8..a504aae6a9807 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.54"; + version = "3.55"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0hvfip056pl07h6w91i6fyji5nczrrsxyr56rls7jd2yryzqpcfs"; + sha256 = "0100hm7n1xrp144xy665z46s0wf1jpkqkncc6bk2w22snhyjwsgw"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -54,6 +54,11 @@ in stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" + substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" + ''; + outputs = [ "out" "dev" "tools" ]; preConfigure = "cd nss"; diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix new file mode 100644 index 0000000000000..40f8d55462da3 --- /dev/null +++ b/pkgs/development/libraries/ntirpc/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake +, krb5, liburcu , libtirpc +} : + +stdenv.mkDerivation rec { + pname = "ntirpc"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "nfs-ganesha"; + repo = "ntirpc"; + rev = "v${version}"; + sha256 = "08vc2z9sl1p9mk1mx0zn4xv7dw12gamhciy41fbavm90iavf3vqm"; + }; + + postPatch = '' + substituteInPlace ntirpc/netconfig.h --replace "/etc/netconfig" "$out/etc/netconfig" + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ krb5 liburcu ]; + + postInstall = '' + mkdir -p $out/etc + + # Library needs a netconfig to run. + # Steal the file from libtirpc + cp ${libtirpc}/etc/netconfig $out/etc/ + ''; + + meta = with stdenv.lib; { + description = "Transport-independent RPC (TI-RPC)"; + homepage = "https://github.com/nfs-ganesha/ntirpc"; + maintainers = [ maintainers.markuskowa ]; + platforms = platforms.linux; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 43170f25d38b4..1fc38dd8aaa84 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -5,6 +5,11 @@ , static ? false }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + with stdenv.lib; let diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 358ae3df99112..e3bdba9b3b1b3 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -9,15 +9,26 @@ with stdenv.lib; let pname = "pango"; - version = "1.44.7"; + version = "1.45.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"; + sha256 = "0zg6gvzk227q997jf1c9p7j5ra87nm008hlgq6q8na9xmgmw2x8z"; }; + patches = [ + # Fix issue with Pango loading unsupported formats that + # breaks mixed x11/opentype font packages. + # See https://gitlab.gnome.org/GNOME/pango/issues/457 + # Remove on next release. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/pango/commit/fe1ee773310bac83d8e5d3c062b13a51fb5fb4ad.patch"; + sha256 = "1px66g31l2jx4baaqi4md59wlmvw0ywgspn6zr919fxl4h1kkh0h"; + }) + ]; + # FIXME: docs fail on darwin outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc"; diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 19f988d965c4b..11c5e42335b11 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -19,8 +19,8 @@ let # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 year = if stdenvNoCC.isDarwin then "2019" else "2020"; - spot = if stdenvNoCC.isDarwin then "3" else "1"; - rel = if stdenvNoCC.isDarwin then "199" else "217"; + spot = if stdenvNoCC.isDarwin then "3" else "2"; + rel = if stdenvNoCC.isDarwin then "199" else "254"; rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; @@ -42,8 +42,8 @@ in stdenvNoCC.mkDerivation { }) else (fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16533/l_mkl_${version}.tgz"; - sha256 = "0v86hrqg15mbc78m9qk8dbkaaq3mlwashgbf9n79kxpl1gilnah8"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16849/l_mkl_${version}.tgz"; + sha256 = "08q2q5rary7fxlrk09kpw0vl7mkk2smmklib44a6qainmxks407d"; }); nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index a69ae5af15f39..926f7ba4789cb 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -1,20 +1,16 @@ { stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which -, lsb-release, glog, protobuf3_11, cbc, zlib +, lsb-release, glog, protobuf, cbc, zlib , ensureNewerSourcesForZipFilesHook, python, swig }: -let - protobuf = protobuf3_11; - pythonProtobuf = python.pkgs.protobuf.override { inherit protobuf; }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "or-tools"; - version = "7.6"; + version = "7.7"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - sha256 = "0605q3y7vh7x7m9azrbkx44blq12zrab6v28b9wmpcn1lmykbw1b"; + sha256 = "06ig9a1afmzgzcg817y0rdq49ahll0q9y7bhhg9d89x6zy959ypv"; }; # The original build system uses cmake which does things like pull @@ -33,7 +29,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" - "PROTOBUF_PYTHON_DESC=${pythonProtobuf}/${python.sitePackages}/google/protobuf/descriptor_pb2.py" + "PROTOBUF_PYTHON_DESC=${python.pkgs.protobuf}/${python.sitePackages}/google/protobuf/descriptor_pb2.py" ]; buildFlags = [ "cc" "pypi_archive" ]; @@ -54,7 +50,7 @@ in stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ abseil-cpp gflags glog protobuf cbc - pythonProtobuf python.pkgs.six + python.pkgs.protobuf python.pkgs.six ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/development/libraries/timezonemap/default.nix new file mode 100644 index 0000000000000..131d66e45cce8 --- /dev/null +++ b/pkgs/development/libraries/timezonemap/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, autoreconfHook +, fetchbzr +, pkgconfig +, gtk3 +, glib +, file +, gobject-introspection +, json-glib +, libsoup +}: + +stdenv.mkDerivation rec { + pname = "timezonemap"; + version = "0.4.5"; + + src = fetchbzr { + url = "lp:timezonemap"; + rev = "58"; + sha256 = "1qdp5f9zd8c02bf0mq4w15rlhz2g51phml5qg9asdyfd1715f8n0"; + }; + + nativeBuildInputs = [ + pkgconfig + autoreconfHook + gobject-introspection + ]; + + buildInputs = [ + gtk3 + glib + json-glib + libsoup + ]; + + configureFlags = [ + "CFLAGS=-Wno-error" + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + "localstatedir=\${TMPDIR}" + ]; + + preConfigure = '' + for f in {configure,m4/libtool.m4}; do + substituteInPlace $f\ + --replace /usr/bin/file ${file}/bin/file + done + ''; + + postPatch = '' + sed "s|/usr/share/libtimezonemap|$out/share/libtimezonemap|g" -i ./src/tz.h + ''; + + meta = with stdenv.lib; { + homepage = "https://launchpad.net/timezonemap"; + description = "A GTK+3 Timezone Map Widget"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index c4a4c497cedfd..98746968146d9 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -12,6 +12,11 @@ , splitStaticOutput ? static }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + assert splitStaticOutput -> static; stdenv.mkDerivation (rec { diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index e648c83fa17d7..536a025d15b42 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper ] ++ - lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ]; + lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 341a0f6af1d10..c8961efa755a0 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -72,6 +72,7 @@ , {"fast-cli": "1.x"} , "fkill-cli" , "forever" +, "get-graphql-schema" , "git-run" , "git-ssb" , "git-standup" @@ -194,6 +195,7 @@ , "typescript-language-server" , "uglify-js" , "ungit" +, "vim-language-server" , "vscode-css-languageserver-bin" , "vscode-html-languageserver-bin" , "vue-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 52a7474ad45a4..2d733e5cf26de 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,22 +22,22 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1000.4" = { + "@angular-devkit/architect-0.1000.5" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1000.4"; + version = "0.1000.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.4.tgz"; - sha512 = "n0DXdrecxXupxKf37sv5Oky5QpQXOHPgLDAmyAwevr31yLEwyZ3OQoVxaC68AMQJFYMlHYYMwi6gdIcFmL6W0g=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.5.tgz"; + sha512 = "BhNqB7fmmrDQwxoJ3zdw5FslFD+nYGgMTiC48ERVYJVuN3BK6xtt2OGA7vho3eJ13OE5cPGUi8crQDRROgxxQg=="; }; }; - "@angular-devkit/core-10.0.4" = { + "@angular-devkit/core-10.0.5" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "10.0.4"; + version = "10.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.4.tgz"; - sha512 = "Pe60BJCcAVtOkhXn2c+ql1NfyMCu421jWmKwl1KsW1DXclpGB+UIa560ICBgEwla6DyltMKEN/lX+P4WOskpkQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.5.tgz"; + sha512 = "ZaF1EYniIo+yRLvvaKnLrjYCdKeg2U3YtbA932M2AIfjgfFv/9mnAbH4jmZsBZhCstxZPz+ItwJesdR20h4Z1Q=="; }; }; "@angular-devkit/core-9.1.7" = { @@ -58,13 +58,13 @@ let sha512 = "SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q=="; }; }; - "@angular-devkit/schematics-10.0.4" = { + "@angular-devkit/schematics-10.0.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "10.0.4"; + version = "10.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.4.tgz"; - sha512 = "k9b73XkKQK8yFbq+dQqJnxAMG3mm/YR1KQlsQzOEVdw8cqqEALLoUXg/73hT5eUnSsNWmyDLBzEAyNtemmmI4w=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.5.tgz"; + sha512 = "UeeV8O0IydxCKj2oejygs80oIAQXPYrJHo0PQ/fa0RH6rtV3wZwirdy+yqq/BDGhtV/5VQSVCvu6uyAtGGMgNg=="; }; }; "@angular-devkit/schematics-9.1.7" = { @@ -202,13 +202,13 @@ let sha512 = "bQVb6PE34iDmZj6wZZzYm3rLjguxoSqHZj4QReVQsOle/LdIwl48hV9Iz/Pivy9NtVCui9LL/lmSQzMt0G0jkw=="; }; }; - "@apollo/federation-0.17.0" = { + "@apollo/federation-0.19.0" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.17.0"; + version = "0.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.17.0.tgz"; - sha512 = "vSW/M8+SGdu5xALsA/RL37GgB+wNFZpXCyPAcg3b68c8x7uoQHgYwqwUu7D+GnAGeOpDUrNnFPdKAYW7elYkyQ=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.19.0.tgz"; + sha512 = "8cd8ftHgqaseDTN7RJrROT6FT1xy8RV2Qb9BGhhqPVMHqf08GtidBqQTk6hv1UDR0qu/TRZA6J4Kh7oXeMrPQg=="; }; }; "@apollo/protobufjs-1.0.4" = { @@ -319,40 +319,31 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/compat-data-7.10.5" = { + "@babel/compat-data-7.11.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.5.tgz"; - sha512 = "mPVoWNzIpYJHbWje0if7Ck36bpbtTvIxOi9+6WSK9wjGEXearAqlwBoTQvVjsAY2VIwgcs8V940geY3okzRCEw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz"; + sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; }; }; - "@babel/core-7.10.5" = { + "@babel/core-7.11.1" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.10.5.tgz"; - sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; - }; - }; - "@babel/generator-7.10.4" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.10.4"; + version = "7.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz"; - sha512 = "toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz"; + sha512 = "XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ=="; }; }; - "@babel/generator-7.10.5" = { + "@babel/generator-7.11.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.5.tgz"; - sha512 = "3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz"; + sha512 = "fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -463,13 +454,13 @@ let sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; }; }; - "@babel/helper-member-expression-to-functions-7.10.5" = { + "@babel/helper-member-expression-to-functions-7.11.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz"; - sha512 = "HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; + sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q=="; }; }; "@babel/helper-module-imports-7.10.4" = { @@ -481,13 +472,13 @@ let sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw=="; }; }; - "@babel/helper-module-transforms-7.10.5" = { + "@babel/helper-module-transforms-7.11.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz"; - sha512 = "4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; + sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg=="; }; }; "@babel/helper-optimise-call-expression-7.10.4" = { @@ -544,13 +535,22 @@ let sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="; }; }; - "@babel/helper-split-export-declaration-7.10.4" = { + "@babel/helper-skip-transparent-expression-wrappers-7.11.0" = { + name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; + packageName = "@babel/helper-skip-transparent-expression-wrappers"; + version = "7.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"; + sha512 = "0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q=="; + }; + }; + "@babel/helper-split-export-declaration-7.11.0" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz"; - sha512 = "pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; + sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg=="; }; }; "@babel/helper-validator-identifier-7.10.4" = { @@ -589,13 +589,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.10.5" = { + "@babel/parser-7.11.1" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.10.5"; + version = "7.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz"; - sha512 = "wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.1.tgz"; + sha512 = "u9QMIRdKVF7hfEkb3nu2LgZDIzCQPv+yHD9Eg6ruoJLjkrQ9fFz4IBSlF/9XwoNri9+2F1IY+dYuOfZrXq8t3w=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -634,6 +634,15 @@ let sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ=="; }; }; + "@babel/plugin-proposal-export-namespace-from-7.10.4" = { + name = "_at_babel_slash_plugin-proposal-export-namespace-from"; + packageName = "@babel/plugin-proposal-export-namespace-from"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"; + sha512 = "aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg=="; + }; + }; "@babel/plugin-proposal-json-strings-7.10.4" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; @@ -643,6 +652,15 @@ let sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw=="; }; }; + "@babel/plugin-proposal-logical-assignment-operators-7.11.0" = { + name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; + packageName = "@babel/plugin-proposal-logical-assignment-operators"; + version = "7.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"; + sha512 = "/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q=="; + }; + }; "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; @@ -661,13 +679,13 @@ let sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.10.4" = { + "@babel/plugin-proposal-object-rest-spread-7.11.0" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz"; - sha512 = "6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz"; + sha512 = "wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.10.4" = { @@ -679,13 +697,13 @@ let sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.10.4" = { + "@babel/plugin-proposal-optional-chaining-7.11.0" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz"; - sha512 = "ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"; + sha512 = "v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA=="; }; }; "@babel/plugin-proposal-private-methods-7.10.4" = { @@ -742,6 +760,15 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; + "@babel/plugin-syntax-export-namespace-from-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-export-namespace-from"; + packageName = "@babel/plugin-syntax-export-namespace-from"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; + }; + }; "@babel/plugin-syntax-flow-7.10.4" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; @@ -877,13 +904,13 @@ let sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA=="; }; }; - "@babel/plugin-transform-block-scoping-7.10.5" = { + "@babel/plugin-transform-block-scoping-7.11.1" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.10.5"; + version = "7.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.5.tgz"; - sha512 = "6Ycw3hjpQti0qssQcA6AMSFDHeNJ++R6dIMnpRqUjFeBBTmTDPa8zgF90OVfTvAo11mXZTlVUViY1g8ffrURLg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"; + sha512 = "00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew=="; }; }; "@babel/plugin-transform-classes-7.10.4" = { @@ -1093,13 +1120,13 @@ let sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ=="; }; }; - "@babel/plugin-transform-runtime-7.10.5" = { + "@babel/plugin-transform-runtime-7.11.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.5.tgz"; - sha512 = "tV4V/FjElJ9lQtyjr5xD2IFFbgY46r7EeVu5a8CpEKT5laheHKSlFeHjpkPppW3PqzGLAuv5k2qZX5LgVZIX5w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz"; + sha512 = "LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw=="; }; }; "@babel/plugin-transform-shorthand-properties-7.10.4" = { @@ -1111,13 +1138,13 @@ let sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q=="; }; }; - "@babel/plugin-transform-spread-7.10.4" = { + "@babel/plugin-transform-spread-7.11.0" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz"; - sha512 = "1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"; + sha512 = "UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw=="; }; }; "@babel/plugin-transform-sticky-regex-7.10.4" = { @@ -1147,13 +1174,13 @@ let sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA=="; }; }; - "@babel/plugin-transform-typescript-7.10.5" = { + "@babel/plugin-transform-typescript-7.11.0" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.5.tgz"; - sha512 = "YCyYsFrrRMZ3qR7wRwtSSJovPG5vGyG4ZdcSAivGwTfoasMp3VOB/AKhohu3dFtmB4cCDcsndCSxGtrdliCsZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz"; + sha512 = "edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w=="; }; }; "@babel/plugin-transform-unicode-escapes-7.10.4" = { @@ -1174,22 +1201,22 @@ let sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; }; }; - "@babel/polyfill-7.7.0" = { + "@babel/polyfill-7.10.4" = { name = "_at_babel_slash_polyfill"; packageName = "@babel/polyfill"; - version = "7.7.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.7.0.tgz"; - sha512 = "/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ=="; + url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.10.4.tgz"; + sha512 = "8BYcnVqQ5kMD2HXoHInBH7H1b/uP3KdnwCYXOqFnXqguOyuu443WXusbIUbWEfY3Z0Txk0M1uG/8YuAMhNl6zg=="; }; }; - "@babel/preset-env-7.10.4" = { + "@babel/preset-env-7.11.0" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.4.tgz"; - sha512 = "tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz"; + sha512 = "2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg=="; }; }; "@babel/preset-flow-7.10.4" = { @@ -1237,15 +1264,6 @@ let sha512 = "eYHdLv43nyvmPn9bfNfrcC4+iYNwdQ8Pxk1MFJuU/U5LpSYl/PH4dFMazCYZDFVi8ueG3shvO+AQfLrxpYulQw=="; }; }; - "@babel/runtime-7.10.2" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz"; - sha512 = "6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg=="; - }; - }; "@babel/runtime-7.10.5" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -1255,22 +1273,13 @@ let sha512 = "otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg=="; }; }; - "@babel/runtime-7.7.7" = { + "@babel/runtime-7.11.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.7.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.7.tgz"; - sha512 = "uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA=="; - }; - }; - "@babel/runtime-corejs3-7.10.5" = { - name = "_at_babel_slash_runtime-corejs3"; - packageName = "@babel/runtime-corejs3"; - version = "7.10.5"; + version = "7.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.10.5.tgz"; - sha512 = "RMafpmrNB5E/bwdSphLr8a8++9TosnyJp98RZzI6VOx2R2CCMpsXXXRvmI700O9oEKpXdZat6oEK68/F0zjd4A=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.1.tgz"; + sha512 = "nH5y8fLvVl3HAb+ezbgcgwrH8QbClWo8xzkOu7+oyqngo3EVorwpWJQaqXPjGRpfj7mQvsJCl/S8knkfkPWqrw=="; }; }; "@babel/template-7.10.4" = { @@ -1282,13 +1291,13 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.10.5" = { + "@babel/traverse-7.11.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz"; - sha512 = "yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz"; + sha512 = "ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg=="; }; }; "@babel/types-7.10.4" = { @@ -1300,13 +1309,13 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.10.5" = { + "@babel/types-7.11.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz"; - sha512 = "ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz"; + sha512 = "O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA=="; }; }; "@chemzqm/neovim-5.1.9" = { @@ -1354,13 +1363,13 @@ let sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ=="; }; }; - "@cronvel/get-pixels-3.3.1" = { + "@cronvel/get-pixels-3.4.0" = { name = "_at_cronvel_slash_get-pixels"; packageName = "@cronvel/get-pixels"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cronvel/get-pixels/-/get-pixels-3.3.1.tgz"; - sha512 = "jgDb8vGPkpjRDbiYyHTI2Bna4HJysjPNSiERzBnRJjCR/YqC3u0idTae0tmNECsaZLOpAWmlK9wiIwnLGIT9Bg=="; + url = "https://registry.npmjs.org/@cronvel/get-pixels/-/get-pixels-3.4.0.tgz"; + sha512 = "do5jDoX9oCR/dGHE4POVQ3PYDCmQ2Fow4CA72UL4WoE8zUImA/0lChczjfl+ucNjE4sXFWUnzoO6j4WzrUvLnw=="; }; }; "@cycle/dom-18.3.0" = { @@ -1435,6 +1444,24 @@ let sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; }; }; + "@emotion/babel-utils-0.6.10" = { + name = "_at_emotion_slash_babel-utils"; + packageName = "@emotion/babel-utils"; + version = "0.6.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@emotion/babel-utils/-/babel-utils-0.6.10.tgz"; + sha512 = "/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow=="; + }; + }; + "@emotion/hash-0.6.6" = { + name = "_at_emotion_slash_hash"; + packageName = "@emotion/hash"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@emotion/hash/-/hash-0.6.6.tgz"; + sha512 = "ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ=="; + }; + }; "@emotion/is-prop-valid-0.8.8" = { name = "_at_emotion_slash_is-prop-valid"; packageName = "@emotion/is-prop-valid"; @@ -1444,6 +1471,15 @@ let sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA=="; }; }; + "@emotion/memoize-0.6.6" = { + name = "_at_emotion_slash_memoize"; + packageName = "@emotion/memoize"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.6.6.tgz"; + sha512 = "h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ=="; + }; + }; "@emotion/memoize-0.7.4" = { name = "_at_emotion_slash_memoize"; packageName = "@emotion/memoize"; @@ -1453,6 +1489,42 @@ let sha512 = "Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="; }; }; + "@emotion/serialize-0.9.1" = { + name = "_at_emotion_slash_serialize"; + packageName = "@emotion/serialize"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.9.1.tgz"; + sha512 = "zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ=="; + }; + }; + "@emotion/stylis-0.7.1" = { + name = "_at_emotion_slash_stylis"; + packageName = "@emotion/stylis"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.7.1.tgz"; + sha512 = "/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ=="; + }; + }; + "@emotion/stylis-0.8.5" = { + name = "_at_emotion_slash_stylis"; + packageName = "@emotion/stylis"; + version = "0.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz"; + sha512 = "h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="; + }; + }; + "@emotion/unitless-0.6.7" = { + name = "_at_emotion_slash_unitless"; + packageName = "@emotion/unitless"; + version = "0.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.6.7.tgz"; + sha512 = "Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg=="; + }; + }; "@emotion/unitless-0.7.5" = { name = "_at_emotion_slash_unitless"; packageName = "@emotion/unitless"; @@ -1462,6 +1534,15 @@ let sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="; }; }; + "@emotion/utils-0.8.2" = { + name = "_at_emotion_slash_utils"; + packageName = "@emotion/utils"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@emotion/utils/-/utils-0.8.2.tgz"; + sha512 = "rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw=="; + }; + }; "@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" = { name = "_at_endemolshinegroup_slash_cosmiconfig-typescript-loader"; packageName = "@endemolshinegroup/cosmiconfig-typescript-loader"; @@ -1525,94 +1606,94 @@ let sha512 = "oJZb4PScX25ZGObpw9n7/bJBE7R0oF6hJ4ABe+WvMqSCI3kxaReMTgJJNIrxpmbXscxWM8U1ndLefP5IjPcU7Q=="; }; }; - "@graphql-tools/delegate-6.0.15" = { + "@graphql-tools/delegate-6.0.16" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "6.0.15"; + version = "6.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.0.15.tgz"; - sha512 = "GG/zp29PMfG6eXpfe1M5C3U1EI1f3tJu2glFN8t0RIfp4FEgZs/PRvZuuep5orFge8dvX/LQpJY8Vl2JmU4WMg=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.0.16.tgz"; + sha512 = "mq/vTHaBGOWxqKqjkj8KJpH+hg6Y096nZYTLpUZcPf6eX1OhxEIkdw5NDN99ii2/NGAyw7ApoY7BWFEEneiiTg=="; }; }; - "@graphql-tools/graphql-file-loader-6.0.15" = { + "@graphql-tools/graphql-file-loader-6.0.16" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.0.15"; + version = "6.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.0.15.tgz"; - sha512 = "QbCf731A2A2hrHP+cMSAKvY3D7IauFNqp5bAGdbLwSHRqaxUIfKi7Q76/9pZ3rN/e6yu/zVz+t1rkf7lT2/8OA=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.0.16.tgz"; + sha512 = "qgYplQhnY90CnQiRZpM2svCzyZ7FAXaca+liZ6hqA9jfWUWh4N9Tnmy//BqrTmULGVeanPM/m8MyhZEWvvRNIg=="; }; }; - "@graphql-tools/import-6.0.15" = { + "@graphql-tools/import-6.0.16" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.0.15"; + version = "6.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.0.15.tgz"; - sha512 = "YaQizD031nlrObiAJj+DO+0Wf2ompR2G5OFNQZIOgUlm1+kfH3GPIFoE5Ww74YH6vy9s4UyYYeZJz6APxPdMzg=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.0.16.tgz"; + sha512 = "zZRxJwAtUsyIckjfiscteFwpaIuEh3EjuhXEaNviMuwhOSrYT0oWmelcPgp/VHT6N4NZD1/y5jxQ4KHK4MrAfg=="; }; }; - "@graphql-tools/json-file-loader-6.0.15" = { + "@graphql-tools/json-file-loader-6.0.16" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "6.0.15"; + version = "6.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.0.15.tgz"; - sha512 = "SQO7w+KPxW6Q3snE3G4eNOA8CcBBDYHpk8JILj93oe4BassuPY5NCUOeZ+2PYczwZQbTNDQXeW1oQou44U1aBg=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.0.16.tgz"; + sha512 = "djkzPmGvVpD3YRypibYRNTgVUUfkae0JXcEWP/gn/8Y8+mnwyE2EiBfGZoW6Ejw5xTKQ7PgmOyWUIJgdEVMCJg=="; }; }; - "@graphql-tools/load-6.0.15" = { + "@graphql-tools/load-6.0.16" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.0.15"; + version = "6.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.0.15.tgz"; - sha512 = "STH3ZjbViRqDyCw+f7PZrnDs6yhP7m2l4x5lJBMyMeLaLwuO1z+WhgtqYZNpCYlQY2jNSLXWCa0nWmpYvdLnlA=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.0.16.tgz"; + sha512 = "7nJUrQqou8lQG5x6tJQAl0N/ONP2oYEgSmN0QwjSxv8iz0aRDoK/nHzGlVk6/Sot58iogF0E+qx/vDKNJh2piw=="; }; }; - "@graphql-tools/merge-6.0.15" = { + "@graphql-tools/merge-6.0.16" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.0.15"; + version = "6.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.0.15.tgz"; - sha512 = "qusTLzkf6GtxS6LRQnEAWIwA1BeJj5SkZ2pnE4/wVe9gs0grpEsOKYxvGpBi8IZR7r8UeNpkdgk2HP0jlq/WWA=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.0.16.tgz"; + sha512 = "QWeTru5IAON9ruTqs48X3WndRjz4pamTfA90M/RICkgog1LsFbIFhHM2QF+hogoMqxhlhmjgfMjQl7xXtDT+9Q=="; }; }; - "@graphql-tools/schema-6.0.15" = { + "@graphql-tools/schema-6.0.16" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.0.15"; + version = "6.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.0.15.tgz"; - sha512 = "Wo+d6/OPjeXjwB1pcqsWmqLdweGH+BVhvKe/YPQA/uiWr8ikgShvNLNiuF03gc/1AMR487A09XcPEyabRKJLew=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.0.16.tgz"; + sha512 = "e5jqE13L5eywCc0Uqlf2ThgScj1KgrCQmwvm+giVK0Dh9goMbwLZt/ciEJSr/LYn/vsH5sec9Qu5Jml6IX7zLA=="; }; }; - "@graphql-tools/url-loader-6.0.15" = { + "@graphql-tools/url-loader-6.0.16" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.0.15"; + version = "6.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.0.15.tgz"; - sha512 = "/iGuK7J9yCECYMYQJqKNWnz4ytPHppkxh4YS5Ud9QPDNl488e+eInyNbkdiWcFGyZ4KHqEnXSDdRFg3mFNrMnw=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.0.16.tgz"; + sha512 = "b+dwCDTcWIGOCYNYUKr6nbkAi8uOmgYHCf1wXsG09gV8uchU74tL8ebxBoaIEU8C9GSqterK2Y7mNjWyw3UdQQ=="; }; }; - "@graphql-tools/utils-6.0.15" = { + "@graphql-tools/utils-6.0.16" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.0.15"; + version = "6.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.0.15.tgz"; - sha512 = "VG5cMLPgh9RDLGHamGpXVnBrNw7bZGT46LrxK7IIqDZI9H0GPsRCo8+p+CfDkw0IlDiEECb624WVCpm9IYNecA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.0.16.tgz"; + sha512 = "WSYVqiIpda0CzXgHuKBJkqE0zZs4aruoVxn5KVMmqDoZbPVJ4f/pATVgKYyelOlBlx5gOfs8PCFpWcQhDB39LA=="; }; }; - "@graphql-tools/wrap-6.0.15" = { + "@graphql-tools/wrap-6.0.16" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "6.0.15"; + version = "6.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.0.15.tgz"; - sha512 = "yWiDBrbzml6PRl4aeJBLNGPw385LFtszMfkfYwjLSWvNyVILDCMa/XWHThw4FMaZ1nPL0GuLggW2bVkUBi3TYA=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.0.16.tgz"; + sha512 = "Q1VECNmmRygX1qdlGEF6dimAiuX9rauqalJif2zL9Fa4uORSvPr3VxOA8A0+4ypz2QYL+PjqQ88rCATUZxpY9g=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -2398,6 +2479,15 @@ let sha512 = "MOnJPqKPpuwBHDdw96gHoshd/QEYrUlLPF92xQFXm6uIOo1EGISg8OOSoji2isEtp2gHpO+bL8p/h4oPG10Fqw=="; }; }; + "@netflix/nerror-1.1.3" = { + name = "_at_netflix_slash_nerror"; + packageName = "@netflix/nerror"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@netflix/nerror/-/nerror-1.1.3.tgz"; + sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; + }; + }; "@node-red/editor-api-1.1.2" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; @@ -2533,13 +2623,13 @@ let sha512 = "nFtqjVETliApiRdjbYwKwhlSHx2ZMagyj5b9YbNt0BWeeOVxJd47ZVE2u16vxDHyTOZvk+YLV7INwfAE9a2uow=="; }; }; - "@npmcli/run-script-1.3.1" = { + "@npmcli/run-script-1.4.0" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.3.1.tgz"; - sha512 = "9Ea57XJjNLtBFRAaiKqqdoqRrL2QkM0vvCbMjPecljhog5IHupStPtZULbl0CoGN00N3lhLWJ4PaIEC0MGjqJw=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.4.0.tgz"; + sha512 = "evlD0Ur2ILGyTP7FfMYi90x80bto9+nEbGjoWzdF+gmIX3HuA1nW0Ghj91JFaTJAHiXnDEEduZS24oAve/aeOA=="; }; }; "@oclif/color-0.1.2" = { @@ -2614,13 +2704,13 @@ let sha512 = "bGHUdo5e7DjPJ0vTeRBMIrfqTRDBfyR5w0MP41u0n3r7YG5p14lvMmiCXxi6WDaP2Hw5nqx3PnkAIntCKZZN7g=="; }; }; - "@oclif/plugin-help-3.1.0" = { + "@oclif/plugin-help-3.2.0" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.1.0.tgz"; - sha512 = "orSWpXGlJaX16eSjAtI8scA8QhrjQOaCSHodEx52t18JKbIVzG8jcngugyWAOB/V4jhPl0rdiVk9XFsaIIiG2g=="; + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.0.tgz"; + sha512 = "7jxtpwVWAVbp1r46ZnTK/uF+FeZc6y4p1XcGaIUuPAp7wx6NJhIRN/iMT9UfNFX/Cz7mq+OyJz+E+i0zrik86g=="; }; }; "@oclif/plugin-not-found-1.2.4" = { @@ -2758,13 +2848,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-5.1.1" = { + "@octokit/types-5.2.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "5.1.1"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-5.1.1.tgz"; - sha512 = "8LDEbrxJrYiwzBrfZhoMFEq9+1o7Kg4ydiNgZt2DBU6n34iEd37qNqOkawrjJZZ6iUS5IXYf6EmGONn34YLgzw=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-5.2.1.tgz"; + sha512 = "PugtgEw8u++zAyBpDpSkR8K1OsT2l8QWp3ECL6bZHFoq9PfHDoKeGFWSuX2Z+Ghy93k1fkKf8tsmqNBv+8dEfQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -2956,13 +3046,13 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-10.0.4" = { + "@schematics/angular-10.0.5" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "10.0.4"; + version = "10.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.4.tgz"; - sha512 = "wTpuVfPKALOcOHfD7Y222r/IfqJgpqASyoXdkzf7dZVrLXjNy/XrKuc2Vfn85Ce9lnme0xT5ww+KjbSRc0cSUw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.5.tgz"; + sha512 = "zg8QxgW3uLva/MSKMRYfV7dzj00SUki4nxYN4j1rw42VlwNPnFrPtzFVEilL6N7wFgoHP/6cZRgm4bfXYvLBvg=="; }; }; "@schematics/schematics-0.901.9" = { @@ -2974,22 +3064,22 @@ let sha512 = "Nca8Ig/mFFnhLmosbdWysX4N2HiwVOzA4gQj2TZnMCJ98Cftdebs388LstjsJwGtJyvAa2v4yoaPaUMIGVgQ9w=="; }; }; - "@schematics/update-0.1000.4" = { + "@schematics/update-0.1000.5" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1000.4"; + version = "0.1000.5"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1000.4.tgz"; - sha512 = "NkIUsqnEqG6jhW6b1xXYmgW02WYAN9/IoswnZnaQrbGzxroNVQKURiV4AP22sZLCr7gQ9NJwjXxO5rxbzbY8wg=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1000.5.tgz"; + sha512 = "xodvq3X4B90u8myMEp9ESPnD2aC4YtNXj1FOcJ+BnguRA7q9rq9EL9Xqdef8sx3PObbSiKC0OFLyxgw76WuC3Q=="; }; }; - "@serverless/cli-1.5.1" = { + "@serverless/cli-1.5.2" = { name = "_at_serverless_slash_cli"; packageName = "@serverless/cli"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.5.1.tgz"; - sha512 = "YUVPGutE8VEbIPCb6aHfePec5kKA1iaiMyLb8snXWYDLy/EWW1Dkff/DiLgeNEy6jqV4n+9lng92re+tMi+U6g=="; + url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.5.2.tgz"; + sha512 = "FMACx0qPD6Uj8U+7jDmAxEe1tdF9DsuY5VsG45nvZ3olC9xYJe/PMwxWsjXfK3tg1HUNywYAGCsy7p5fdXhNzw=="; }; }; "@serverless/component-metrics-1.0.8" = { @@ -3001,13 +3091,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.32.0" = { + "@serverless/components-2.34.1" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.32.0"; + version = "2.34.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.32.0.tgz"; - sha512 = "BkSC/5Ln/wfkxcReyqCwrJz+4gPdzS5w6nMQxXZrEfCPj/kND8+ryGmpE1X3zAQg54L+sRFELJB8Xfgg1E8c4w=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.34.1.tgz"; + sha512 = "AmbGbeOufF0ZQN3yVbzh2MKxItdLgEaGhUNEKgw59xohMhwkzDHSW/FXulFQfunEEcCKCFnPE/Lzr/1GHnhVUQ=="; }; }; "@serverless/core-1.1.2" = { @@ -3019,13 +3109,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.6.16" = { + "@serverless/enterprise-plugin-3.7.0" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.6.16"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.16.tgz"; - sha512 = "lucCz18gfpUQWgoca1QKWwQFthB38wVrQMwZ16W+4lxW5nNKUu1ptgO2dU/s8UkXoJtWhAgC77dUOkYW4ozkXw=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.7.0.tgz"; + sha512 = "KAGj1HO0zAoBN4thsD+8S18fnvCLyHXnNFBfNiJsgGAzDIOwtwKqkMUR3z2LeQjAKuFeNJ8+3erexK75j50iBw=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -3046,22 +3136,22 @@ let sha512 = "2c5A6HSWwXluknPNJ2s+Z4WfBwP7Kn6kgsEKD+5xlXpDpBFsRku/xJyO9eqRCwxTM41stgHNC6TRsZ03+wH/rw=="; }; }; - "@serverless/platform-client-1.0.10" = { + "@serverless/platform-client-1.1.1" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "1.0.10"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.0.10.tgz"; - sha512 = "+Y+u8wSO67oIsNuI1spfwTjN1zw0OwsU/wQ4IDZsKiyAxs+ww0STDoJfVQdwNzuhw0IwnBO0Wtv8AaLHdNQYTw=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.1.1.tgz"; + sha512 = "vvS8Mn/nKaAIcP4r5wagsU7YoDQ6u5V3DuSOYx6e7fJiZ9vUKPpUbdUovUDxIoANC+Jo4SzuRxfL6MrK8qfZDw=="; }; }; - "@serverless/platform-client-china-1.0.27" = { + "@serverless/platform-client-china-1.0.32" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.27"; + version = "1.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.27.tgz"; - sha512 = "hdZSoZHUvHEFBnUHfm3+8L5ySf7M4Dr0Y9QHkTukpgQXI+RfuS9CZ3x0P7ST9vxDIs233h/wQiOgvpniUD2r6Q=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.32.tgz"; + sha512 = "fZDmBNcT1w4rUTd4w6Nt0ONeQAfpUni37/v3SEMFWV5hCmjdh2LUIaaF1OC/sZA4KeYzcLTViJezymYkHXBHIA=="; }; }; "@serverless/platform-sdk-2.3.1" = { @@ -3091,13 +3181,13 @@ let sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; }; }; - "@serverless/utils-china-0.1.19" = { + "@serverless/utils-china-0.1.22" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.19"; + version = "0.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.19.tgz"; - sha512 = "DFoEpaqFDkUUAgsl0RxxOSO27iEv2iVPc0koOWws0SuSY8YPWcXq/p7fXCYs4IypyzSo/w9OoFxPUrzyC19GSg=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.22.tgz"; + sha512 = "TYI1khc2Is3ESNwR2QrQx0fo8PfJto0IlDV3qgvfZ5ovCjPG6Ql1ziO8BpzDs5DgAO4TeNuwo28LJOUw/ANiKg=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -3127,13 +3217,13 @@ let sha512 = "/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg=="; }; }; - "@sindresorhus/is-3.0.0" = { + "@sindresorhus/is-3.1.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-3.0.0.tgz"; - sha512 = "kqA5I6Yun7PBHk8WN9BBP1c7FfN2SrD05GuVSEYPqDb4nerv7HqYfgBfMIKmT/EuejURkJKLZuLyGKGs6WEG9w=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-3.1.0.tgz"; + sha512 = "n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ=="; }; }; "@slack/client-3.16.0" = { @@ -3280,13 +3370,13 @@ let sha512 = "IUq5bHRL0vtVKtfvd4GOccAIaLYHbcertug2UVZzk5+yY6R/CxfYsnFUTho1h4BdkfNdin2tPjE/5jRF4SKSrw=="; }; }; - "@snyk/java-call-graph-builder-1.11.1" = { + "@snyk/java-call-graph-builder-1.12.3" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.11.1"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.11.1.tgz"; - sha512 = "1SiAE78D8HQCE5fDKj6CeToFE/S52318oSP/X4flRwgFj9N78gD8i5O4oTkP9WwNMeFtW4Viqctc0sOK6Iea/w=="; + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.12.3.tgz"; + sha512 = "eN32RcCq5J0Veo5NIbDUSb2KRNiVsZMt1w94bFYKxFt6F1tIoiv1CraXdTHSlgQosZ7tw93e8qdOKmQXOtK88Q=="; }; }; "@snyk/lodash-4.17.15-patch" = { @@ -3460,130 +3550,130 @@ let sha512 = "DIenMFJXrd4yb35BbW/7LiikCQotbm9HEBG9S4HKV47tcKt6e4nZrNPO3R2hHgQ2jdo0xfqmlUlCP0O4Q3b9pw=="; }; }; - "@textlint/ast-node-types-4.2.5" = { + "@textlint/ast-node-types-4.3.4" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "4.2.5"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.2.5.tgz"; - sha512 = "+rEx4jLOeZpUcdvll7jEg/7hNbwYvHWFy4IGW/tk2JdbyB3SJVyIP6arAwzTH/sp/pO9jftfyZnRj4//sLbLvQ=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.3.4.tgz"; + sha512 = "Grq+vJuNH7HCa278eFeiqJvowrD+onMCoG2ctLyoN+fXYIQGIr1/8fo8AcIg+VM16Kga+N6Y1UWNOWPd8j1nFg=="; }; }; - "@textlint/ast-tester-2.1.6" = { + "@textlint/ast-tester-2.2.4" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "2.1.6"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.1.6.tgz"; - sha512 = "i+UrSKZXs561g8LXsCBkgpNYkgBS3T3Pif2/+DraZmSKpQ2r2D1yCOdH82IGPWWpQ/GMSg6Z0qpLJpjnYz+bpg=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.2.4.tgz"; + sha512 = "676xpY3/+Xa+tPaiUPaD4sl//+p3xsnSPYLrQjSmHWXX78F3MwAWd/Lek+SCn4wwvf1tCIx0SPtjfOCa6ru8qw=="; }; }; - "@textlint/ast-traverse-2.1.7" = { + "@textlint/ast-traverse-2.2.5" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "2.1.7"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.1.7.tgz"; - sha512 = "73Nw0R4TaskPmF36Hop1DZ8AbH339WrGiLQjzbOLaXHaBHQ4hdNw28UMlw4glfPZb7/zvxPcJRtg9AB8F3ZW0g=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.2.5.tgz"; + sha512 = "YduGVn7iaUYOfo7TwHO4b0K/qQpj61Ol/M884ck3vetNd0zBxpHO3GpQKW87SZGGtlsBa9v5Suz/yypnlPo3Og=="; }; }; - "@textlint/feature-flag-3.1.6" = { + "@textlint/feature-flag-3.2.4" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "3.1.6"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.1.6.tgz"; - sha512 = "R2s027/WG3zhCMHZG79OhRFmkSL2ghwvFYg/W+2VUva5aYC8i9yeuwRyWt7m83tP1qlI+bq7j3S04fyn6yNheg=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.2.4.tgz"; + sha512 = "ABhbZ5rfkwa/kTBFxVmeMzE1flcnUjLJ5LTZvOaxH/pElfLLN1J4FEmAZTRCvXGAB498II6nkM2CqcikbKzh6A=="; }; }; - "@textlint/fixer-formatter-3.1.13" = { + "@textlint/fixer-formatter-3.2.5" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "3.1.13"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.1.13.tgz"; - sha512 = "FXqAJZ+5fLsOZjvFmn1JhCer8gQI4ZQk3R45bXizRJm6DASByPAGGh/MAQxxHSGeR5wR8miO/koxA2BrS8OhAw=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.2.5.tgz"; + sha512 = "fh6XiLbX9WF8+79g20qb1I85k/Yc9+h7LRccmaLzTBjVQDNYxX5BtfvGsY0Vf5tBZKT2xFZH4eSLH/EWoL3weg=="; }; }; - "@textlint/kernel-3.2.1" = { + "@textlint/kernel-3.3.6" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "3.2.1"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.2.1.tgz"; - sha512 = "gMCgP/tAjCX8dGqgu7nhUwaDC/TzDKeRZb9qa50nqbnILRasKplj3lOWn2osZdkScVZPLQp+al1pDh9pU4D+Dw=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.3.6.tgz"; + sha512 = "M2ciQDAo5W6rpRADzGnMXyxhvJ+lnqYG9iHrqmfDQ2MA0VcolWuA37H67/UstqTs3NYaGC7RZkq9FAV//pl30w=="; }; }; - "@textlint/linter-formatter-3.1.12" = { + "@textlint/linter-formatter-3.2.5" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "3.1.12"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.1.12.tgz"; - sha512 = "OEP4pklu01MEgBJrftD9vwe3HFx+jhiEe1JFIgf7GZ4a0fSer5vQWXBo5wHW6WtZtSa+iLBsLC3mI5VMeshzdA=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.2.5.tgz"; + sha512 = "oy5RcBWrC2d7r0Mjw/FBH8cvQuOaCB5PeOPG0Pp44Yr5JbIGLXfh84umHQOTCmxfRxw3ccnUfA9wjbxuL8rWOQ=="; }; }; - "@textlint/markdown-to-ast-6.1.7" = { + "@textlint/markdown-to-ast-6.2.5" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "6.1.7"; + version = "6.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.7.tgz"; - sha512 = "B0QtokeQR4a9+4q0NQr8T9l7A1fFihTN5Ze57tVgqW+3ymzXEouh8DvPHeNQ4T6jEkAThvdjk95mxAMpGRJ79w=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.2.5.tgz"; + sha512 = "9vlQbylGjnnRGev3yt9ntNy6I9FQH3p+MkbijybKnwobK/msoAX9sThDHOMbGM24PsUHxcDjktDlj2vHN/pwDA=="; }; }; - "@textlint/module-interop-1.0.2" = { + "@textlint/module-interop-1.1.4" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "1.0.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.0.2.tgz"; - sha512 = "qQ6dqlg4SYywCywimIbkveQZu1MG6ugf6fcJuWDi3D51FbdkSRsMrPusJ1YoW6Y3XBp0ww9fJjXWtlUStGeQsw=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.1.4.tgz"; + sha512 = "9M3kYG5nBoD2lhp05sqi6fieNU6rBcf+A8Trp+4d8o5uJ4RRsWeRtAQMWM7Tv15onqIITRq7fm3la7xovVB9KA=="; }; }; - "@textlint/text-to-ast-3.1.7" = { + "@textlint/text-to-ast-3.2.4" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "3.1.7"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.1.7.tgz"; - sha512 = "CBAEQmiEa2G/wonlLr1HgUtXfTSas6OGGvYGRIRMJweNh5Ilhbz2nM2/9XQMfLQbdn5pGYrAAAQRB2+/9fZ31A=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.2.4.tgz"; + sha512 = "uIiNg52OdQ3Fn8aOYaV7BLW2QakNsmf4doypIwrW4q+gHYQ3jxdPHHkq6RxuYoO112vO40M3zmAoEZmM1qmPhw=="; }; }; - "@textlint/textlint-plugin-markdown-5.1.12" = { + "@textlint/textlint-plugin-markdown-5.2.6" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "5.1.12"; + version = "5.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.1.12.tgz"; - sha512 = "CJWWTaomR22hQD3ogrZujMH1pNN7DqZadmx9CJXxgKwpI/cuD5d2kClwXO3MeLFckJr5HRso7SFN5ebqKu1ycw=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.2.6.tgz"; + sha512 = "S65wy2npaBLT7pwPPlrN9Pw40hOJsxiW+T6peMJOFEMLRem5qlCIlT+02Wlf0Rrtr6/gKDckpphTUiZT1+xRnQ=="; }; }; - "@textlint/textlint-plugin-text-4.1.13" = { + "@textlint/textlint-plugin-text-4.2.6" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "4.1.13"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.1.13.tgz"; - sha512 = "KQfSYNDt8HSX8ZL/r86N8OrAuQ9LEuevAtGomtfkw0h7Ed/pUfmuYXjht8wYRdysYBa4JyjrXcmqzRAUdkWrag=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.2.6.tgz"; + sha512 = "KCgb5GVjoEDIi37UpQN6kFciiouyATNYrj/JufCeLNJEcVcxSm12EoFRKjpXpXmTOVqZUyGnIDU797z1usAZDw=="; }; }; - "@textlint/types-1.3.1" = { + "@textlint/types-1.4.5" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "1.3.1"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-1.3.1.tgz"; - sha512 = "9MJ6PRPYWiFs2lfvp/Qhq72WrkZLL5ncBUXAVoj1Ug17ug8d7psmr/KJstMMocW3EWHSOuIDj7unh413c3jPqQ=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-1.4.5.tgz"; + sha512 = "7pA1rdiw1jsDNGwxupMC6fPlRNAHY6fKZ3s+jAY53o6RroOSR+5qO0sAjJ26lsSOhveH8imZzyyD08dk58IVJQ=="; }; }; - "@textlint/utils-1.0.3" = { + "@textlint/utils-1.1.4" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "1.0.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.0.3.tgz"; - sha512 = "6oGaBKXYpg5Ooph5p32OFdp1dXDUC1z5mpHg2gmQbx6QZjmP4QX+ygBQdNoCq15d1w88+We6koJl0n0WXjItYw=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.1.4.tgz"; + sha512 = "KmU+kGi7vG5toUhNdLHHPxyVN1mNGcjMVe1tNDEXT1wU/3oqA96bunElrROWHYw5iNt1QVRaIAtNeMVyzyAdVA=="; }; }; "@tokenizer/token-0.1.1" = { @@ -3757,13 +3847,13 @@ let sha512 = "oTGtMzZZAVuEjTwCjIh8T8FrC8n/uwy+PG0yTvQcdZ7etoel7C7/3MSd7qrukENTgQtotG7gvBlBojuVs7X5rw=="; }; }; - "@types/cors-2.8.6" = { + "@types/cors-2.8.7" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.6"; + version = "2.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.6.tgz"; - sha512 = "invOmosX0DqbpA+cE2yoHGUlF/blyf7nB0OGYBBiH27crcVm5NmFaZkLP4Ta1hGaesckCi5lVLlydNJCxkTOSg=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.7.tgz"; + sha512 = "sOdDRU3oRS7LBNTIqwDkPJyq0lpHYcbMTt0TrjzsXbk/e37hcLTH6eZX7CdbDeN0yJJvzw9hFBZkbtCSbk/jAQ=="; }; }; "@types/debug-4.1.5" = { @@ -3811,13 +3901,13 @@ let sha512 = "jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g=="; }; }; - "@types/express-4.17.4" = { + "@types/express-4.17.7" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.4"; + version = "4.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.4.tgz"; - sha512 = "DO1L53rGqIDUEvOjJKmbMEQ5Z+BM2cIEPy/eV3En+s166Gz+FeuzRerxcab757u/U4v4XF4RYrZPmqKa+aY/2w=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.7.tgz"; + sha512 = "dCOT5lcmV/uC2J9k0rPafATeeyz+99xTt54ReX11/LObZgfzJqZNcW27zGhYyX+9iSEGXGt5qLPwRSvBZcLvtQ=="; }; }; "@types/express-serve-static-core-4.17.9" = { @@ -3919,13 +4009,13 @@ let sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; }; }; - "@types/jquery-3.5.0" = { + "@types/jquery-3.5.1" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.0.tgz"; - sha512 = "C7qQUjpMWDUNYQRTXsP5nbYYwCwwgy84yPgoTT7fPN69NH92wLeCtFaMsWeolJD1AF/6uQw3pYt62rzv83sMmw=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.1.tgz"; + sha512 = "Tyctjh56U7eX2b9udu3wG853ASYP0uagChJcQJXLUXEU6C/JiW5qt5dl8ao01VRj1i5pgXPAf8f1mq4+FDLRQg=="; }; }; "@types/js-yaml-3.12.5" = { @@ -4045,13 +4135,13 @@ let sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; - "@types/node-10.17.27" = { + "@types/node-10.17.28" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.27"; + version = "10.17.28"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.27.tgz"; - sha512 = "J0oqm9ZfAXaPdwNXMMgAhylw5fhmXkToJd06vuDUSAgEDZ/n/69/69UmyBZbc+zT34UnShuDSBqvim3SPnozJg=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.28.tgz"; + sha512 = "dzjES1Egb4c1a89C7lKwQh8pwjYmlOAG9dW1pBgxEk57tMrLnssOfEthz8kdkNaBd7lIqQx7APm5+mZ619IiCQ=="; }; }; "@types/node-12.7.12" = { @@ -4063,22 +4153,22 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.14" = { + "@types/node-13.13.15" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.14"; + version = "13.13.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.14.tgz"; - sha512 = "Az3QsOt1U/K1pbCQ0TXGELTuTkPLOiFIQf3ILzbOyo0FqgV9SxRnxbxM5QlAveERZMHpZY+7u3Jz2tKyl+yg6g=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.15.tgz"; + sha512 = "kwbcs0jySLxzLsa2nWUAGOd/s21WU1jebrEdtzhsj1D4Yps1EOuyI1Qcu+FD56dL7NRNIJtDDjcqIG22NwkgLw=="; }; }; - "@types/node-14.0.24" = { + "@types/node-14.0.27" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.24"; + version = "14.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.24.tgz"; - sha512 = "btt/oNOiDWcSuI721MdL8VQGnjsKjlTMdrKyTcLCKeQp/n4AAMFJ961wMbp+09y8WuGPClDEv07RIItdXKIXAA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz"; + sha512 = "kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g=="; }; }; "@types/node-6.14.10" = { @@ -4135,13 +4225,13 @@ let sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="; }; }; - "@types/qs-6.9.3" = { + "@types/qs-6.9.4" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.3"; + version = "6.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.3.tgz"; - sha512 = "7s9EQWupR1fTc2pSMtXRQ9w9gLOcrJn+h7HOXw4evxyvVqMi4f+q7d2tnFe3ng3SNHjtK+0EzGMGFUQX4/AQRA=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz"; + sha512 = "+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ=="; }; }; "@types/range-parser-1.2.3" = { @@ -4207,13 +4297,13 @@ let sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ=="; }; }; - "@types/serve-static-1.13.4" = { + "@types/serve-static-1.13.5" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.4"; + version = "1.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.4.tgz"; - sha512 = "jTDt0o/YbpNwZbQmE/+2e+lfjJEJJR0I3OFaKQKPWkASkCoW3i6fsUnqudSMcNAfbtmADGu8f4MV4q+GqULmug=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz"; + sha512 = "6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ=="; }; }; "@types/sizzle-2.3.2" = { @@ -4315,13 +4405,13 @@ let sha512 = "6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw=="; }; }; - "@types/webpack-sources-1.4.0" = { + "@types/webpack-sources-1.4.2" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.0.tgz"; - sha512 = "c88dKrpSle9BtTqR6ifdaxu1Lvjsl3C5OsfvuUbUwdXymshv1TkufUAXBajCCUM/f/TmnkZC/Esb03MinzSiXQ=="; + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.2.tgz"; + sha512 = "77T++JyKow4BQB/m9O96n9d/UUHWLQHlcqXb9Vsf4F1+wKNrrlWNFPDLKNT92RJnCSL6CieTc+NDXtCVZswdTw=="; }; }; "@types/websocket-1.0.1" = { @@ -4387,13 +4477,13 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@typescript-eslint/eslint-plugin-3.7.0" = { + "@typescript-eslint/eslint-plugin-3.8.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.0.tgz"; - sha512 = "4OEcPON3QIx0ntsuiuFP/TkldmBGXf0uKxPQlGtS/W2F3ndYm8Vgdpj/woPJkzUc65gd3iR+qi3K8SDQP/obFg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.8.0.tgz"; + sha512 = "lFb4VCDleFSR+eo4Ew+HvrJ37ZH1Y9ZyE+qyP7EiwBpcCVxwmUc5PAqhShCQ8N8U5vqYydm74nss+a0wrrCErw=="; }; }; "@typescript-eslint/experimental-utils-1.13.0" = { @@ -4405,13 +4495,13 @@ let sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg=="; }; }; - "@typescript-eslint/experimental-utils-3.7.0" = { + "@typescript-eslint/experimental-utils-3.8.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.0.tgz"; - sha512 = "xpfXXAfZqhhqs5RPQBfAFrWDHoNxD5+sVB5A46TF58Bq1hRfVROrWHcQHHUM9aCBdy9+cwATcvCbRg8aIRbaHQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.8.0.tgz"; + sha512 = "o8T1blo1lAJE0QDsW7nSyvZHbiDzQDjINJKyB44Z3sSL39qBy5L10ScI/XwDtaiunoyKGLiY9bzRk4YjsUZl8w=="; }; }; "@typescript-eslint/parser-1.13.0" = { @@ -4423,22 +4513,22 @@ let sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ=="; }; }; - "@typescript-eslint/parser-3.7.0" = { + "@typescript-eslint/parser-3.8.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.7.0.tgz"; - sha512 = "2LZauVUt7jAWkcIW7djUc3kyW+fSarNEuM3RF2JdLHR9BfX/nDEnyA4/uWz0wseoWVZbDXDF7iF9Jc342flNqQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.8.0.tgz"; + sha512 = "u5vjOBaCsnMVQOvkKCXAmmOhyyMmFFf5dbkM3TIbg3MZ2pyv5peE4gj81UAbTHwTOXEwf7eCQTUMKrDl/+qGnA=="; }; }; - "@typescript-eslint/types-3.7.0" = { + "@typescript-eslint/types-3.8.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.7.0.tgz"; - sha512 = "reCaK+hyKkKF+itoylAnLzFeNYAEktB0XVfSQvf0gcVgpz1l49Lt6Vo9x4MVCCxiDydA0iLAjTF/ODH0pbfnpg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.8.0.tgz"; + sha512 = "8kROmEQkv6ss9kdQ44vCN1dTrgu4Qxrd2kXr10kz2NP5T8/7JnEfYNxCpPkArbLIhhkGLZV3aVMplH1RXQRF7Q=="; }; }; "@typescript-eslint/typescript-estree-1.13.0" = { @@ -4450,67 +4540,58 @@ let sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw=="; }; }; - "@typescript-eslint/typescript-estree-2.34.0" = { + "@typescript-eslint/typescript-estree-3.8.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "2.34.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz"; - sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; - }; - }; - "@typescript-eslint/typescript-estree-3.7.0" = { - name = "_at_typescript-eslint_slash_typescript-estree"; - packageName = "@typescript-eslint/typescript-estree"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.0.tgz"; - sha512 = "xr5oobkYRebejlACGr1TJ0Z/r0a2/HUf0SXqPvlgUMwiMqOCu/J+/Dr9U3T0IxpE5oLFSkqMx1FE/dKaZ8KsOQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.8.0.tgz"; + sha512 = "MTv9nPDhlKfclwnplRNDL44mP2SY96YmPGxmMbMy6x12I+pERcxpIUht7DXZaj4mOKKtet53wYYXU0ABaiXrLw=="; }; }; - "@typescript-eslint/visitor-keys-3.7.0" = { + "@typescript-eslint/visitor-keys-3.8.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.0.tgz"; - sha512 = "k5PiZdB4vklUpUX4NBncn5RBKty8G3ihTY+hqJsCdMuD0v4jofI5xuqwnVcWxfv6iTm2P/dfEa2wMUnsUY8ODw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.8.0.tgz"; + sha512 = "gfqQWyVPpT9NpLREXNR820AYwgz+Kr1GuF3nf1wxpHD6hdxI62tq03ToomFnDxY0m3pUB39IF7sil7D5TQexLA=="; }; }; - "@vue/cli-shared-utils-4.4.6" = { + "@vue/cli-shared-utils-4.5.0" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.4.6"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.6.tgz"; - sha512 = "ba+FZZCjiTSu2otnLjY4qXqASe7ZIQ/QBljk5oRPgqrR0p1NUkDPUcZhqa041aOaSW1yAfSfhOD7Q84nMnWhzQ=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.0.tgz"; + sha512 = "sVIq0PvWW7W/CGuEm8LC+Ehod9yreaGaDva+oqVglTqE7lf0CtsAMRytFf37DgIwcM9TiMgdx8DCqdmotkhY9g=="; }; }; - "@vue/cli-ui-4.4.6" = { + "@vue/cli-ui-4.5.0" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.4.6"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.4.6.tgz"; - sha512 = "9l67vb0J9iubf14Lj6aI8Fg9DPIgB9gCLbwQWVrFtoaDTapdbo0X6cf0zK1RNeN/5CrGa5baIntqsWwC1Iqlcw=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.0.tgz"; + sha512 = "N0Dc/KUFzXCSAWlTAq4wHIlE1RFIpf1kVh8kyO2ADippLbr+EpnhuSt725mk7twjRKqJLnu4j7AqDC55Tc735A=="; }; }; - "@vue/cli-ui-addon-webpack-4.4.6" = { + "@vue/cli-ui-addon-webpack-4.5.0" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.4.6"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.4.6.tgz"; - sha512 = "odDx8lo+MNFCnhOB6fsjWJnoWP/YhDhDuCUQC8YQHCtsGRHI8/mJQk1tLI8cPVrY37aAH8Z0loitg4q3klItlQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.0.tgz"; + sha512 = "XGn9TtFI8leqNR0jSNeJMtkf81vNJn14RXHUQEDjF3jc2jQTiXbzy4I4YLBcq52vLv1qa0ucTY8HAb5sPf86Rg=="; }; }; - "@vue/cli-ui-addon-widgets-4.4.6" = { + "@vue/cli-ui-addon-widgets-4.5.0" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.4.6"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.4.6.tgz"; - sha512 = "GqtqxFR30LCxiQ+y/8b+XmAaZ983ojYT/6xOeqD0V0bZ3sNrthTxRcTXKJHbw7xdeE7bWHikHKYQ7Jn3J/Dyjw=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.0.tgz"; + sha512 = "8DDCGXQPHa6405/Qv0VXT17fhzhnm6XOpBVCJhKWWIP+uBhiEh+lg2hcNHC9ilW8R+N3jHzRSCoeUnjUKwSC1g=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -5053,13 +5134,13 @@ let sha1 = "5faad9c2c07f60dd76770f71cf025b62a63cfd4e"; }; }; - "abab-2.0.3" = { + "abab-2.0.4" = { name = "abab"; packageName = "abab"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz"; - sha512 = "tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="; + url = "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz"; + sha512 = "Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ=="; }; }; "abbrev-1.1.1" = { @@ -5206,13 +5287,13 @@ let sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="; }; }; - "acorn-7.3.1" = { + "acorn-7.4.0" = { name = "acorn"; packageName = "acorn"; - version = "7.3.1"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz"; - sha512 = "tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="; + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz"; + sha512 = "+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w=="; }; }; "acorn-globals-1.0.9" = { @@ -5332,13 +5413,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.26.0" = { + "addons-linter-2.1.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.26.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.26.0.tgz"; - sha512 = "PKytX6qxbZapc076auO0LBhAGuw2z7eyPnYusMgNBPbY72MAXzUCt3AhSbwGhZ43d5Tn/3At5H0xPi31VXG2Mg=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.1.0.tgz"; + sha512 = "ISCPobK6VdQ+5btMf1abkuD/9V+6RjnpJAVmEzjxDitk7HY03mLXVhA8SoD0XgngrI6cFlM2/i4OxfY4dHokpw=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -5539,15 +5620,6 @@ let sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; }; }; - "ajv-6.12.2" = { - name = "ajv"; - packageName = "ajv"; - version = "6.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; - sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; - }; - }; "ajv-6.12.3" = { name = "ajv"; packageName = "ajv"; @@ -5593,13 +5665,13 @@ let sha1 = "617997fc5f60576894c435f940d819e135b80762"; }; }; - "ajv-keywords-3.5.1" = { + "ajv-keywords-3.5.2" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.1.tgz"; - sha512 = "KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA=="; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; }; }; "ajv-merge-patch-4.1.0" = { @@ -5611,13 +5683,13 @@ let sha512 = "0mAYXMSauA8RZ7r+B4+EAOYcZEcO9OK5EiQCR7W7Cv4E44pJj56ZnkKLJ9/PAcOc0dT+LlV9fdDcq2TxVJfOYw=="; }; }; - "alex-8.1.1" = { + "alex-8.2.0" = { name = "alex"; packageName = "alex"; - version = "8.1.1"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/alex/-/alex-8.1.1.tgz"; - sha512 = "WH3BEF0fr+Pj7N8caH6Y+DInOUIB2VnRyT8UJ/39cmHivCu6raX++d0ZcYwbD/ONLTWU+VMAiQjCYaNywIZAjw=="; + url = "https://registry.npmjs.org/alex/-/alex-8.2.0.tgz"; + sha512 = "aJX/ZkyGruiXKr26NJkbrYd+Quc8i0cP7B7b9TIX2AoLxHsV+0SJ0ca+26h8sw63LyrWQMkT7lZQlvMMOBKxqA=="; }; }; "align-text-0.1.4" = { @@ -6025,13 +6097,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.30.1" = { + "apollo-2.30.2" = { name = "apollo"; packageName = "apollo"; - version = "2.30.1"; + version = "2.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.30.1.tgz"; - sha512 = "poh2tja2U8U5bGMxfPQjQP1voz2ZaNm/attwC8zpobdeLoT43LeQfFSTqCVmCMZJAfbMa40Cb54yV66DP2w9fw=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.30.2.tgz"; + sha512 = "CKQVvfjbeFPVew9q/dGuRNpohenK7oBTKNnwDs89ImEGoPDd7BpXRQUu/mNjUANoDpd2ztYRwO+ZxxVE8P4+sA=="; }; }; "apollo-cache-1.3.5" = { @@ -6070,49 +6142,49 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.37.7" = { + "apollo-codegen-core-0.37.8" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.37.7"; + version = "0.37.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.7.tgz"; - sha512 = "7AMnzS+X7z91eUSctc0mQoQzVJrrKo+zLXevMDkGyTH+q541dYfpAdKQ5nffPcb1ZwwOONZCyl8kc8faJzD0Kw=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.8.tgz"; + sha512 = "5mIF75iJCGaPXPvWthQjrWKb6YD7KRioODAM6OF5r+foN70Mli2S3g7wCsnmQ0J1TtstntHVnXykHsWClj4NIg=="; }; }; - "apollo-codegen-flow-0.35.7" = { + "apollo-codegen-flow-0.35.8" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.35.7"; + version = "0.35.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.7.tgz"; - sha512 = "q7GsbHE0UtqXFat8wGyidUJRdGkbtfUqCtuQkV5qKOOnudFR32G7dz+6i/Z9R5IqOqWVMpxLq7UeiYRiz8c1dg=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.8.tgz"; + sha512 = "nqTIvqmidL3/k6k0HcJOQfr/vG6a3i2CCKa+w1UwAR9zRJn487lvT3QGSRNuYaohB/wBdGtNk3a1V2FvFyH/xg=="; }; }; - "apollo-codegen-scala-0.36.7" = { + "apollo-codegen-scala-0.36.8" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.36.7"; + version = "0.36.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.7.tgz"; - sha512 = "x8EWMOrW4e/kl5QFUHCJsJzemPk1Fa0hMCyjgnlBGQHBrAkHzc33qMMs6WTGvLLL8x8sMvqxCX+NiE/jgtYEvg=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.8.tgz"; + sha512 = "6/ulLUqlKUTac5mZNAaFtzYn5LnJbXeMLftCl1NL4dyzFRn4rj+gZjDRP5e74GfDCqLAMSPyVt/6OFBxFKrs7w=="; }; }; - "apollo-codegen-swift-0.37.7" = { + "apollo-codegen-swift-0.37.8" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.37.7"; + version = "0.37.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.7.tgz"; - sha512 = "97uCfBt3UVq0hlAWIBZpQoZjgdeKGObxsNp2L2R5ldMLoD3cQzjzuUDJGG1DoAsn5RMqv2gGNEk5QZMrWhidLw=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.8.tgz"; + sha512 = "qRqXZg2fLBm5OhJopVwh3Y3RLXeurwAj+bH3xcpxiAX05qci9MVOxwej05nmSu4GUv1csJSLDn93ZjQfByabkQ=="; }; }; - "apollo-codegen-typescript-0.37.7" = { + "apollo-codegen-typescript-0.37.8" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.37.7"; + version = "0.37.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.7.tgz"; - sha512 = "LIx1tsWqRrhTcYcRPjhbzBwSaCbMK3UKSN+AlOzNDvG/Rm6wFutHznj14kn/iqcIHmCbGGuFNjiZNbLwCJ3SyQ=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.8.tgz"; + sha512 = "cYysqRnW2h1xKFEZH0o636IeKvWBeeTDZmNZEyfMcl2TtyMRd0cOFUmA0gokX0JK/QzvJuTJgBKD9le9W8wV2w=="; }; }; "apollo-datasource-0.7.2" = { @@ -6151,15 +6223,6 @@ let sha512 = "jeBUVsGymeTHYWp3me0R2CZRZrFeuSZeICZHCeRflHTfnQtlmbSXdy5E0pOyRM9CU4JfQkKDC98S1YglQj7Bzg=="; }; }; - "apollo-graphql-0.4.5" = { - name = "apollo-graphql"; - packageName = "apollo-graphql"; - version = "0.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.5.tgz"; - sha512 = "0qa7UOoq7E71kBYE7idi6mNQhHLVdMEDInWk6TNw3KsSWZE2/I68gARP84Mj+paFTO5NYuw1Dht66PVX76Cc2w=="; - }; - }; "apollo-graphql-0.5.0" = { name = "apollo-graphql"; packageName = "apollo-graphql"; @@ -6169,13 +6232,13 @@ let sha512 = "YSdF/BKPbsnQpxWpmCE53pBJX44aaoif31Y22I/qKpB6ZSGzYijV5YBoCL5Q15H2oA/v/02Oazh9lbp4ek3eig=="; }; }; - "apollo-language-server-1.23.2" = { + "apollo-language-server-1.23.3" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.23.2"; + version = "1.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.23.2.tgz"; - sha512 = "2EfnA0DUVhGk018XYPb44EM+KuBnAqdciRD+j9BuUT3+nVq7pc8pjjcS7M8r5ea8hnOYrAoxC6f4I2YNdhjHJg=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.23.3.tgz"; + sha512 = "WbK5tlqDpyy5TKjo1tjLIAeeTjlpZpvXURB1Qlx7ZfTqaG1846u9lgYpKw6Ydx/+1Viy60K8z530/gOgI/KmvQ=="; }; }; "apollo-link-1.2.14" = { @@ -6259,13 +6322,13 @@ let sha512 = "HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ=="; }; }; - "apollo-server-core-2.16.0" = { + "apollo-server-core-2.16.1" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.16.0"; + version = "2.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.16.0.tgz"; - sha512 = "mnvg2cPvsQtjFXIqIhEAbPqGyiSXDSbiBgNQ8rY8g7r2eRMhHKZePqGF03gP1/w87yVaSDRAZBDk6o+jiBXjVQ=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.16.1.tgz"; + sha512 = "nuwn5ZBbmzPwDetb3FgiFFJlNK7ZBFg8kis/raymrjd3eBGdNcOyMTJDl6J9673X9Xqp+dXQmFYDW/G3G8S1YA=="; }; }; "apollo-server-env-2.4.5" = { @@ -6286,13 +6349,13 @@ let sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="; }; }; - "apollo-server-express-2.16.0" = { + "apollo-server-express-2.16.1" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.16.0"; + version = "2.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.16.0.tgz"; - sha512 = "mBIvKcF8gApj7wbmqe0A4Tsy+Pw66mI6cmtD912bG59KhUBveSCZ21dDlRSvnXUyK+GOo2ItwcUEtmks+Z2Pqw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.16.1.tgz"; + sha512 = "Oq5YNcaMYnRk6jDmA9LWf8oSd2KHDVe7jQ4wtooAvG9FVUD+FaFBgSkytXHMvtifQh2wdF07Ri8uDLMz6IQjTw=="; }; }; "apollo-server-plugin-base-0.9.1" = { @@ -7132,15 +7195,6 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "ast-module-types-2.6.0" = { - name = "ast-module-types"; - packageName = "ast-module-types"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.6.0.tgz"; - sha512 = "zXSoVaMrf2R+r+ISid5/9a8SXm1LLdkhHzh6pSRhj9jklzruOOl1hva1YmFT33wAstg/f9ZndJAlq1BSrFLSGA=="; - }; - }; "ast-types-0.13.3" = { name = "ast-types"; packageName = "ast-types"; @@ -7348,15 +7402,6 @@ let sha1 = "125dd09de95d3ea30a378adbed021092179b03c9"; }; }; - "async-write-2.1.0" = { - name = "async-write"; - packageName = "async-write"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/async-write/-/async-write-2.1.0.tgz"; - sha1 = "1e762817d849ce44bfac07925a42036787061b15"; - }; - }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -7474,13 +7519,13 @@ let sha512 = "Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ=="; }; }; - "autoprefixer-9.8.5" = { + "autoprefixer-9.8.6" = { name = "autoprefixer"; packageName = "autoprefixer"; - version = "9.8.5"; + version = "9.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.5.tgz"; - sha512 = "C2p5KkumJlsTHoNv9w31NrBRgXhf6eCMteJuHZi2xhkgC+5Vm40MEtCKPhc0qdgAOhox0YPy1SQHTAky05UoKg=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz"; + sha512 = "XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg=="; }; }; "available-typed-arrays-1.0.2" = { @@ -7519,13 +7564,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.718.0" = { + "aws-sdk-2.726.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.718.0"; + version = "2.726.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.718.0.tgz"; - sha512 = "YMWR1RJ3VuSbUOGeOfDw2QqRzwX51oa9TCm2G6SW+JywJUy0FTxi/Nj0VjVEQvKC0GqGu5QCgUTaarF7S0nQdw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.726.0.tgz"; + sha512 = "QRQ7MaW5dprdr/T3vCTC+J8TeUfpM45yWsBuATPcCV/oO8afFHVySwygvGLY4oJuo5Mf4mJn3+JYTquo6CqiaA=="; }; }; "aws-sign2-0.6.0" = { @@ -7699,6 +7744,15 @@ let sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; }; }; + "babel-plugin-emotion-9.2.11" = { + name = "babel-plugin-emotion"; + packageName = "babel-plugin-emotion"; + version = "9.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz"; + sha512 = "dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ=="; + }; + }; "babel-plugin-istanbul-6.0.0" = { name = "babel-plugin-istanbul"; packageName = "babel-plugin-istanbul"; @@ -7717,6 +7771,15 @@ let sha512 = "u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g=="; }; }; + "babel-plugin-macros-2.8.0" = { + name = "babel-plugin-macros"; + packageName = "babel-plugin-macros"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; + sha512 = "SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg=="; + }; + }; "babel-plugin-minify-builtins-0.5.0" = { name = "babel-plugin-minify-builtins"; packageName = "babel-plugin-minify-builtins"; @@ -7816,13 +7879,13 @@ let sha1 = "1bc6f15b87f7ab1085d42b330b717657a2156500"; }; }; - "babel-plugin-styled-components-1.10.7" = { + "babel-plugin-styled-components-1.11.1" = { name = "babel-plugin-styled-components"; packageName = "babel-plugin-styled-components"; - version = "1.10.7"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.7.tgz"; - sha512 = "MBMHGcIA22996n9hZRf/UJLVVgkEOITuR2SvjHLb5dSTUyR4ZRGn+ngITapes36FI3WLxZHfRhkA1ffHxihOrg=="; + url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz"; + sha512 = "YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA=="; }; }; "babel-plugin-syntax-flow-6.18.0" = { @@ -8941,6 +9004,15 @@ let sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"; }; }; + "bplist-parser-0.2.0" = { + name = "bplist-parser"; + packageName = "bplist-parser"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz"; + sha512 = "z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw=="; + }; + }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; @@ -9049,13 +9121,13 @@ let sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; }; }; - "browser-resolve-1.11.3" = { + "browser-resolve-2.0.0" = { name = "browser-resolve"; packageName = "browser-resolve"; - version = "1.11.3"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz"; - sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ=="; + url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz"; + sha512 = "7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ=="; }; }; "browser-stdout-1.3.1" = { @@ -9067,13 +9139,13 @@ let sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; - "browserify-16.5.1" = { + "browserify-16.5.2" = { name = "browserify"; packageName = "browserify"; - version = "16.5.1"; + version = "16.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.5.1.tgz"; - sha512 = "EQX0h59Pp+0GtSRb5rL6OTfrttlzv+uyaUVlK6GX3w11SQ0jKPKyjC/54RhPR2ib2KmfcELM06e8FxcI5XNU2A=="; + url = "https://registry.npmjs.org/browserify/-/browserify-16.5.2.tgz"; + sha512 = "TkOR1cQGdmXU9zW4YukWzWVSJwrxmNdADFbqbE3HFgQWe5wqZmOawqZ7J/8MPCwk/W8yY7Y0h+7mOtcZxLP23g=="; }; }; "browserify-aes-1.2.0" = { @@ -9139,13 +9211,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "browserify-sign-4.2.0" = { + "browserify-sign-4.2.1" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz"; - sha512 = "hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA=="; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz"; + sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg=="; }; }; "browserify-zlib-0.1.4" = { @@ -9949,13 +10021,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001105" = { + "caniuse-lite-1.0.30001111" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001105"; + version = "1.0.30001111"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001105.tgz"; - sha512 = "JupOe6+dGMr7E20siZHIZQwYqrllxotAhiaej96y6x00b/48rPt42o+SzOSCPbrpsDWvRja40Hwrj0g0q6LZJg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001111.tgz"; + sha512 = "xnDje2wchd/8mlJu8sXvWxOGvMgv+uT3iZ3bkIAynKOzToCssWCmkz/ZIkQBs/2pUB4uwnJKVORWQ31UkbVjOg=="; }; }; "capital-case-1.0.3" = { @@ -10507,13 +10579,13 @@ let sha512 = "HqsYJgIc8ljJJOqOzLphjAs79EUuWSX3nzZi2LNkzlw3GIzAeZbaSektC8iT/tKvLqZq8yl1GJu5o6doA4TRbg=="; }; }; - "chrome-launcher-0.13.3" = { + "chrome-launcher-0.13.4" = { name = "chrome-launcher"; packageName = "chrome-launcher"; - version = "0.13.3"; + version = "0.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.3.tgz"; - sha512 = "ovrDuFXgXS96lzeDqFPQRsczkxla+6QMvzsF+1u0mKlD1KE8EuhjdLwiDfIFedb0FSLz18RK3y6IbKu8oqA0qw=="; + url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz"; + sha512 = "nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A=="; }; }; "chrome-net-3.3.4" = { @@ -10669,13 +10741,13 @@ let sha512 = "JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="; }; }; - "cldr-5.6.0" = { + "cldr-5.7.0" = { name = "cldr"; packageName = "cldr"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/cldr/-/cldr-5.6.0.tgz"; - sha512 = "0apGe49Gv3glmLbLHp0X2iEjee+xAwO8H4OVUHczIpCUBWN4aAwbXBw8nn2xpitAtd2fVIr8pvwI0znk/RnfLw=="; + url = "https://registry.npmjs.org/cldr/-/cldr-5.7.0.tgz"; + sha512 = "Pyoh0kwXJIUvbAvQoQqKIr0pKWwWfkcYCIDKWmVIxJ9HftSsg57AqyfW1EzWRcP4nJj40WX4vB/lXQ+Uw4NbNA=="; }; }; "clean-css-3.4.28" = { @@ -10975,13 +11047,13 @@ let sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; }; }; - "clipanion-2.4.2" = { + "clipanion-2.4.4" = { name = "clipanion"; packageName = "clipanion"; - version = "2.4.2"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/clipanion/-/clipanion-2.4.2.tgz"; - sha512 = "kBCYtQKI4/R/zjierdwoDAsNUSvoh4pX2tseYxgLYQcKIpdPsHZrFWiQOfbe2Scd/btsqJEc4q6g55q0p5DZAw=="; + url = "https://registry.npmjs.org/clipanion/-/clipanion-2.4.4.tgz"; + sha512 = "KjyCBz8xplftHjIK/nOqq/9b3hPlXbAAo/AxoITrO4yySpQ6a9QSJDAfOx9PfcRUHteeqbdNxZKSPfeFqQ7plg=="; }; }; "clipboard-2.0.6" = { @@ -12560,58 +12632,58 @@ let sha512 = "7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A=="; }; }; - "cordova-app-hello-world-4.0.0" = { + "cordova-app-hello-world-5.0.0" = { name = "cordova-app-hello-world"; packageName = "cordova-app-hello-world"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-4.0.0.tgz"; - sha512 = "hTNYHUJT5YyMa1cQQE1naGyU6Eh5D5Jl33sMnCh3+q15ZwWTL/TOy3k8+mUvjTp8bwhO5eECGKULYoVO+fp9ZA=="; + url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-5.0.0.tgz"; + sha512 = "5My01wsYoeYwS0f/t5Ck52xPm0+2zYJ0SlvxG9vUsndDGtgiP6t/G8upPgWcyDRRz7Rs/50yZuOntmHqmJxccQ=="; }; }; - "cordova-common-3.2.1" = { + "cordova-common-4.0.2" = { name = "cordova-common"; packageName = "cordova-common"; - version = "3.2.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-3.2.1.tgz"; - sha512 = "xg0EnjnA6EipxXG8cupdlYQYeDA6+ghbN+Pjq88xN1LInwP6Bo7IyGBdSV5QnfjOvzShF9BBwSxBAv0FOO0C2Q=="; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-4.0.2.tgz"; + sha512 = "od7aNShyuBajzPY83mUEO8tERwwWdFklXETHiXP5Ft87CWeo/tSuwNPFztyTy8XYc74yXdogXKPTJeUHuVzB8Q=="; }; }; - "cordova-create-2.0.0" = { + "cordova-create-3.0.0" = { name = "cordova-create"; packageName = "cordova-create"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-create/-/cordova-create-2.0.0.tgz"; - sha512 = "72CaGg/7x+tiZlzeXKQXLTc8Jh4tbwLdu4Ib97kJ6+R3bcew/Yv/l2cVA2E0CaCuOCtouTqwi+YLcA2I4dPFTQ=="; + url = "https://registry.npmjs.org/cordova-create/-/cordova-create-3.0.0.tgz"; + sha512 = "WxZRTnt5RHxSAB9urnHFUtVBcIe1YjR4sfwHLsxakNoKkFhcie3HrV5QmNBgRQ5DkxmanRN3VSx4OrPVsNmAaQ=="; }; }; - "cordova-fetch-2.0.1" = { + "cordova-fetch-3.0.0" = { name = "cordova-fetch"; packageName = "cordova-fetch"; - version = "2.0.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-2.0.1.tgz"; - sha512 = "q21PeobERzE3Drli5htcl5X9Mtfvodih5VkqIwdRUsjDBCPv+I6ZonRjYGbNnXhYrYx7dm0m0j/7/Smf6Av3hg=="; + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-3.0.0.tgz"; + sha512 = "N6mB/1GD8BNclxnfO85E4/s46nEJjIxYeJYHRGi6MjofhigJ3NlGwTCslbTcq8IOYEh0RdoA0mS4W2jA5UcWeQ=="; }; }; - "cordova-lib-9.0.1" = { + "cordova-lib-10.0.0" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "9.0.1"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-9.0.1.tgz"; - sha512 = "P9nQhq91gLOyKZkamvKNzzK89gLDpq8rKue/Vu7NUSgNzhPkiWW0w+6VRTbj/9QGVM9w2uDVhB9c9f6rrTXzCw=="; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-10.0.0.tgz"; + sha512 = "azU/WH0x/3fQg33tU5bKCtj+Weh/bHelz9FWCVdXqVOHXmjzbi3p6p61z5Si967Tfh3TkmHRrodNxS0ovZ7iFQ=="; }; }; - "cordova-serve-3.0.0" = { + "cordova-serve-4.0.0" = { name = "cordova-serve"; packageName = "cordova-serve"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-3.0.0.tgz"; - sha512 = "h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w=="; + url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.0.tgz"; + sha512 = "gzTLeBQzNP8aM/nG0/7sSfICfNazUgwvEU2kiDaybbYXmxwioo2v96h4tzE0XOyA64beyYwAyRYEEqWA4AMZjw=="; }; }; "core-js-2.6.11" = { @@ -12623,15 +12695,6 @@ let sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; }; }; - "core-js-3.6.4" = { - name = "core-js"; - packageName = "core-js"; - version = "3.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz"; - sha512 = "4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="; - }; - }; "core-js-3.6.5" = { name = "core-js"; packageName = "core-js"; @@ -12650,15 +12713,6 @@ let sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng=="; }; }; - "core-js-pure-3.6.5" = { - name = "core-js-pure"; - packageName = "core-js-pure"; - version = "3.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz"; - sha512 = "lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA=="; - }; - }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -12812,13 +12866,22 @@ let sha512 = "mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w=="; }; }; - "create-ecdh-4.0.3" = { + "create-ecdh-4.0.4" = { name = "create-ecdh"; packageName = "create-ecdh"; - version = "4.0.3"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz"; + sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="; + }; + }; + "create-emotion-9.2.12" = { + name = "create-emotion"; + packageName = "create-emotion"; + version = "9.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz"; - sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw=="; + url = "https://registry.npmjs.org/create-emotion/-/create-emotion-9.2.12.tgz"; + sha512 = "P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA=="; }; }; "create-error-class-3.0.2" = { @@ -13127,13 +13190,13 @@ let sha512 = "jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg=="; }; }; - "css-to-react-native-2.3.2" = { + "css-to-react-native-3.0.0" = { name = "css-to-react-native"; packageName = "css-to-react-native"; - version = "2.3.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.3.2.tgz"; - sha512 = "VOFaeZA053BqvvvqIA8c9n0+9vFppVBAHCp6JgFTtTMU3Mzi+XnelJ9XC9ul3BqFzZyQ5N+H0SnwsWT2Ebchxw=="; + url = "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz"; + sha512 = "Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ=="; }; }; "css-tree-1.0.0-alpha.37" = { @@ -13307,13 +13370,13 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "csstype-2.6.11" = { + "csstype-2.6.13" = { name = "csstype"; packageName = "csstype"; - version = "2.6.11"; + version = "2.6.13"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-2.6.11.tgz"; - sha512 = "l8YyEC9NBkSm783PFTvh0FmJy7s5pFKrDp49ZL7zBGX3fWkO+N4EEyan1qqp8cwPLDcD0OSdyY6hAMoxp34JFw=="; + url = "https://registry.npmjs.org/csstype/-/csstype-2.6.13.tgz"; + sha512 = "ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A=="; }; }; "csurf-1.11.0" = { @@ -13712,13 +13775,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.30" = { + "dayjs-1.8.32" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.30"; + version = "1.8.32"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.30.tgz"; - sha512 = "5s5IGuP5bVvIbOWkEDcfmXsUj24fZW1NMHVVSdSFF/kW8d+alZcI9SpBKC+baEyBe+z3fUp17y75ulstv5swUw=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.32.tgz"; + sha512 = "V91aTRu5btP+uzGHaaOfodckEfBWhmi9foRP7cauAO1PTB8+tZ9o0Jec7q6TIIRY1N4q1IfiKsZunkB/AEWqMQ=="; }; }; "de-indent-1.0.2" = { @@ -13892,13 +13955,13 @@ let sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; }; }; - "decamelize-3.2.0" = { + "decamelize-4.0.0" = { name = "decamelize"; packageName = "decamelize"; - version = "3.2.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-3.2.0.tgz"; - sha512 = "4TgkVUsmmu7oCSyGBm5FvfMoACuoh9EOidm7V5/J2X2djAwwt57qb3F2KMP2ITqODTCSwb+YRV+0Zqrv18k/hw=="; + url = "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz"; + sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="; }; }; "decamelize-keys-1.1.0" = { @@ -13937,15 +14000,6 @@ let sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; }; }; - "decomment-0.9.2" = { - name = "decomment"; - packageName = "decomment"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/decomment/-/decomment-0.9.2.tgz"; - sha512 = "sblyUmOJZxiL7oJ2ogJS6jtl/67+CTOW87SrYE/96u3PhDYikYoLCdLzcnceToiQejOLlqNnLCkaxx/+nE/ehg=="; - }; - }; "decompress-4.2.1" = { name = "decompress"; packageName = "decompress"; @@ -14477,15 +14531,6 @@ let sha512 = "9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w=="; }; }; - "dependency-tree-7.2.1" = { - name = "dependency-tree"; - packageName = "dependency-tree"; - version = "7.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dependency-tree/-/dependency-tree-7.2.1.tgz"; - sha512 = "nBxnjkqDW4LqAzBazy60V4lE0mAtIQ+oers/GIIvVvGYVdCD9+RNNd4G9jjstyz7ZFVg/j/OiYCvK5MjoVqA2w=="; - }; - }; "deprecated-0.0.1" = { name = "deprecated"; packageName = "deprecated"; @@ -14603,6 +14648,15 @@ let sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; }; }; + "detect-newline-3.1.0" = { + name = "detect-newline"; + packageName = "detect-newline"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz"; + sha512 = "TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="; + }; + }; "detect-node-2.0.4" = { name = "detect-node"; packageName = "detect-node"; @@ -14630,87 +14684,6 @@ let sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg=="; }; }; - "detective-amd-3.0.0" = { - name = "detective-amd"; - packageName = "detective-amd"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.0.0.tgz"; - sha512 = "kOpKHyabdSKF9kj7PqYHLeHPw+TJT8q2u48tZYMkIcas28el1CYeLEJ42Nm+563/Fq060T5WknfwDhdX9+kkBQ=="; - }; - }; - "detective-cjs-3.1.1" = { - name = "detective-cjs"; - packageName = "detective-cjs"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/detective-cjs/-/detective-cjs-3.1.1.tgz"; - sha512 = "JQtNTBgFY6h8uT6pgph5QpV3IyxDv+z3qPk/FZRDT9TlFfm5dnRtpH39WtQEr1khqsUxVqXzKjZHpdoQvQbllg=="; - }; - }; - "detective-es6-2.2.0" = { - name = "detective-es6"; - packageName = "detective-es6"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detective-es6/-/detective-es6-2.2.0.tgz"; - sha512 = "fSpNY0SLER7/sVgQZ1NxJPwmc9uCTzNgdkQDhAaj8NPYwr7Qji9QBcmbNvtMCnuuOGMuKn3O7jv0An+/WRWJZQ=="; - }; - }; - "detective-less-1.0.2" = { - name = "detective-less"; - packageName = "detective-less"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/detective-less/-/detective-less-1.0.2.tgz"; - sha512 = "Rps1xDkEEBSq3kLdsdnHZL1x2S4NGDcbrjmd4q+PykK5aJwDdP5MBgrJw1Xo+kyUHuv3JEzPqxr+Dj9ryeDRTA=="; - }; - }; - "detective-postcss-3.0.1" = { - name = "detective-postcss"; - packageName = "detective-postcss"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/detective-postcss/-/detective-postcss-3.0.1.tgz"; - sha512 = "tfTS2GdpUal5NY0aCqI4dpEy8Xfr88AehYKB0iBIZvo8y2g3UsrcDnrp9PR2FbzoW7xD5Rip3NJW7eCSvtqdUw=="; - }; - }; - "detective-sass-3.0.1" = { - name = "detective-sass"; - packageName = "detective-sass"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/detective-sass/-/detective-sass-3.0.1.tgz"; - sha512 = "oSbrBozRjJ+QFF4WJFbjPQKeakoaY1GiR380NPqwdbWYd5wfl5cLWv0l6LsJVqrgWfFN1bjFqSeo32Nxza8Lbw=="; - }; - }; - "detective-scss-2.0.1" = { - name = "detective-scss"; - packageName = "detective-scss"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/detective-scss/-/detective-scss-2.0.1.tgz"; - sha512 = "VveyXW4WQE04s05KlJ8K0bG34jtHQVgTc9InspqoQxvnelj/rdgSAy7i2DXAazyQNFKlWSWbS+Ro2DWKFOKTPQ=="; - }; - }; - "detective-stylus-1.0.0" = { - name = "detective-stylus"; - packageName = "detective-stylus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detective-stylus/-/detective-stylus-1.0.0.tgz"; - sha1 = "50aee7db8babb990381f010c63fabba5b58e54cd"; - }; - }; - "detective-typescript-5.8.0" = { - name = "detective-typescript"; - packageName = "detective-typescript"; - version = "5.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detective-typescript/-/detective-typescript-5.8.0.tgz"; - sha512 = "SrsUCfCaDTF64QVMHMidRal+kmkbIc5zP8cxxZPsomWx9vuEUjBlSJNhf7/ypE5cLdJJDI4qzKDmyzqQ+iz/xg=="; - }; - }; "dezalgo-1.0.3" = { name = "dezalgo"; packageName = "dezalgo"; @@ -14810,13 +14783,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.1.9" = { + "diff2html-3.1.11" = { name = "diff2html"; packageName = "diff2html"; - version = "3.1.9"; + version = "3.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.9.tgz"; - sha512 = "LNGOF6tAze8p3gbm7UlXqgj3LrUk5zGuQs/WmiM3D+TXnMyg6tUPZapbWh3CnENacvMnL25VNNRj6DGnXoV0Jg=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.11.tgz"; + sha512 = "EtzNnfhT4XzxIUvIw5mhUGxGYDzce9lxkqtSHWq4yas+UrEjwzm5A2pYIaFOikupbFITd9RaHpu0ocErJ1myRw=="; }; }; "diff3-0.0.3" = { @@ -14945,13 +14918,13 @@ let sha512 = "vkg0bv+FUwSuPxBWzdNPQVNmXQlIbvz1Ygi+A1XefNUhEzfmM+RNndjtjlDgxD/ZUhFir9PX7Hw9iIDVujsOoA=="; }; }; - "dispensary-0.51.2" = { + "dispensary-0.52.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.51.2"; + version = "0.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.51.2.tgz"; - sha512 = "liUDx/g1xFEBFoOL6308Vr0aYAZlGAyXGcOvuXVa/6qVBZT4QZrv4pVNeb5QOeD5C/Flta+A+qTnLkLnhgs40g=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.52.0.tgz"; + sha512 = "A13TTo/2yaK/Z3So4OdzodBTbyTMpqVOH15cbmUuKvl+T1cOLn0VGQjibrG9cELa9mkLfhjFodqYQWkOGkG9Ig=="; }; }; "diveSync-0.3.0" = { @@ -15755,13 +15728,13 @@ let sha512 = "wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg=="; }; }; - "electron-to-chromium-1.3.504" = { + "electron-to-chromium-1.3.520" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.504"; + version = "1.3.520"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.504.tgz"; - sha512 = "yOXnuPaaLAIZUVuXHYDCo3EeaiEfbFgYWCPH1tBMp+jznCq/zQYKnf6HmkKBmLJ0VES81avl18JZO1lx/XAHOw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.520.tgz"; + sha512 = "q6H9E1sXDCjRHP+X06vcP+N0ki8ZvYoRPZfKnDuiRX10WWXxEHzKFVf4O9rBFMpuPtR3M+2KAdJnugJoBBp3Rw=="; }; }; "elegant-spinner-1.0.1" = { @@ -15891,6 +15864,15 @@ let sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; }; }; + "emotion-9.2.12" = { + name = "emotion"; + packageName = "emotion"; + version = "9.2.12"; + src = fetchurl { + url = "https://registry.npmjs.org/emotion/-/emotion-9.2.12.tgz"; + sha512 = "hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ=="; + }; + }; "emphasize-1.5.0" = { name = "emphasize"; packageName = "emphasize"; @@ -16404,15 +16386,6 @@ let sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; }; }; - "es6-promisify-6.0.2" = { - name = "es6-promisify"; - packageName = "es6-promisify"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.0.2.tgz"; - sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg=="; - }; - }; "es6-promisify-6.1.1" = { name = "es6-promisify"; packageName = "es6-promisify"; @@ -16629,6 +16602,15 @@ let sha512 = "vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q=="; }; }; + "eslint-7.6.0" = { + name = "eslint"; + packageName = "eslint"; + version = "7.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz"; + sha512 = "QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w=="; + }; + }; "eslint-plugin-no-unsanitized-3.1.2" = { name = "eslint-plugin-no-unsanitized"; packageName = "eslint-plugin-no-unsanitized"; @@ -16692,15 +16674,6 @@ let sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; - "eslint-visitor-keys-1.2.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.2.0.tgz"; - sha512 = "WFb4ihckKil6hu3Dp798xdzSfddwKKU3+nGniKF6HfeW6OLd2OUDEPP7TcHtB5+QXOKg2s6B2DaMPE1Nn/kxKQ=="; - }; - }; "eslint-visitor-keys-1.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -17979,15 +17952,6 @@ let sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; }; }; - "file-exists-dazinatorfork-1.0.2" = { - name = "file-exists-dazinatorfork"; - packageName = "file-exists-dazinatorfork"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/file-exists-dazinatorfork/-/file-exists-dazinatorfork-1.0.2.tgz"; - sha512 = "r70c72ln2YHzQINNfxDp02hAhbGkt1HffZ+Du8oetWDLjDtFja/Lm10lUaSh9e+wD+7VDvPee0b0C9SAy8pWZg=="; - }; - }; "file-type-10.11.0" = { name = "file-type"; packageName = "file-type"; @@ -18123,15 +18087,6 @@ let sha512 = "5H3RqSaJp12THfZiNWodYM7TiKfQvrpX+EIOrB1XvCceTys4yvfEIl8wDp+/yI8qj6Bxym8m0NYWwVXDAet/+A=="; }; }; - "filing-cabinet-2.5.1" = { - name = "filing-cabinet"; - packageName = "filing-cabinet"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-2.5.1.tgz"; - sha512 = "GWOdObzou2L0HrJUk8MpJa01q0ZOwuTwTssM2+P+ABJWEGlVWd6ueEatANFdin94/3rdkVSdqpH14VqCNqp3RA=="; - }; - }; "fill-range-2.2.4" = { name = "fill-range"; packageName = "fill-range"; @@ -18177,15 +18132,6 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "find-0.3.0" = { - name = "find"; - packageName = "find"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find/-/find-0.3.0.tgz"; - sha512 = "iSd+O4OEYV/I36Zl8MdYJO0xD82wH528SaCieTVHhclgiYNe9y+yPKSwK+A7/WsmHL1EZ+pYUJBXWTL5qofksw=="; - }; - }; "find-cache-dir-2.1.0" = { name = "find-cache-dir"; packageName = "find-cache-dir"; @@ -18231,6 +18177,15 @@ let sha512 = "UME7hNwBfzeISSFQcBEDemEEskpOjI/shPrpJM5PI4DSdn6hX0dmz+2dL70blZER2z8tSnTRL+2rfzlYgtbBoQ=="; }; }; + "find-root-1.1.0" = { + name = "find-root"; + packageName = "find-root"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz"; + sha512 = "NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="; + }; + }; "find-up-1.1.2" = { name = "find-up"; packageName = "find-up"; @@ -18330,13 +18285,13 @@ let sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng=="; }; }; - "firefox-profile-1.3.1" = { + "firefox-profile-2.0.0" = { name = "firefox-profile"; packageName = "firefox-profile"; - version = "1.3.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.3.1.tgz"; - sha512 = "8q7DnwVIXvuJuBm1shr5ivRh0Ih2ytWwOIMwHInDSlVyrjQVXy7Ik0frItDdWb/P5CIpQFcMk9fPsUwNqi2lyQ=="; + url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-2.0.0.tgz"; + sha512 = "BPfcUISOV6+UwF6uqo5QS8iuFL6XZvHCm+1iuynIJ7fe1zea69Is77/n/098fp0a9sZ94lvT8rpYB15S/riSaA=="; }; }; "first-chunk-stream-1.0.0" = { @@ -18366,6 +18321,15 @@ let sha512 = "LNRvR4hr/S8cXXkIY5pTgVP7L3tq6LlYWcg9nWBuW7o1NMxKZo6oOVa/6GIekMGI0Iw7uC+HWimMe9u/VAeKqw=="; }; }; + "first-chunk-stream-4.0.0" = { + name = "first-chunk-stream"; + packageName = "first-chunk-stream"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-4.0.0.tgz"; + sha512 = "8TOz/mJp7+zc2HN63vnJHotwceq4gQI1+/gdJVnJcG4dEB96oUxw7wV9We4QKjSFWUc/V0ADDfaGba5cDoG6EA=="; + }; + }; "fkill-6.2.0" = { name = "fkill"; packageName = "fkill"; @@ -18483,15 +18447,6 @@ let sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; }; }; - "flatten-1.0.3" = { - name = "flatten"; - packageName = "flatten"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz"; - sha512 = "dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="; - }; - }; "flow-bin-0.118.0" = { name = "flow-bin"; packageName = "flow-bin"; @@ -18501,13 +18456,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.129.0" = { + "flow-parser-0.130.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.129.0"; + version = "0.130.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.129.0.tgz"; - sha512 = "kzxyoEl8vG0JF0/h/u0UjALXmsGvwU2NBfKczCSNO/It2fKb8hz1gMt05OuZAlMLYXcvgjntWJadIABeKGPK4g=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.130.0.tgz"; + sha512 = "h9NATB7QsKhj2ucgEH2XzB7p+5ubk8IZX5u/qHkN+oyQoECi1diq6mYfIuYBOyL35f3AhJf/YDkBYQBTqqYK+w=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -18888,13 +18843,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.7.1" = { + "fp-ts-2.8.1" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.7.1"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.7.1.tgz"; - sha512 = "rYy41jF1gVhBNYbPwup50dtyT686OKOoa86PXwh8aKpBRfmvPhnBh2zUkOYj84GIMSCsgY+oJ/RVhVKRvWNPTA=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.1.tgz"; + sha512 = "HuA/6roEliHoBgEOLCKmGRcM90e2trW/ITZZ9d9P/ra7PreqQagC3Jg6OzqWkai13KUbG90b8QO9rHPBGK/ckw=="; }; }; "fragment-cache-0.2.1" = { @@ -19293,13 +19248,13 @@ let sha1 = "979e22f9451b4b38f051f7937c919dbacc692958"; }; }; - "fx-runner-1.0.12" = { + "fx-runner-1.0.13" = { name = "fx-runner"; packageName = "fx-runner"; - version = "1.0.12"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.12.tgz"; - sha512 = "SLATlfKI2lyIcQsU8Sgfcwrni6PpC1VMTgp3aRomK/6azrzSQ3r63HqoTRliE/6JP8WjqVkIdCOGWk1ZqhfceA=="; + url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.13.tgz"; + sha512 = "Ces2bm+LNuXehkvmN1/Z+oEDkI/jHBp9xdyBtBy7hcgvF18/pv/D8F6A6kQgNkMZsnBgLEv+VvdDxyqkfkYycw=="; }; }; "gauge-1.2.7" = { @@ -19410,15 +19365,6 @@ let sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; }; }; - "get-amd-module-type-3.0.0" = { - name = "get-amd-module-type"; - packageName = "get-amd-module-type"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-3.0.0.tgz"; - sha512 = "99Q7COuACPfVt18zH9N4VAMyb81S6TUgJm2NgV6ERtkh9VIkAaByZkW530wl3lLN5KTtSrK9jVLxYsoP5hQKsw=="; - }; - }; "get-assigned-identifiers-1.2.0" = { name = "get-assigned-identifiers"; packageName = "get-assigned-identifiers"; @@ -19464,15 +19410,6 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; - "get-own-enumerable-property-symbols-3.0.2" = { - name = "get-own-enumerable-property-symbols"; - packageName = "get-own-enumerable-property-symbols"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; - sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; - }; - }; "get-package-type-0.1.0" = { name = "get-package-type"; packageName = "get-package-type"; @@ -20545,6 +20482,15 @@ let sha512 = "O7vG5BT3w6Sotc26ybcvLKNTdfr4GfsIVMD+LdYqXCeJIYPRyp8BIsDOUtxw7S1PYvRw5vH3278J2EDezR6mfA=="; }; }; + "graphql-tag-2.11.0" = { + name = "graphql-tag"; + packageName = "graphql-tag"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.11.0.tgz"; + sha512 = "VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA=="; + }; + }; "graphql-tools-4.0.8" = { name = "graphql-tools"; packageName = "graphql-tools"; @@ -20806,13 +20752,13 @@ let sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; }; }; - "har-validator-5.1.3" = { + "har-validator-5.1.5" = { name = "har-validator"; packageName = "har-validator"; - version = "5.1.3"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; }; }; "hard-rejection-2.1.0" = { @@ -21355,13 +21301,13 @@ let sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e"; }; }; - "highlight.js-9.18.1" = { + "highlight.js-9.18.3" = { name = "highlight.js"; packageName = "highlight.js"; - version = "9.18.1"; + version = "9.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz"; - sha512 = "OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.3.tgz"; + sha512 = "zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ=="; }; }; "hipchatter-0.3.2" = { @@ -21409,6 +21355,15 @@ let sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd"; }; }; + "hoist-non-react-statics-3.3.2" = { + name = "hoist-non-react-statics"; + packageName = "hoist-non-react-statics"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"; + sha512 = "/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw=="; + }; + }; "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; @@ -23282,13 +23237,13 @@ let sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1"; }; }; - "is-docker-2.0.0" = { + "is-docker-2.1.1" = { name = "is-docker"; packageName = "is-docker"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz"; - sha512 = "pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ=="; + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz"; + sha512 = "ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="; }; }; "is-dotfile-1.0.3" = { @@ -23786,13 +23741,13 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-plain-object-4.1.0" = { + "is-plain-object-4.1.1" = { name = "is-plain-object"; packageName = "is-plain-object"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-4.1.0.tgz"; - sha512 = "1N1OpoS8S4Ua+FsH6Mhvgaj0di3uRXgulcv2dnFu2J/WcEsDNbBoiUX6mYmhQ2cAzZ+B/lTJtX1qUSL5RwsGug=="; + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-4.1.1.tgz"; + sha512 = "5Aw8LLVsDlZsETVMhoMXzqsXwQqr/0vlnBYzIXJbYo2F4yYlhLHs+Ez7Bod7IIQKWkJbJfxrWD7pA1Dw1TKrwA=="; }; }; "is-posix-bracket-0.1.1" = { @@ -23858,13 +23813,13 @@ let sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; }; }; - "is-regex-1.1.0" = { + "is-regex-1.1.1" = { name = "is-regex"; packageName = "is-regex"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz"; - sha512 = "iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw=="; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz"; + sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="; }; }; "is-regexp-1.0.0" = { @@ -23912,15 +23867,6 @@ let sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; }; }; - "is-relative-path-1.0.2" = { - name = "is-relative-path"; - packageName = "is-relative-path"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-relative-path/-/is-relative-path-1.0.2.tgz"; - sha1 = "091b46a0d67c1ed0fe85f1f8cfdde006bb251d46"; - }; - }; "is-relative-url-3.0.0" = { name = "is-relative-url"; packageName = "is-relative-url"; @@ -24146,15 +24092,6 @@ let sha512 = "pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw=="; }; }; - "is-what-3.10.0" = { - name = "is-what"; - packageName = "is-what"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-what/-/is-what-3.10.0.tgz"; - sha512 = "U4RYCXNOmATQHlOPlOCHCfXyKEFIPqvyaKDqYRuLbD6EYKcTTfc3YXkAYjzOVxO3zt34L+Wh2feIyWrYiZ7kng=="; - }; - }; "is-whitespace-character-1.0.4" = { name = "is-whitespace-character"; packageName = "is-whitespace-character"; @@ -24326,6 +24263,15 @@ let sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; }; + "isobject-4.0.0" = { + name = "isobject"; + packageName = "isobject"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz"; + sha512 = "S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="; + }; + }; "isomorphic-fetch-2.2.1" = { name = "isomorphic-fetch"; packageName = "isomorphic-fetch"; @@ -24605,13 +24551,13 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joplin-turndown-4.0.28" = { + "joplin-turndown-4.0.29" = { name = "joplin-turndown"; packageName = "joplin-turndown"; - version = "4.0.28"; + version = "4.0.29"; src = fetchurl { - url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.28.tgz"; - sha512 = "wQP9OUBAkWq/VPPCJcY1EI6tSXWlGs/BJ7Ce8BZYRF/1vEk/TRHOdKmCObQrXz/0nRoLiP5xeqNvHE1nK4XbRQ=="; + url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.29.tgz"; + sha512 = "rVGu8u4TpSRETo59/jiVW9iaXnpdxxpBHjb7nyCflkDfWhg1Kska4uagBQGw7cD2yxw7mB2YUIB/fAgtlIzcDQ=="; }; }; "joplin-turndown-plugin-gfm-1.0.12" = { @@ -24623,13 +24569,13 @@ let sha512 = "qL4+1iycQjZ1fs8zk3jSRk7cg3ROBUHk7GKtiLAQLFzLPKErnILUvz5DLszSQvz3s1sTjPbywLDISVUtBY6HaA=="; }; }; - "jpeg-js-0.1.2" = { + "jpeg-js-0.4.1" = { name = "jpeg-js"; packageName = "jpeg-js"; - version = "0.1.2"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.1.2.tgz"; - sha1 = "135b992c0575c985cfa0f494a3227ed238583ece"; + url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.1.tgz"; + sha512 = "jA55yJiB5tCXEddos8JBbvW+IMrqY0y1tjjx9KNVtA+QPmu7ND5j0zkKopClpUTsaETL135uOM2XfcYG4XRjmw=="; }; }; "jpeg-turbo-0.4.0" = { @@ -24668,13 +24614,13 @@ let sha512 = "NPAxHodxrs6hLXNW9VAfijYkBFtoL/pyzpDDu2vX2slUyLekkUD9JBM4V0NcAuOvhB2eW4hLFChoYD5B2uu9Sg=="; }; }; - "js-base64-2.6.3" = { + "js-base64-2.6.4" = { name = "js-base64"; packageName = "js-base64"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.3.tgz"; - sha512 = "fiUvdfCaAXoQTHdKMgTvg6IkecXDcVz6V5rlftUTclF9IKBjMizvSdQaCl/z/6TApDeby5NL+axYou3i0mu1Pg=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz"; + sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; }; }; "js-beautify-1.11.0" = { @@ -25524,13 +25470,13 @@ let sha1 = "83cb748496ac491c7135104cbe56b88ca7392477"; }; }; - "katex-0.11.1" = { + "katex-0.12.0" = { name = "katex"; packageName = "katex"; - version = "0.11.1"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.11.1.tgz"; - sha512 = "5oANDICCTX0NqYIyAiFCCwjQ7ERu3DQG2JFHLbYOf+fXaMoH8eg/zOq5WSYJsKMi/QebW+Eh3gSM+oss1H/bww=="; + url = "https://registry.npmjs.org/katex/-/katex-0.12.0.tgz"; + sha512 = "y+8btoc/CK70XqcHqjxiGWBOeIL8upbS0peTPXTvgrh21n1RiWWcIpSWM+4uXq+IAgNh9YYQWdc7LVDPDAEEAg=="; }; }; "keep-alive-agent-0.0.1" = { @@ -26226,22 +26172,22 @@ let sha512 = "9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA=="; }; }; - "libsodium-0.7.6" = { + "libsodium-0.7.8" = { name = "libsodium"; packageName = "libsodium"; - version = "0.7.6"; + version = "0.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.6.tgz"; - sha512 = "hPb/04sEuLcTRdWDtd+xH3RXBihpmbPCsKW/Jtf4PsvdyKh+D6z2D2gvp/5BfoxseP+0FCOg66kE+0oGUE/loQ=="; + url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.8.tgz"; + sha512 = "/Qc+APf0jbeWSaeEruH0L1/tbbT+sbf884ZL0/zV/0JXaDPBzYkKbyb/wmxMHgAHzm3t6gqe7bOOXAVwfqVikQ=="; }; }; - "libsodium-wrappers-0.7.6" = { + "libsodium-wrappers-0.7.8" = { name = "libsodium-wrappers"; packageName = "libsodium-wrappers"; - version = "0.7.6"; + version = "0.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.6.tgz"; - sha512 = "OUO2CWW5bHdLr6hkKLHIKI4raEkZrf3QHkhXsJ1yCh6MZ3JDA7jFD3kCATNquuGSG6MjjPHQIQms0y0gBDzjQg=="; + url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.8.tgz"; + sha512 = "PDhPWXBqd/SaqAFUBgH2Ux7b3VEEJgyD6BQB+VdNFJb9PbExGr/T/myc/MBoSvl8qLzfm0W0IVByOQS5L1MrCg=="; }; }; "lie-3.3.0" = { @@ -28764,6 +28710,15 @@ let sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; }; }; + "md5-2.3.0" = { + name = "md5"; + packageName = "md5"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz"; + sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="; + }; + }; "md5-file-4.0.0" = { name = "md5-file"; packageName = "md5-file"; @@ -28773,6 +28728,15 @@ let sha512 = "UC0qFwyAjn4YdPpKaDNw6gNxRf7Mcx7jC1UGCY4boCzgvU2Aoc1mOGzTtrjjLKhM5ivsnhoKpQVxKPp+1j1qwg=="; }; }; + "md5-file-5.0.0" = { + name = "md5-file"; + packageName = "md5-file"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/md5-file/-/md5-file-5.0.0.tgz"; + sha512 = "xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw=="; + }; + }; "md5.js-1.3.5" = { name = "md5.js"; packageName = "md5.js"; @@ -28818,13 +28782,13 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-1.0.25" = { + "mdn-browser-compat-data-1.0.31" = { name = "mdn-browser-compat-data"; packageName = "mdn-browser-compat-data"; - version = "1.0.25"; + version = "1.0.31"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.25.tgz"; - sha512 = "4klqILpitRnmWRai5Ols/GXP1eGDYMluAcBRoNZnGNkV2OnkDmpA9hUlM+9pTFym5FGDO5TAm3HweVSVc7ziiQ=="; + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.31.tgz"; + sha512 = "GVQQYWgoH3jbBaIy8M4hrg34qaNpPedtZvwAjUmkpHq4FXKKCea8Ji5rlS32YJSU9dt7TPvuWWX7Cce5mZyFPA=="; }; }; "mdn-data-2.0.4" = { @@ -29151,15 +29115,6 @@ let sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="; }; }; - "merge-anything-2.4.4" = { - name = "merge-anything"; - packageName = "merge-anything"; - version = "2.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-anything/-/merge-anything-2.4.4.tgz"; - sha512 = "l5XlriUDJKQT12bH+rVhAHjwIuXWdAIecGwsYjv2LJo+dA1AeRTmeQS+3QBpO6lEthBMDi2IUMpLC1yyRvGlwQ=="; - }; - }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -29457,13 +29412,13 @@ let sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; - "mimic-fn-3.0.0" = { + "mimic-fn-3.1.0" = { name = "mimic-fn"; packageName = "mimic-fn"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.0.0.tgz"; - sha512 = "PiVO95TKvhiwgSwg1IdLYlCTdul38yZxZMIcnDSFIBUm4BNZha2qpQ4GpJ++15bHoKDtrW2D69lMfFwdFYtNZQ=="; + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz"; + sha512 = "Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ=="; }; }; "mimic-response-1.0.1" = { @@ -29700,13 +29655,13 @@ let sha512 = "ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg=="; }; }; - "minipass-pipeline-1.2.3" = { + "minipass-pipeline-1.2.4" = { name = "minipass-pipeline"; packageName = "minipass-pipeline"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz"; - sha512 = "cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ=="; + url = "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; }; }; "minipass-sized-1.0.3" = { @@ -29871,22 +29826,22 @@ let sha512 = "nyuHPqmKnVOnbvkjR8OrijBtovxAHYC+JU8/qBqvBw4Dez/n+zzxqNHbZNFy7/07+wwc/Qz7JS9WSfy1LcYISA=="; }; }; - "mobx-react-6.1.5" = { + "mobx-react-6.2.5" = { name = "mobx-react"; packageName = "mobx-react"; - version = "6.1.5"; + version = "6.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react/-/mobx-react-6.1.5.tgz"; - sha512 = "EfWoXmGE2CfozH4Xirb65+il1ynHFCmxBSUabMSf+511YfjVs6QRcCrHkiVw+Il8iWp1gIyfa9qKkUgbDA9/2w=="; + url = "https://registry.npmjs.org/mobx-react/-/mobx-react-6.2.5.tgz"; + sha512 = "LxtXXW0GkOAO6VOIg2m/6WL6ZuKlzOWwESIFdrWelI0ZMIvtKCMZVUuulcO5GAWSDsH0ApaMkGLoaPqKjzyziQ=="; }; }; - "mobx-react-lite-1.5.2" = { + "mobx-react-lite-2.0.7" = { name = "mobx-react-lite"; packageName = "mobx-react-lite"; - version = "1.5.2"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-1.5.2.tgz"; - sha512 = "PyZmARqqWtpuQaAoHF5pKX7h6TKNLwq6vtovm4zZvG6sEbMRHHSqioGXSeQbpRmG8Kw8uln3q/W1yMO5IfL5Sg=="; + url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-2.0.7.tgz"; + sha512 = "YKAh2gThC6WooPnVZCoC+rV1bODAKFwkhxikzgH18wpBjkgTkkR9Sb0IesQAH5QrAEH/JQVmy47jcpQkf2Au3Q=="; }; }; "mocha-2.5.3" = { @@ -29898,13 +29853,13 @@ let sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; - "mocha-8.0.1" = { + "mocha-8.1.1" = { name = "mocha"; packageName = "mocha"; - version = "8.0.1"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.0.1.tgz"; - sha512 = "vefaXfdYI8+Yo8nPZQQi0QO2o+5q9UIMX1jZ1XMmK3+4+CQjc7+B0hPdUeglXiTlr8IHMVRo63IhO9Mzt6fxOg=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.1.1.tgz"; + sha512 = "p7FuGlYH8t7gaiodlFreseLxEmxTgvyG9RgPHODFPySNhwUehu8NIb0vdSt3WFckSneswZ0Un5typYcWElk7HQ=="; }; }; "mock-require-3.0.3" = { @@ -29934,31 +29889,13 @@ let sha512 = "A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q=="; }; }; - "module-definition-3.3.0" = { - name = "module-definition"; - packageName = "module-definition"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/module-definition/-/module-definition-3.3.0.tgz"; - sha512 = "HTplA9xwDzH67XJFC1YvZMUElWJD28DV0dUq7lhTs+JKJamUOWA/CcYWSlhW5amJO66uWtY7XdltT+LfX0wIVg=="; - }; - }; - "module-deps-6.2.2" = { + "module-deps-6.2.3" = { name = "module-deps"; packageName = "module-deps"; - version = "6.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.2.tgz"; - sha512 = "a9y6yDv5u5I4A+IPHTnqFxcaKr4p50/zxTjcQJaX2ws9tN/W6J6YXnEKhqRyPhl494dkcxx951onSKVezmI+3w=="; - }; - }; - "module-lookup-amd-6.2.0" = { - name = "module-lookup-amd"; - packageName = "module-lookup-amd"; - version = "6.2.0"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/module-lookup-amd/-/module-lookup-amd-6.2.0.tgz"; - sha512 = "uxHCj5Pw9psZiC1znjU2qPsubt6haCSsN9m7xmIdoTciEgfxUkE1vhtDvjHPuOXEZrVJhjKgkmkP+w73rRuelQ=="; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz"; + sha512 = "fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA=="; }; }; "mold-source-map-0.4.0" = { @@ -30294,13 +30231,13 @@ let sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4"; }; }; - "multiparty-4.2.1" = { + "multiparty-4.2.2" = { name = "multiparty"; packageName = "multiparty"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-4.2.1.tgz"; - sha512 = "AvESCnNoQlZiOfP9R4mxN8M9csy2L16EIbWIkt3l4FuGti9kXBS8QVzlfyg4HEnarJhrzZilgNFlZtqmoiAIIA=="; + url = "https://registry.npmjs.org/multiparty/-/multiparty-4.2.2.tgz"; + sha512 = "NtZLjlvsjcoGrzojtwQwn/Tm90aWJ6XXtPppYF4WmOk/6ncdwMMKggFY2NlRRN9yiCEIVxpOfPWahVEG2HAG8Q=="; }; }; "multipipe-0.1.2" = { @@ -31367,6 +31304,15 @@ let sha512 = "SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw=="; }; }; + "node-notifier-7.0.2" = { + name = "node-notifier"; + packageName = "node-notifier"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.2.tgz"; + sha512 = "ux+n4hPVETuTL8+daJXTOC6uKLgMsl1RYfFv7DKRzyvzBapqco0rZZ9g72ZN8VS6V+gvNYHYa/ofcCY8fkJWsA=="; + }; + }; "node-persist-2.1.0" = { name = "node-persist"; packageName = "node-persist"; @@ -31475,15 +31421,6 @@ let sha512 = "gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="; }; }; - "node-source-walk-4.2.0" = { - name = "node-source-walk"; - packageName = "node-source-walk"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-source-walk/-/node-source-walk-4.2.0.tgz"; - sha512 = "hPs/QMe6zS94f5+jG3kk9E7TNm4P2SulrKiLWMzKszBfNZvL/V6wseHlTd7IvfW0NZWqPtK3+9yYNr+3USGteA=="; - }; - }; "node-ssdp-2.9.1" = { name = "node-ssdp"; packageName = "node-ssdp"; @@ -32114,22 +32051,22 @@ let sha512 = "jFWBHjSoqODGo7cKA/VWqqWSLbHNtnyCEpa2nMMS64SzCUbZDk63Oe7LqQZ2qJA0K2VRreYLt6cVkYy6MqNRDg=="; }; }; - "oas-resolver-2.4.1" = { + "oas-resolver-2.4.2" = { name = "oas-resolver"; packageName = "oas-resolver"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.4.1.tgz"; - sha512 = "rRmUv9mDTKPtsB2OGaoNMK4BC1Q/pL+tWRPKRjXJEBoLmfegJhecOZPBtIR0gKEVQb9iAA0MqulkgY43EiCFDg=="; + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.4.2.tgz"; + sha512 = "iJo7wE/MhuCJefkcpCS/NlE8MunRgRvgPozpeLSZUg0zmU8PBkzUwdtzpmjGDd7QjEuUi0SZ/y1wIrFIH+FNiA=="; }; }; - "oas-schema-walker-1.1.4" = { + "oas-schema-walker-1.1.5" = { name = "oas-schema-walker"; packageName = "oas-schema-walker"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/oas-schema-walker/-/oas-schema-walker-1.1.4.tgz"; - sha512 = "foVDDS0RJYMfhQEDh/WdBuCzydTcsCnGo9EeD8SpWq1uW10JXiz+8SfYVDA7LO87kjmlnTRZle/2gr5qxabaEA=="; + url = "https://registry.npmjs.org/oas-schema-walker/-/oas-schema-walker-1.1.5.tgz"; + sha512 = "2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ=="; }; }; "oas-validator-3.4.0" = { @@ -32141,6 +32078,15 @@ let sha512 = "l/SxykuACi2U51osSsBXTxdsFc8Fw41xI7AsZkzgVgWJAzoEFaaNptt35WgY9C3757RUclsm6ye5GvSyYoozLQ=="; }; }; + "oas-validator-4.0.7" = { + name = "oas-validator"; + packageName = "oas-validator"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/oas-validator/-/oas-validator-4.0.7.tgz"; + sha512 = "ppSW68iIIhvzFwSvY51NJPLM0uFjkHKAdoXKO+Pq6Ej1qU5Nvi9I3dQt6W8y/B+UYIP8yXr9YTEuvzG7sQH/ww=="; + }; + }; "oauth-0.9.15" = { name = "oauth"; packageName = "oauth"; @@ -32628,13 +32574,13 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; - "onetime-5.1.0" = { + "onetime-5.1.1" = { name = "onetime"; packageName = "onetime"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; - sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.1.tgz"; + sha512 = "ZpZpjcJeugQfWsfyQlshVoowIIQ1qBGSVll4rfDq6JJVO//fesjoX808hXWfBjY+ROZgpKDI5TRSRBSoJiZ8eg=="; }; }; "ono-4.0.11" = { @@ -32682,15 +32628,6 @@ let sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="; }; }; - "open-7.0.0" = { - name = "open"; - packageName = "open"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.0.0.tgz"; - sha512 = "K6EKzYqnwQzk+/dzJAQSBORub3xlBTxMz+ntpZpH/LyCa1o6KjXhuN+2npAaI9jaSmU3R1Q8NWf4KUWcyytGsQ=="; - }; - }; "open-7.0.4" = { name = "open"; packageName = "open"; @@ -32709,13 +32646,13 @@ let sha512 = "lLPI5KgOwEYCDKXf4np7y1PBEkj7HYIyP2DY8mVDRnx0VIIu6bNrRB0R66TuO7Mack6EnTNLm4uvcl1UoklTpA=="; }; }; - "openapi-sampler-1.0.0-beta.15" = { + "openapi-sampler-1.0.0-beta.16" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.0.0-beta.15"; + version = "1.0.0-beta.16"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.15.tgz"; - sha512 = "wUD/vD3iBHKik/sME3uwUu4X3HFA53rDrPcVvLzgEELjHLbnTpSYfm4Jo9qZT1dPfBRowAnrF/VRQfOjL5QRAw=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.16.tgz"; + sha512 = "05+GvwMagTY7GxoDQoWJfmAUFlxfebciiEzqKmu4iq6+MqBEn62AMUkn0CTxyKhnUGIaR2KXjTeslxIeJwVIOw=="; }; }; "openapi-to-graphql-2.1.0" = { @@ -33735,13 +33672,13 @@ let sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; }; }; - "parse-json-5.0.0" = { + "parse-json-5.0.1" = { name = "parse-json"; packageName = "parse-json"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz"; - sha512 = "OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw=="; + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.0.1.tgz"; + sha512 = "ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ=="; }; }; "parse-latin-4.2.1" = { @@ -34572,22 +34509,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-6.0.0" = { - name = "pino"; - packageName = "pino"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-6.0.0.tgz"; - sha512 = "3RfX2L76o7v230FP1fZ3Fo/WX7Su+P1Ld+pvBm2j+MyUjtA/KqDYxMkzBqzcX3R00zbC7Gf/HqIzyuu3tgvi9Q=="; - }; - }; - "pino-6.3.2" = { + "pino-6.4.0" = { name = "pino"; packageName = "pino"; - version = "6.3.2"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-6.3.2.tgz"; - sha512 = "EiP3L1hoFw19KPocWimjnfXeysld0ne89ZRQ+bf8nAeA2TyuLoggNlibAi+Kla67GvQBopLdIZOsh1z/Lruo5Q=="; + url = "https://registry.npmjs.org/pino/-/pino-6.4.0.tgz"; + sha512 = "TRDp5fJKRBtVlxd4CTox3rJL+TzwQztB/VNmT5n87zFgKVU7ztnmZkcX1zypPP+3ZZcveOTYKJy74UXdVBaXFQ=="; }; }; "pino-std-serializers-2.4.2" = { @@ -34842,13 +34770,13 @@ let sha1 = "1cc7c212303acabe74263ec3ac78009580242d93"; }; }; - "pngjs-2.3.1" = { + "pngjs-5.0.0" = { name = "pngjs"; packageName = "pngjs"; - version = "2.3.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pngjs/-/pngjs-2.3.1.tgz"; - sha1 = "11d1e12b9cb64d63e30c143a330f4c1f567da85f"; + url = "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz"; + sha512 = "40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="; }; }; "polished-3.6.5" = { @@ -34860,13 +34788,13 @@ let sha512 = "VwhC9MlhW7O5dg/z7k32dabcAFW1VI2+7fSe8cE/kXcfL7mVdoa5UxciYGW2sJU78ldDLT6+ROEKIZKFNTnUXQ=="; }; }; - "portfinder-1.0.27" = { + "portfinder-1.0.28" = { name = "portfinder"; packageName = "portfinder"; - version = "1.0.27"; + version = "1.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.27.tgz"; - sha512 = "bJ3U3MThKnyJ9Dx1Idtm5pQmxXqw08+XOHhi/Lie8OF1OlhVaBFhsntAIhkZYjfDcCzszSr0w1yCbccThhzgxQ=="; + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz"; + sha512 = "Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA=="; }; }; "posix-character-classes-0.1.1" = { @@ -35401,15 +35329,6 @@ let sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; }; }; - "postcss-values-parser-1.5.0" = { - name = "postcss-values-parser"; - packageName = "postcss-values-parser"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz"; - sha512 = "3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ=="; - }; - }; "posthtml-0.11.6" = { name = "posthtml"; packageName = "posthtml"; @@ -35437,13 +35356,13 @@ let sha512 = "BUIorsYJTvS9UhXxPTzupIztOMVNPa/HtAm9KHni9z6qEfiJ1bpOBL5DfUOL9XAc3XkLIEzBzpph+Zbm4AdRAg=="; }; }; - "posthtml-render-1.2.2" = { + "posthtml-render-1.2.3" = { name = "posthtml-render"; packageName = "posthtml-render"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.2.2.tgz"; - sha512 = "MbIXTWwAfJ9qET6Zl29UNwJcDJEEz9Zkr5oDhiujitJa7YBJwEpbkX2cmuklCDxubTMoRWpid3q8DrSyGnUUzQ=="; + url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.2.3.tgz"; + sha512 = "rGGayND//VwTlsYKNqdILsA7U/XP0WJa6SMcdAEoqc2WRM5QExplGg/h9qbTuHz7mc2PvaXU+6iNxItvr5aHMg=="; }; }; "prebuild-install-5.3.3" = { @@ -35455,15 +35374,6 @@ let sha512 = "GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g=="; }; }; - "precinct-6.3.1" = { - name = "precinct"; - packageName = "precinct"; - version = "6.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/precinct/-/precinct-6.3.1.tgz"; - sha512 = "JAwyLCgTylWminoD7V0VJwMElWmwrVSR6r9HaPWCoswkB4iFzX7aNtO7VBfAVPy+NhmjKb8IF8UmlWJXzUkOIQ=="; - }; - }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -37453,13 +37363,13 @@ let sha512 = "81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag=="; }; }; - "react-dropdown-1.7.0" = { - name = "react-dropdown"; - packageName = "react-dropdown"; - version = "1.7.0"; + "react-dropdown-aria-2.0.7" = { + name = "react-dropdown-aria"; + packageName = "react-dropdown-aria"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/react-dropdown/-/react-dropdown-1.7.0.tgz"; - sha512 = "zFZ73pgLA32hArpE4j/7DtOEhOMg240XG5QvbAb0/VinGekkHDVIakMyAFUKC5jDz8jqXEltgriqFW9R5iCtPQ=="; + url = "https://registry.npmjs.org/react-dropdown-aria/-/react-dropdown-aria-2.0.7.tgz"; + sha512 = "wRjmmMUmA/q33ZugY0lTka4b6jY1ehp8qgHG2yeda64z5I0gTOtyxUVI/tA9ZBlBqysDN22hMGHNMnPb2sg+Qw=="; }; }; "react-is-16.13.1" = { @@ -37903,13 +37813,13 @@ let sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; }; }; - "redoc-2.0.0-rc.29" = { + "redoc-2.0.0-rc.36" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.29"; + version = "2.0.0-rc.36"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.29.tgz"; - sha512 = "G2PX4QG/XdNKqRvxPpszJdPPRcODJjkuGidjNr4m/eP04aoNjWpytcH1XxZUC7fVW6zBUtJTaktv1HnVF+2GmA=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.36.tgz"; + sha512 = "vTK1slMn1FcV4QwiBxFL6adIzYoOPzrkRsVyedGj4SrqjIJXuQ5HWVsxpMGoru45tgp3bs7Jy3TBOcEdOYjbbg=="; }; }; "reduce-component-1.0.1" = { @@ -37939,13 +37849,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "reftools-1.1.3" = { + "reftools-1.1.4" = { name = "reftools"; packageName = "reftools"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/reftools/-/reftools-1.1.3.tgz"; - sha512 = "JTlhKmSzqE/gt5Z5RX25yZDq67MlRRtTz1gLy/NY+wPDx1e1vEJsv1PoNrpKZBwitcEMXs2k7pzmbmraP1ZMAQ=="; + url = "https://registry.npmjs.org/reftools/-/reftools-1.1.4.tgz"; + sha512 = "Y8VEk3OXPwuU+ZAAPiR0YhYy9iBSO3NBRnXHGfqW6c2mo2V+fQ0cwRA38Ny6z9ZzcAo6HjmVvAri+wz3+8fsdQ=="; }; }; "regenerate-1.4.1" = { @@ -38371,15 +38281,6 @@ let sha1 = "cf8b66e9e6fcb4acc9721048adeee7a357698ba9"; }; }; - "remove-markdown-0.3.0" = { - name = "remove-markdown"; - packageName = "remove-markdown"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remove-markdown/-/remove-markdown-0.3.0.tgz"; - sha1 = "5e4b667493a93579728f3d52ecc1db9ca505dc98"; - }; - }; "remove-trailing-separator-1.1.0" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; @@ -38632,15 +38533,6 @@ let sha512 = "ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg=="; }; }; - "requirejs-config-file-3.1.2" = { - name = "requirejs-config-file"; - packageName = "requirejs-config-file"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/requirejs-config-file/-/requirejs-config-file-3.1.2.tgz"; - sha512 = "sdLWywcDuNz7EIOhenSbRfT4YF84nItDv90coN2htbokjmU2QeyQuSBZILQUKNksepl8UPVU+hgYySFaDxbJPQ=="; - }; - }; "requires-port-1.0.0" = { name = "requires-port"; packageName = "requires-port"; @@ -38659,15 +38551,6 @@ let sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ=="; }; }; - "resolve-1.1.7" = { - name = "resolve"; - packageName = "resolve"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; - }; - }; "resolve-1.17.0" = { name = "resolve"; packageName = "resolve"; @@ -38704,15 +38587,6 @@ let sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; }; }; - "resolve-dependency-path-2.0.0" = { - name = "resolve-dependency-path"; - packageName = "resolve-dependency-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-dependency-path/-/resolve-dependency-path-2.0.0.tgz"; - sha512 = "DIgu+0Dv+6v2XwRaNWnumKu7GPufBBOr5I1gRPJHkvghrfCGOooJODFvgFimX/KRxk9j0whD2MnKHzM1jYvk9w=="; - }; - }; "resolve-dir-1.0.1" = { name = "resolve-dir"; packageName = "resolve-dir"; @@ -39163,13 +39037,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.22.2" = { + "rollup-2.23.0" = { name = "rollup"; packageName = "rollup"; - version = "2.22.2"; + version = "2.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.22.2.tgz"; - sha512 = "2a4Mch4f0W2lEvkPuxtz0GfrtfgLj9bdd/oC9L3LozGOCnmLqO7ivMfKbCJoRgqWIU2UqAcbxRFSwmIKx+uStA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.23.0.tgz"; + sha512 = "vLNmZFUGVwrnqNAJ/BvuLk1MtWzu4IuoqsH9UWK5AIdO3rt8/CSiJNvPvCIvfzrbNsqKbNzPAG1V2O4eTe2XZg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -39451,13 +39325,13 @@ let sha512 = "WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ=="; }; }; - "rxjs-6.6.0" = { + "rxjs-6.6.2" = { name = "rxjs"; packageName = "rxjs"; - version = "6.6.0"; + version = "6.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz"; - sha512 = "3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz"; + sha512 = "BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg=="; }; }; "s.color-0.0.13" = { @@ -39613,15 +39487,6 @@ let sha512 = "EhNMkRZSZHcHrg/w0XgBoW96pcY11SBJ69mCI2S3Eo2sce2CSd66AqxAS05eC8yoc4BVg/Fr2KZty5B3gt6xGw=="; }; }; - "sass-lookup-3.0.0" = { - name = "sass-lookup"; - packageName = "sass-lookup"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-lookup/-/sass-lookup-3.0.0.tgz"; - sha512 = "TTsus8CfFRn1N44bvdEai1no6PqdmDiQUiqW5DlpmtT+tYnIt1tXtDIph5KA1efC+LmioJXSnCtUVpcK9gaKIg=="; - }; - }; "sax-0.5.8" = { name = "sax"; packageName = "sax"; @@ -39757,13 +39622,13 @@ let sha1 = "f0c82d98a3b139a8776a8808050b824431087fca"; }; }; - "seek-bzip-1.0.5" = { + "seek-bzip-1.0.6" = { name = "seek-bzip"; packageName = "seek-bzip"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz"; - sha1 = "cfe917cb3d274bcffac792758af53173eb1fabdc"; + url = "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz"; + sha512 = "e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ=="; }; }; "select-1.1.2" = { @@ -40108,15 +39973,6 @@ let sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; }; }; - "serialize-javascript-3.0.0" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz"; - sha512 = "skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw=="; - }; - }; "serialize-javascript-3.1.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; @@ -40324,6 +40180,15 @@ let sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; }; }; + "shallowequal-1.1.0" = { + name = "shallowequal"; + packageName = "shallowequal"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz"; + sha512 = "y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="; + }; + }; "sharp-0.23.4" = { name = "sharp"; packageName = "sharp"; @@ -40549,13 +40414,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-2.0.5" = { + "sign-addon-2.0.6" = { name = "sign-addon"; packageName = "sign-addon"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-2.0.5.tgz"; - sha512 = "dVjIWe1VJ2VQCdScREWXWECmJhgjpJMqwPKkW+L78PPx2Jyr/t+//kNHqG1hYrmIsvQN7vGjAjv9s7ix0vw0zA=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-2.0.6.tgz"; + sha512 = "/8SQPNCrrZKMthdDf1IfI4XMbq8k9YsiiMyVeQL8xhhQSsZho6ZvEUBFSA70N0eznLZyab3k1d2CNOchYRYA6Q=="; }; }; "signal-exit-3.0.3" = { @@ -40873,13 +40738,13 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "slugify-1.4.4" = { + "slugify-1.4.5" = { name = "slugify"; packageName = "slugify"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/slugify/-/slugify-1.4.4.tgz"; - sha512 = "N2+9NJ8JzfRMh6PQLrBeDEnVDQZSytE/W4BTC4fNNPmO90Uu58uNwSlIJSs+lmPgWsaAF79WLhVPe5tuy7spjw=="; + url = "https://registry.npmjs.org/slugify/-/slugify-1.4.5.tgz"; + sha512 = "WpECLAgYaxHoEAJ8Q1Lo8HOs1ngn7LN7QjXgOLbmmfkcWvosyk4ZTXkTzKyhngK640USTZUlgoQJfED1kz5fnQ=="; }; }; "smart-buffer-4.1.0" = { @@ -41062,13 +40927,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.17.3" = { + "snyk-mvn-plugin-2.18.2" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.17.3"; + version = "2.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.17.3.tgz"; - sha512 = "yDlqPuNacYUdf4JlyW8dHcxJJC3BMOU01m5cuGhX6s8j88T79A0qrwUu8AJwCIjbDXpD1YSoS1Wb7gRdvDlbKA=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.18.2.tgz"; + sha512 = "A36YmfpeEXGsKoChm644DysKG40d5y5MZnldkpsbrLz37R3JMxkt4igMACZ9QJZAkiWjVs28hOKyyT1vuMPlHg=="; }; }; "snyk-nodejs-lockfile-parser-1.22.0" = { @@ -41575,15 +41440,6 @@ let sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; - "source-map-support-0.5.16" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.16"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; - sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; - }; - }; "source-map-support-0.5.19" = { name = "source-map-support"; packageName = "source-map-support"; @@ -42025,13 +41881,13 @@ let sha512 = "J3fsWb5nS6PqObZLW2tclEz/bkRQ5pcF9goXanYGVsoH71F6W4f5sOnck9szeubI8srNaiL9pa0kPRv/lojHiw=="; }; }; - "ssb-db-20.2.2" = { + "ssb-db-20.3.0" = { name = "ssb-db"; packageName = "ssb-db"; - version = "20.2.2"; + version = "20.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db/-/ssb-db-20.2.2.tgz"; - sha512 = "Gfdss0LWdfkRSALCaT1ggE7FhwNaIl/NcY2RMC9BFt3SWP1QGJweDw4TsxIawpRQp7JxNN+WQKra/wtFSsfPig=="; + url = "https://registry.npmjs.org/ssb-db/-/ssb-db-20.3.0.tgz"; + sha512 = "JOXCrS6k3+/kuOcFmZwc9vxPN55Czb7McFs5KEYA+/phykPwQ6e3hwjMT5YrVzSirCf8ptPS/mpOsCDog5Z2dg=="; }; }; "ssb-ebt-5.6.7" = { @@ -42772,6 +42628,15 @@ let sha1 = "b1edb2e1c8cb11289d1b503c08d3f2aef51e650f"; }; }; + "stream-to-promise-3.0.0" = { + name = "stream-to-promise"; + packageName = "stream-to-promise"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-promise/-/stream-to-promise-3.0.0.tgz"; + sha512 = "h+7wLeFiYegOdgTfTxjRsrT7/Op7grnKEIHWgaO1RTHwcwk7xRreMr3S8XpDfDMesSxzgM2V4CxNCFAGo6ssnA=="; + }; + }; "stream-to-pull-stream-1.7.3" = { name = "stream-to-pull-stream"; packageName = "stream-to-pull-stream"; @@ -42988,15 +42853,6 @@ let sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; - "string.prototype.padstart-3.1.0" = { - name = "string.prototype.padstart"; - packageName = "string.prototype.padstart"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.padstart/-/string.prototype.padstart-3.1.0.tgz"; - sha512 = "envqZvUp2JItI+OeQ5UAh1ihbAV5G/2bixTojvlIa090GGqF+NQRxbWb2nv9fTGrZABv6+pE6jXoAZhhS2k4Hw=="; - }; - }; "string.prototype.trim-1.2.1" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; @@ -43078,13 +42934,13 @@ let sha512 = "fqqhZzXyAM6pGD9lky/GOPq6V4X0SeTAFBl0iXb/BzOegl40gpf/bV3QQP7zULNYvjr6+Dx8SCaDULjVoOru0A=="; }; }; - "stringify-object-3.3.0" = { - name = "stringify-object"; - packageName = "stringify-object"; - version = "3.3.0"; + "stringify-package-1.0.1" = { + name = "stringify-package"; + packageName = "stringify-package"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"; - sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; + url = "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz"; + sha512 = "sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg=="; }; }; "stringify-parameters-0.0.4" = { @@ -43393,13 +43249,13 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.0.3" = { + "strtok3-6.0.4" = { name = "strtok3"; packageName = "strtok3"; - version = "6.0.3"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.3.tgz"; - sha512 = "/3RaYN9rW5WEYNHSvn081CgL4HziT027hfi5tsksbPfeWxi3BSLb8tolZDzpYU3I78/0ZqRiFpMDAqN2t4YShA=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.4.tgz"; + sha512 = "rqWMKwsbN9APU47bQTMEYTPcwdpKDtmf1jVhHzNW2cL1WqAxaM9iBb9t5P2fj+RV2YsErUWgQzHD5JwV0uCTEQ=="; }; }; "structured-source-3.0.2" = { @@ -43420,13 +43276,13 @@ let sha1 = "7958c793e47e32e07d2b5cafe5c0bf8e12e77902"; }; }; - "styled-components-4.4.1" = { + "styled-components-5.1.1" = { name = "styled-components"; packageName = "styled-components"; - version = "4.4.1"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/styled-components/-/styled-components-4.4.1.tgz"; - sha512 = "RNqj14kYzw++6Sr38n7197xG33ipEOktGElty4I70IKzQF1jzaD1U4xQ+Ny/i03UUhHlC5NWEO+d8olRCDji6g=="; + url = "https://registry.npmjs.org/styled-components/-/styled-components-5.1.1.tgz"; + sha512 = "1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg=="; }; }; "stylehacks-4.0.3" = { @@ -43510,15 +43366,6 @@ let sha512 = "vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg=="; }; }; - "stylus-lookup-3.0.2" = { - name = "stylus-lookup"; - packageName = "stylus-lookup"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stylus-lookup/-/stylus-lookup-3.0.2.tgz"; - sha512 = "oEQGHSjg/AMaWlKe7gqsnYzan8DLcGIHe0dUaFkucZZ14z4zjENRlQMCHT4FNsiWnJf17YN9OvrCfCoi7VvOyg=="; - }; - }; "stylus-supremacy-2.14.5" = { name = "stylus-supremacy"; packageName = "stylus-supremacy"; @@ -43852,6 +43699,15 @@ let sha512 = "f5QqfXawiVijhjMtYqWZ55ESHPZFqrPC8L9idhIiuSX8O2qsa1i4MVGtCM3TQF+Smzr/6WfT/7zBuzG3aTgPAA=="; }; }; + "swagger2openapi-6.2.2" = { + name = "swagger2openapi"; + packageName = "swagger2openapi"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-6.2.2.tgz"; + sha512 = "A8RWwzkymhF/ZfO0AylEZ2eCaN2jvAJU3bdtXQzkW5QvuyBMUBcyfB2tkHMTpXWYDmt7uKHwPGRZ0doPejtARA=="; + }; + }; "sway-1.0.0" = { name = "sway"; packageName = "sway"; @@ -44330,13 +44186,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.41.0" = { + "terminal-kit-1.42.0" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.41.0"; + version = "1.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.41.0.tgz"; - sha512 = "BMP/2gyUCIRAB3Y07jX8fwQeSx5FKD3EAyoSHShbuudeov+nVOSd3/x6QEA3320iDZboQf/HWjqYgTdIxA1pKA=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.42.0.tgz"; + sha512 = "l9GCV47Gm+A+nshoOhvEpcUSQE27k0gRRSxowQodI2nc6uOw/RVr0U3zgj61zLQStCLDqQ6JVfV1vAdlF0lFjA=="; }; }; "terser-3.17.0" = { @@ -45167,6 +45023,15 @@ let sha1 = "42d88dd116618bcf00d6106dd5446f3427902ff1"; }; }; + "touch-2.0.2" = { + name = "touch"; + packageName = "touch"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/touch/-/touch-2.0.2.tgz"; + sha512 = "qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A=="; + }; + }; "touch-3.1.0" = { name = "touch"; packageName = "touch"; @@ -45284,15 +45149,6 @@ let sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; }; }; - "traverse-chain-0.1.0" = { - name = "traverse-chain"; - packageName = "traverse-chain"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/traverse-chain/-/traverse-chain-0.1.0.tgz"; - sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1"; - }; - }; "tree-kill-1.2.2" = { name = "tree-kill"; packageName = "tree-kill"; @@ -45995,6 +45851,15 @@ let sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; }; }; + "uglify-js-3.10.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.1.tgz"; + sha512 = "RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q=="; + }; + }; "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; @@ -46895,15 +46760,6 @@ let sha512 = "grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ=="; }; }; - "update-notifier-4.0.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.0.0.tgz"; - sha512 = "p9zf71hWt5GVXM4iEBujpUgx8mK9AWiCCapEJm/O1z5ntCim83Z1ATqzZFBHFYqx03laMqv8LiDgs/7ikXjf/g=="; - }; - }; "update-notifier-4.1.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -47381,13 +47237,13 @@ let sha512 = "CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="; }; }; - "uuid-8.2.0" = { + "uuid-8.3.0" = { name = "uuid"; packageName = "uuid"; - version = "8.2.0"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.2.0.tgz"; - sha512 = "CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q=="; + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz"; + sha512 = "fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="; }; }; "v8-compile-cache-2.1.1" = { @@ -47696,13 +47552,13 @@ let sha512 = "y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ=="; }; }; - "vfile-4.1.1" = { + "vfile-4.2.0" = { name = "vfile"; packageName = "vfile"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-4.1.1.tgz"; - sha512 = "lRjkpyDGjVlBA7cDQhQ+gNcvB1BGaTHYuSOcY3S7OhDmBtnzX95FhtZZDecSTDm6aajFymyve6S5DN4ZHGezdQ=="; + url = "https://registry.npmjs.org/vfile/-/vfile-4.2.0.tgz"; + sha512 = "a/alcwCvtuc8OX92rqqo7PflxiCgXRFjdyoGVuYV+qbgCb0GgZJRvIgCD4+U/Kl1yhaRsaTwksF88xbPyGsgpw=="; }; }; "vfile-find-down-1.0.0" = { @@ -47966,13 +47822,13 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; - "vscode-css-languageservice-4.3.0" = { + "vscode-css-languageservice-4.3.1" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.0.tgz"; - sha512 = "BkQAMz4oVHjr0oOAz5PdeE72txlLQK7NIwzmclfr+b6fj6I8POwB+VoXvrZLTbWt9hWRgfvgiQRkh5JwrjPJ5A=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.1.tgz"; + sha512 = "Vdz2cyoTP2tLWikhFdouK8dAQ3gVhLPxsFkIscM30Quh6rd/YejTeZEYC/W+b0iKumHYebDeo1GUFbf0ptySRw=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -47993,13 +47849,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.7.0" = { + "vscode-json-languageservice-3.8.0" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.7.0.tgz"; - sha512 = "nGLqcBhTjdfkl8Dz9sYGK/ZCTjscYFoIjYw+qqkWB+vyNfM0k/AyIoT73DQvB/PArteCKjEVfQUF72GRZEDSbQ=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.0.tgz"; + sha512 = "sYz5JElJMIlPoqhrRfG3VKnDjnPinLdblIiEVsJgTz1kj2hWD2q5BSbo+evH/5/jKDXDLfA8kb0lHC4vd5g5zg=="; }; }; "vscode-jsonrpc-3.6.0" = { @@ -48425,22 +48281,13 @@ let sha1 = "340a717bde765726fa0aa07d721e0147a551df0c"; }; }; - "watchpack-1.6.1" = { - name = "watchpack"; - packageName = "watchpack"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz"; - sha512 = "+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA=="; - }; - }; - "watchpack-1.7.2" = { + "watchpack-1.7.4" = { name = "watchpack"; packageName = "watchpack"; - version = "1.7.2"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz"; - sha512 = "ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g=="; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz"; + sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg=="; }; }; "watchpack-chokidar2-2.0.0" = { @@ -48560,6 +48407,15 @@ let sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; + "webpack-4.44.1" = { + name = "webpack"; + packageName = "webpack"; + version = "4.44.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz"; + sha512 = "4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ=="; + }; + }; "webpack-cli-3.3.12" = { name = "webpack-cli"; packageName = "webpack-cli"; @@ -48686,13 +48542,13 @@ let sha512 = "9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="; }; }; - "whatwg-fetch-3.2.0" = { + "whatwg-fetch-3.3.1" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "3.2.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.2.0.tgz"; - sha512 = "SdGPoQMMnzVYThUbSrEvqTlkvC1Ux27NehaJ/GUHBfNrh5Mjg+1/uRyFMwVnxO2MrikMWvWAqUGgQOfVU4hT7w=="; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.3.1.tgz"; + sha512 = "faXTmGDcLuEPBpJwb5LQfyxvubKiE+RlbmmweFGKjvIPFj4uHTTfdtTIkdTRhC6OSH9S9eyYbx8kZ0UEaQqYTA=="; }; }; "whatwg-mimetype-2.3.0" = { @@ -49343,15 +49199,6 @@ let sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; - "ws-7.2.3" = { - name = "ws"; - packageName = "ws"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz"; - sha512 = "HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ=="; - }; - }; "ws-7.3.1" = { name = "ws"; packageName = "ws"; @@ -49713,15 +49560,6 @@ let sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; }; }; - "xregexp-4.3.0" = { - name = "xregexp"; - packageName = "xregexp"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xregexp/-/xregexp-4.3.0.tgz"; - sha512 = "7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g=="; - }; - }; "xsalsa20-1.1.0" = { name = "xsalsa20"; packageName = "xsalsa20"; @@ -49740,13 +49578,13 @@ let sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; }; }; - "xss-1.0.7" = { + "xss-1.0.8" = { name = "xss"; packageName = "xss"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.7.tgz"; - sha512 = "A9v7tblGvxu8TWXQC9rlpW96a+LN1lyw6wyhpTmmGW+FwRMactchBR3ROKSi33UPCUcUHSu8s9YP6F+K3Mw//w=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.8.tgz"; + sha512 = "3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw=="; }; }; "xstream-11.12.0" = { @@ -50109,13 +49947,13 @@ let sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; }; }; - "yargs-unparser-1.6.0" = { + "yargs-unparser-1.6.1" = { name = "yargs-unparser"; packageName = "yargs-unparser"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz"; - sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="; + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.1.tgz"; + sha512 = "qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA=="; }; }; "yarn-1.22.0" = { @@ -50331,17 +50169,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "10.0.4"; + version = "10.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-10.0.4.tgz"; - sha512 = "hmr1fXT8+6wOoh7abIg154wdP9QCMPHMShWPEYHks6ARmlRfX5k+BykQMzgI8H6tMNLoR+DAlO5+pPouJEyilQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.0.5.tgz"; + sha512 = "Qsa90IGPApJS9HL6Ih7Z8S8mIdriWYEintsT9cfI0WMVYyjvSNZQBf1SvnNU3IEboV4RFnpfXJNmQz1Q4KsRFQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1000.4" - sources."@angular-devkit/core-10.0.4" - sources."@angular-devkit/schematics-10.0.4" - sources."@schematics/angular-10.0.4" - sources."@schematics/update-0.1000.4" + sources."@angular-devkit/architect-0.1000.5" + sources."@angular-devkit/core-10.0.5" + sources."@angular-devkit/schematics-10.0.5" + sources."@schematics/angular-10.0.5" + sources."@schematics/update-0.1000.5" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" @@ -50435,7 +50273,7 @@ in sources."glob-7.1.6" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.1" @@ -50466,10 +50304,10 @@ in sources."ip-1.1.5" sources."is-callable-1.2.0" sources."is-date-object-1.0.2" - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" @@ -50550,7 +50388,7 @@ in sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."open-7.0.4" sources."ora-4.0.4" sources."os-homedir-1.0.2" @@ -51000,7 +50838,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.10.0" + sources."uglify-js-3.10.1" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -51046,7 +50884,7 @@ in sha512 = "H/i+fpbf/W9c446Ud+bDSeoUv5pW03orTm3hwVs9TtCt6332He8PK/CHydFnY/uvMKAmWPG5m2DruWIe7f1XMg=="; }; dependencies = [ - sources."abab-2.0.3" + sources."abab-2.0.4" sources."acorn-6.4.1" sources."acorn-globals-4.3.4" sources."acorn-walk-6.2.0" @@ -51101,7 +50939,7 @@ in sources."getpass-0.1.7" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."html-encoding-sniffer-1.0.2" sources."http-signature-1.2.0" @@ -51149,7 +50987,7 @@ in sources."request-promise-native-1.0.9" sources."restore-cursor-2.0.0" sources."run-async-2.4.1" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."saxes-3.1.11" @@ -51238,7 +51076,7 @@ in sources."@types/anymatch-1.3.1" sources."@types/color-name-1.1.1" sources."@types/json5-0.0.29" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -51252,7 +51090,7 @@ in sources."source-map-0.6.1" ]; }) - sources."@types/webpack-sources-1.4.0" + sources."@types/webpack-sources-1.4.2" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -51276,7 +51114,7 @@ in sources."acorn-6.4.1" sources."ajv-6.12.0" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.1" + sources."ajv-keywords-3.5.2" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -51324,7 +51162,7 @@ in sources."bn.js-4.11.9" ]; }) - (sources."browserify-sign-4.2.0" // { + (sources."browserify-sign-4.2.1" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -51404,7 +51242,7 @@ in sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cosmiconfig-6.0.0" - (sources."create-ecdh-4.0.3" // { + (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -51651,7 +51489,7 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."ora-4.0.4" sources."os-browserify-0.3.0" sources."os-name-3.1.0" @@ -51664,7 +51502,7 @@ in sources."parallel-transform-1.2.0" sources."parent-module-1.0.1" sources."parse-asn1-5.1.5" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" @@ -51867,7 +51705,11 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" - sources."watchpack-1.7.2" + (sources."watchpack-1.7.4" // { + dependencies = [ + sources."chokidar-3.4.1" + ]; + }) (sources."watchpack-chokidar2-2.0.0" // { dependencies = [ sources."anymatch-2.0.0" @@ -51928,14 +51770,10 @@ in }; dependencies = [ sources."@akryum/winattr-3.0.0" - (sources."@apollo/federation-0.17.0" // { - dependencies = [ - sources."apollo-graphql-0.4.5" - ]; - }) + sources."@apollo/federation-0.19.0" (sources."@apollo/protobufjs-1.0.4" // { dependencies = [ - sources."@types/node-10.17.27" + sources."@types/node-10.17.28" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -51945,9 +51783,9 @@ in sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.26" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.10.5" - sources."@babel/core-7.10.5" - sources."@babel/generator-7.10.5" + sources."@babel/compat-data-7.11.0" + sources."@babel/core-7.11.1" + sources."@babel/generator-7.11.0" 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" @@ -51958,37 +51796,42 @@ in 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.10.5" + sources."@babel/helper-member-expression-to-functions-7.11.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.10.5" + sources."@babel/helper-module-transforms-7.11.0" 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.10.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.10.5" + sources."@babel/parser-7.11.1" 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" + sources."@babel/plugin-proposal-export-namespace-from-7.10.4" sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" sources."@babel/plugin-proposal-numeric-separator-7.10.4" - sources."@babel/plugin-proposal-object-rest-spread-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.11.0" sources."@babel/plugin-proposal-private-methods-7.10.4" sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.10.4" 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.10.4" 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" @@ -51999,7 +51842,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.10.4" sources."@babel/plugin-transform-async-to-generator-7.10.4" sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.10.5" + sources."@babel/plugin-transform-block-scoping-7.11.1" sources."@babel/plugin-transform-classes-7.10.4" sources."@babel/plugin-transform-computed-properties-7.10.4" sources."@babel/plugin-transform-destructuring-7.10.4" @@ -52023,14 +51866,14 @@ in sources."@babel/plugin-transform-regenerator-7.10.4" sources."@babel/plugin-transform-reserved-words-7.10.4" sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.10.4" + sources."@babel/plugin-transform-spread-7.11.0" sources."@babel/plugin-transform-sticky-regex-7.10.4" sources."@babel/plugin-transform-template-literals-7.10.5" sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-typescript-7.10.5" + 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.10.4" + sources."@babel/preset-env-7.11.0" sources."@babel/preset-flow-7.10.4" sources."@babel/preset-modules-0.1.3" sources."@babel/preset-typescript-7.10.4" @@ -52040,10 +51883,10 @@ in sources."pify-4.0.1" ]; }) - sources."@babel/runtime-7.10.5" + sources."@babel/runtime-7.11.1" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.10.5" - sources."@babel/types-7.10.5" + sources."@babel/traverse-7.11.0" + sources."@babel/types-7.11.0" sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" @@ -52070,8 +51913,7 @@ in }) (sources."@oclif/command-1.7.0" // { dependencies = [ - sources."@oclif/plugin-help-3.1.0" - sources."strip-ansi-5.2.0" + sources."@oclif/plugin-help-3.2.0" ]; }) (sources."@oclif/config-1.16.0" // { @@ -52086,11 +51928,8 @@ in sources."clean-stack-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."emoji-regex-8.0.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" sources."wrap-ansi-7.0.0" ]; }) @@ -52099,7 +51938,17 @@ in sources."@oclif/plugin-autocomplete-0.2.0" (sources."@oclif/plugin-help-2.2.3" // { dependencies = [ + sources."ansi-regex-3.0.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" sources."strip-ansi-5.2.0" + (sources."widest-line-2.0.1" // { + dependencies = [ + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) ]; }) (sources."@oclif/plugin-not-found-1.2.4" // { @@ -52137,8 +51986,8 @@ in sources."@types/connect-3.4.33" sources."@types/content-disposition-0.5.3" sources."@types/cookies-0.7.4" - sources."@types/cors-2.8.6" - sources."@types/express-4.17.4" + sources."@types/cors-2.8.7" + sources."@types/express-4.17.7" sources."@types/express-serve-static-core-4.17.9" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" @@ -52150,30 +51999,30 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" ]; }) sources."@types/normalize-package-data-2.4.0" - sources."@types/qs-6.9.3" + sources."@types/qs-6.9.4" sources."@types/range-parser-1.2.3" - sources."@types/serve-static-1.13.4" + sources."@types/serve-static-1.13.5" sources."@types/ws-7.2.6" sources."@types/zen-observable-0.8.0" - (sources."@vue/cli-shared-utils-4.4.6" // { + (sources."@vue/cli-shared-utils-4.5.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@vue/cli-ui-4.4.6" // { + (sources."@vue/cli-ui-4.5.0" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.4.6" - sources."@vue/cli-ui-addon-widgets-4.4.6" + sources."@vue/cli-ui-addon-webpack-4.5.0" + sources."@vue/cli-ui-addon-widgets-4.5.0" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -52183,6 +52032,7 @@ in (sources."ansi-align-2.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -52216,8 +52066,9 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."apollo-2.30.1" // { + (sources."apollo-2.30.2" // { dependencies = [ + sources."graphql-tag-2.10.4" sources."strip-ansi-5.2.0" ]; }) @@ -52225,38 +52076,35 @@ in sources."apollo-cache-control-0.11.1" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.37.7" // { + (sources."apollo-codegen-core-0.37.8" // { dependencies = [ - sources."@babel/generator-7.10.4" sources."@babel/types-7.10.4" sources."recast-0.19.1" sources."source-map-0.6.1" ]; }) - (sources."apollo-codegen-flow-0.35.7" // { + (sources."apollo-codegen-flow-0.35.8" // { dependencies = [ - sources."@babel/generator-7.10.4" sources."@babel/types-7.10.4" ]; }) - sources."apollo-codegen-scala-0.36.7" - sources."apollo-codegen-swift-0.37.7" - (sources."apollo-codegen-typescript-0.37.7" // { + sources."apollo-codegen-scala-0.36.8" + sources."apollo-codegen-swift-0.37.8" + (sources."apollo-codegen-typescript-0.37.8" // { dependencies = [ - sources."@babel/generator-7.10.4" sources."@babel/types-7.10.4" ]; }) sources."apollo-datasource-0.7.2" (sources."apollo-engine-reporting-2.3.0" // { dependencies = [ - sources."uuid-8.2.0" + sources."uuid-8.3.0" ]; }) sources."apollo-engine-reporting-protobuf-0.5.2" sources."apollo-env-0.6.5" sources."apollo-graphql-0.5.0" - sources."apollo-language-server-1.23.2" + sources."apollo-language-server-1.23.3" sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -52266,10 +52114,10 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" sources."apollo-server-caching-0.5.2" - sources."apollo-server-core-2.16.0" + sources."apollo-server-core-2.16.1" sources."apollo-server-env-2.4.5" sources."apollo-server-errors-2.4.2" - sources."apollo-server-express-2.16.0" + sources."apollo-server-express-2.16.1" sources."apollo-server-plugin-base-0.9.1" sources."apollo-server-types-0.5.1" sources."apollo-tracing-0.11.1" @@ -52336,26 +52184,19 @@ in sources."string-width-3.1.0" ]; }) - sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."camelcase-5.3.1" sources."chalk-3.0.0" sources."cli-boxes-2.2.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."emoji-regex-8.0.0" + sources."emoji-regex-7.0.3" sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-3.0.0" - (sources."string-width-4.2.0" // { - dependencies = [ - sources."strip-ansi-6.0.0" - ]; - }) + sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-5.2.0" sources."supports-color-7.1.0" sources."term-size-2.2.0" sources."type-fest-0.8.1" - sources."widest-line-3.1.0" ]; }) sources."brace-expansion-1.1.11" @@ -52387,7 +52228,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001105" + sources."caniuse-lite-1.0.30001111" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -52436,13 +52277,7 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - (sources."cli-progress-3.8.2" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - ]; - }) + sources."cli-progress-3.8.2" sources."cli-spinners-2.4.0" (sources."cli-truncate-0.2.1" // { dependencies = [ @@ -52455,29 +52290,17 @@ in (sources."cli-ux-5.4.9" // { dependencies = [ sources."ansi-escapes-4.3.1" - sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."chalk-3.0.0" sources."clean-stack-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."emoji-regex-8.0.0" sources."escape-string-regexp-4.0.0" sources."extract-stack-2.0.0" sources."fs-extra-9.0.1" sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-3.0.0" sources."is-wsl-2.2.0" - (sources."string-width-4.2.0" // { - dependencies = [ - sources."strip-ansi-6.0.0" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) + sources."strip-ansi-5.2.0" sources."supports-color-7.1.0" sources."tslib-2.0.0" sources."type-fest-0.11.0" @@ -52613,9 +52436,9 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.504" + sources."electron-to-chromium-1.3.520" sources."elegant-spinner-1.0.1" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.0.3" @@ -52701,7 +52524,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.129.0" + sources."flow-parser-0.130.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -52787,7 +52610,6 @@ in ]; }) sources."graceful-fs-4.2.4" - sources."graceful-readlink-1.0.1" sources."graphql-14.7.0" (sources."graphql-anywhere-4.2.7" // { dependencies = [ @@ -52796,13 +52618,13 @@ in }) sources."graphql-extensions-0.12.4" sources."graphql-subscriptions-1.1.0" - sources."graphql-tag-2.10.4" + sources."graphql-tag-2.11.0" sources."graphql-tools-4.0.8" sources."graphql-type-json-0.3.2" sources."graphql-upload-8.1.0" sources."growly-1.3.0" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ @@ -52867,14 +52689,11 @@ in sources."cli-cursor-3.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."emoji-regex-8.0.0" sources."figures-3.2.0" sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-3.0.0" sources."mimic-fn-2.1.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."restore-cursor-3.1.0" - sources."string-width-4.2.0" sources."supports-color-7.1.0" sources."type-fest-0.11.0" ]; @@ -52893,10 +52712,10 @@ in sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" sources."is-natural-number-4.0.1" @@ -52911,7 +52730,7 @@ in sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-redirect-1.0.0" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-retry-allowed-1.2.0" sources."is-ssh-1.3.1" sources."is-stream-1.1.0" @@ -53011,6 +52830,7 @@ in (sources."log-update-2.3.0" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."wrap-ansi-3.0.1" @@ -53145,7 +52965,7 @@ in sources."package-json-4.0.1" sources."param-case-3.0.3" sources."parse-git-config-2.0.3" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."parse-passwd-1.0.0" sources."parse-path-4.0.1" sources."parse-url-5.0.1" @@ -53179,7 +52999,7 @@ in sources."pinkie-promise-2.0.1" sources."pirates-4.0.1" sources."pkg-dir-3.0.0" - (sources."portfinder-1.0.27" // { + (sources."portfinder-1.0.28" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -53279,17 +53099,13 @@ in sources."rss-parser-3.9.0" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."sec-1.0.0" - (sources."seek-bzip-1.0.5" // { - dependencies = [ - sources."commander-2.8.1" - ]; - }) + sources."seek-bzip-1.0.6" sources."select-1.1.2" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -53392,11 +53208,7 @@ in sources."steno-0.4.4" sources."streamsearch-0.1.2" sources."strict-uri-encode-1.1.0" - (sources."string-width-3.1.0" // { - dependencies = [ - sources."strip-ansi-5.2.0" - ]; - }) + sources."string-width-4.2.0" sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.1.1" // { @@ -53429,7 +53241,11 @@ in sources."symbol-observable-1.2.0" (sources."table-5.4.6" // { dependencies = [ + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."slice-ansi-2.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."tar-stream-1.6.2" @@ -53441,7 +53257,7 @@ in sources."is-stream-2.0.0" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" @@ -53530,8 +53346,10 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."boxen-1.3.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" + sources."widest-line-2.0.1" ]; }) sources."upper-case-2.0.1" @@ -53565,7 +53383,7 @@ in sources."jsonfile-4.0.0" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" @@ -53584,16 +53402,11 @@ in sources."watch-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" - (sources."widest-line-2.0.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."widest-line-3.1.0" (sources."wrap-ansi-4.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -53604,7 +53417,7 @@ in sources."xdg-basedir-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - sources."xss-1.0.7" + sources."xss-1.0.8" sources."xtend-4.0.2" sources."yallist-2.1.2" (sources."yaml-front-matter-3.4.1" // { @@ -53753,12 +53566,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/generator-7.10.5" + sources."@babel/generator-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.10.5" + sources."@babel/parser-7.11.1" sources."@babel/template-7.10.4" - sources."@babel/types-7.10.5" + sources."@babel/types-7.11.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -53838,32 +53651,32 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.10.5" // { + (sources."@babel/core-7.11.1" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.10.5" // { + (sources."@babel/generator-7.11.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.10.5" + sources."@babel/helper-member-expression-to-functions-7.11.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.10.5" + sources."@babel/helper-module-transforms-7.11.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.10.5" + sources."@babel/parser-7.11.1" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.10.5" - sources."@babel/types-7.10.5" + sources."@babel/traverse-7.11.0" + sources."@babel/types-7.11.0" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -53964,7 +53777,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -53998,7 +53811,7 @@ in sha512 = "IS1Ix7qyRq7GTMXqhHUF44yY89i/1Ucn5KFLimEfDpwU1f3GvbV9VnDpqpG6kedJsl2LigEthSnoVlzaOwgt0g=="; }; dependencies = [ - sources."abab-2.0.3" + sources."abab-2.0.4" sources."acorn-5.7.4" (sources."acorn-globals-4.3.4" // { dependencies = [ @@ -54050,7 +53863,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."html-encoding-sniffer-1.0.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" @@ -54280,14 +54093,14 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "16.5.1"; + version = "16.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.5.1.tgz"; - sha512 = "EQX0h59Pp+0GtSRb5rL6OTfrttlzv+uyaUVlK6GX3w11SQ0jKPKyjC/54RhPR2ib2KmfcELM06e8FxcI5XNU2A=="; + url = "https://registry.npmjs.org/browserify/-/browserify-16.5.2.tgz"; + sha512 = "TkOR1cQGdmXU9zW4YukWzWVSJwrxmNdADFbqbE3HFgQWe5wqZmOawqZ7J/8MPCwk/W8yY7Y0h+7mOtcZxLP23g=="; }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-7.3.1" + sources."acorn-7.4.0" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" (sources."asn1.js-4.10.1" // { @@ -54307,11 +54120,7 @@ in sources."brace-expansion-1.1.11" sources."brorand-1.1.0" sources."browser-pack-6.1.0" - (sources."browser-resolve-1.11.3" // { - dependencies = [ - sources."resolve-1.1.7" - ]; - }) + sources."browser-resolve-2.0.0" sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" @@ -54320,7 +54129,7 @@ in sources."bn.js-4.11.9" ]; }) - (sources."browserify-sign-4.2.0" // { + (sources."browserify-sign-4.2.1" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -54339,7 +54148,7 @@ in sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" sources."core-util-is-1.0.2" - (sources."create-ecdh-4.0.3" // { + (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -54404,7 +54213,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-classic-0.5.3" - sources."module-deps-6.2.2" + sources."module-deps-6.2.3" sources."object-assign-4.1.1" sources."once-1.4.0" sources."os-browserify-0.3.0" @@ -54507,7 +54316,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.14" + sources."@types/node-13.13.15" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.3" @@ -54630,7 +54439,7 @@ in sources."got-1.2.2" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-ansi-1.0.3" sources."hat-0.0.3" sources."hosted-git-info-2.8.8" @@ -55186,7 +54995,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.12.1" - sources."fp-ts-2.7.1" + sources."fp-ts-2.8.1" sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" @@ -55300,15 +55109,15 @@ in sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/json-schema-7.0.5" - sources."@typescript-eslint/experimental-utils-3.7.0" - sources."@typescript-eslint/parser-3.7.0" - sources."@typescript-eslint/types-3.7.0" - sources."@typescript-eslint/typescript-estree-3.7.0" - sources."@typescript-eslint/visitor-keys-3.7.0" - sources."acorn-7.3.1" + sources."@typescript-eslint/experimental-utils-3.8.0" + sources."@typescript-eslint/parser-3.8.0" + sources."@typescript-eslint/types-3.8.0" + sources."@typescript-eslint/typescript-estree-3.8.0" + sources."@typescript-eslint/visitor-keys-3.8.0" + sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" sources."ajv-6.12.3" - sources."ajv-keywords-3.5.1" + sources."ajv-keywords-3.5.2" (sources."ansi-align-2.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -55367,7 +55176,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001105" + sources."caniuse-lite-1.0.30001111" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -55464,7 +55273,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.504" + sources."electron-to-chromium-1.3.520" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -55710,7 +55519,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - sources."js-base64-2.6.3" + sources."js-base64-2.6.4" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."json-parse-better-errors-1.0.2" @@ -55821,7 +55630,7 @@ in ]; }) sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."optionator-0.8.3" (sources."os-locale-3.1.0" // { dependencies = [ @@ -55980,7 +55789,7 @@ in sources."ret-0.1.15" sources."rimraf-2.6.3" sources."run-async-2.4.1" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -56294,10 +56103,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.7.13"; + version = "0.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.13.tgz"; - sha512 = "bt3lTGwEKy5wkBBeHu715hIZUsCaCdKk53qmnIWFXBym6I7SOSdlGDVni/M0be+3ereup9CkTDZVvEoMq1eksg=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.14.tgz"; + sha512 = "nTS7mcGTbo+5bLdhod4GOVTODb/wDdnKgVNLpU75q//kwQuf0psUPp3t/XFcYXxzbskMwAcaEXyC27cGek7+Cw=="; }; buildInputs = globalBuildInputs; meta = { @@ -56371,29 +56180,29 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.10.5" - sources."@babel/generator-7.10.5" + sources."@babel/core-7.11.1" + sources."@babel/generator-7.11.0" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.10.5" + sources."@babel/helper-member-expression-to-functions-7.11.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.10.5" + sources."@babel/helper-module-transforms-7.11.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.10.5" + sources."@babel/parser-7.11.1" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.10.5" - sources."@babel/types-7.10.5" + sources."@babel/traverse-7.11.0" + sources."@babel/types-7.11.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -56418,7 +56227,7 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" sources."atob-2.1.2" - (sources."autoprefixer-9.8.5" // { + (sources."autoprefixer-9.8.6" // { dependencies = [ sources."postcss-value-parser-4.1.0" ]; @@ -56444,7 +56253,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001105" + sources."caniuse-lite-1.0.30001111" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -56504,7 +56313,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.504" + sources."electron-to-chromium-1.3.520" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -57107,7 +56916,7 @@ in sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -57124,7 +56933,7 @@ in ]; }) sources."abbrev-1.1.1" - sources."acorn-7.3.1" + sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" (sources."aggregate-error-3.0.1" // { dependencies = [ @@ -57269,7 +57078,7 @@ in ]; }) sources."css-parse-2.0.0" - sources."csstype-2.6.11" + sources."csstype-2.6.13" sources."currently-unhandled-0.4.1" sources."debug-3.2.6" sources."decamelize-1.2.0" @@ -57643,7 +57452,7 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."optionator-0.8.3" sources."os-homedir-1.0.2" (sources."os-locale-3.1.0" // { @@ -57754,7 +57563,7 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."path-exists-4.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -57800,7 +57609,7 @@ in sources."rimraf-2.6.3" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."s.color-0.0.13" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" @@ -58022,7 +57831,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.1.1" sources."validate-npm-package-license-3.0.4" - sources."vfile-4.1.1" + sources."vfile-4.2.0" sources."vfile-location-2.0.6" sources."vfile-message-2.0.4" (sources."vfile-reporter-6.0.1" // { @@ -58038,7 +57847,7 @@ in sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" sources."vls-0.2.0" - (sources."vscode-css-languageservice-4.3.0" // { + (sources."vscode-css-languageservice-4.3.1" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-uri-2.1.2" @@ -58156,7 +57965,7 @@ in sources."prettier-1.19.1" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.7.0" + sources."vscode-json-languageservice-3.8.0" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -58339,47 +58148,42 @@ in cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; - version = "9.0.0"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-9.0.0.tgz"; - sha512 = "zWEPo9uGj9KNcEhU2Lpo3r4HYK21tL+at496N2LLnuCWuWVndv6QWed8+EYl/08rrcNshrEtfzXj9Ux6vQm2PQ=="; + url = "https://registry.npmjs.org/cordova/-/cordova-10.0.0.tgz"; + sha512 = "00wMcj3X9ILhKtvRG2iEwO2qly4B+vgXFhH4WhVepWg2UVbD1opl1q9jSZ+j2AaI/vsBWW8e6M2M5FAHasnuWw=="; }; dependencies = [ - sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.3" - sources."@types/glob-7.1.3" - sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.24" + sources."@netflix/nerror-1.1.3" + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/color-name-1.1.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.12.3" sources."ansi-0.3.1" - sources."ansi-align-2.0.0" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."string-width-3.1.0" + ]; + }) sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" - 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."ansi-styles-4.2.1" sources."array-find-index-1.0.2" sources."array-flatten-1.1.1" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" + sources."array-union-2.1.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."assign-symbols-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."atob-2.1.2" + sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.48" @@ -58388,90 +58192,79 @@ in sources."bytes-3.1.0" ]; }) - sources."boxen-1.3.0" - sources."bplist-parser-0.1.1" - sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { + (sources."boxen-4.2.0" // { dependencies = [ - sources."extend-shallow-2.0.1" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) + sources."bplist-parser-0.2.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."builtins-1.0.3" sources."bytes-3.0.0" - sources."cache-base-1.0.1" - sources."call-me-maybe-1.0.1" - sources."callsites-3.1.0" - sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.1" - sources."caseless-0.12.0" - sources."chalk-2.4.2" - sources."chardet-0.7.0" - sources."ci-info-1.6.0" - (sources."class-utils-0.3.6" // { + (sources."cacheable-request-6.1.0" // { 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."lowercase-keys-2.0.0" ]; }) - sources."cli-boxes-1.0.0" + sources."callsites-3.1.0" + sources."camelcase-5.3.1" + sources."caseless-0.12.0" + sources."chalk-3.0.0" + sources."chardet-0.7.0" + sources."ci-info-2.0.0" + sources."cli-boxes-2.2.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."clone-response-1.0.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."component-emitter-1.3.0" sources."compressible-2.0.18" sources."compression-1.7.4" sources."concat-map-0.0.1" - sources."conf-1.4.0" - sources."configstore-4.0.0" + (sources."conf-1.4.0" // { + dependencies = [ + sources."dot-prop-4.2.0" + sources."is-obj-1.0.1" + sources."make-dir-1.3.0" + sources."pify-3.0.0" + sources."write-file-atomic-2.4.3" + ]; + }) + sources."configstore-5.0.1" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."copy-descriptor-0.1.1" - sources."cordova-app-hello-world-4.0.0" - sources."cordova-common-3.2.1" - (sources."cordova-create-2.0.0" // { + sources."cordova-app-hello-world-5.0.0" + sources."cordova-common-4.0.2" + sources."cordova-create-3.0.0" + (sources."cordova-fetch-3.0.0" // { dependencies = [ - sources."fs-extra-7.0.1" + sources."pify-5.0.0" ]; }) - (sources."cordova-fetch-2.0.1" // { + (sources."cordova-lib-10.0.0" // { dependencies = [ - sources."fs-extra-7.0.1" - sources."pify-4.0.1" + sources."pify-5.0.0" ]; }) - (sources."cordova-lib-9.0.1" // { - dependencies = [ - sources."fs-extra-7.0.1" - ]; - }) - sources."cordova-serve-3.0.0" + sources."cordova-serve-4.0.0" sources."core-util-is-1.0.2" - sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.5" - sources."crypto-random-string-1.0.0" + sources."cross-spawn-7.0.3" + sources."crypto-random-string-2.0.0" sources."currently-unhandled-0.4.1" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" + sources."decompress-response-3.3.0" sources."dedent-0.7.0" sources."deep-extend-0.6.0" - sources."define-property-2.0.2" + sources."defer-to-connect-1.1.3" sources."delayed-stream-1.0.0" (sources."dep-graph-1.1.0" // { dependencies = [ @@ -58480,233 +58273,195 @@ in }) sources."depd-1.1.2" sources."destroy-1.0.4" - sources."detect-indent-5.0.0" - sources."dir-glob-2.2.2" - sources."dot-prop-4.2.0" + sources."detect-indent-6.0.0" + sources."detect-newline-3.1.0" + sources."dir-glob-3.0.1" + sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."editor-1.0.0" sources."ee-first-1.1.1" sources."elementtree-0.1.7" + sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."endent-1.4.1" sources."env-paths-1.0.0" + sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."execa-1.0.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-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."execa-4.0.3" sources."express-4.17.1" 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" // { + (sources."external-editor-3.1.0" // { dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" + sources."tmp-0.0.33" ]; }) - sources."extsprintf-1.3.0" + sources."extsprintf-1.4.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-2.2.7" + sources."fast-glob-3.2.4" sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.8.0" sources."figures-2.0.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."find-up-2.1.0" - sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" - sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."fs-extra-8.1.0" + sources."fs-extra-9.0.1" sources."fs.realpath-1.0.0" - sources."get-stream-4.1.0" - sources."get-value-2.0.6" + sources."get-stream-5.1.0" sources."getpass-0.1.7" 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-dirs-0.1.1" - (sources."globby-9.2.0" // { - dependencies = [ - sources."pify-4.0.1" - ]; - }) - (sources."got-6.7.1" // { + sources."glob-parent-5.1.1" + sources."global-dirs-2.0.1" + sources."globby-11.0.1" + (sources."got-9.6.0" // { dependencies = [ - sources."get-stream-3.0.0" + sources."get-stream-4.1.0" ]; }) sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" - sources."has-flag-3.0.0" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."hosted-git-info-2.8.8" + sources."har-validator-5.1.5" + sources."has-flag-4.0.0" + sources."has-yarn-2.1.0" + sources."hosted-git-info-3.0.5" + sources."http-cache-semantics-4.1.0" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" ]; }) sources."http-signature-1.2.0" + sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" - sources."ignore-4.0.6" + sources."ignore-5.1.8" sources."import-fresh-3.2.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."indent-string-3.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."init-package-json-1.10.3" + (sources."init-package-json-1.10.3" // { + dependencies = [ + sources."hosted-git-info-2.8.8" + sources."npm-package-arg-6.1.1" + sources."semver-5.7.1" + ]; + }) (sources."inquirer-6.5.2" // { dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" sources."mute-stream-0.0.7" + sources."supports-color-5.5.0" + ]; + }) + (sources."insight-0.10.3" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" ]; }) - sources."insight-0.10.3" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" - sources."is-accessor-descriptor-1.0.0" - sources."is-buffer-1.1.6" - sources."is-ci-1.2.1" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" + sources."is-ci-2.0.0" + sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-obj-1.0.1" - sources."is-path-inside-1.0.1" - sources."is-plain-object-2.0.4" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" + sources."is-installed-globally-0.3.2" + sources."is-npm-4.0.0" + sources."is-number-7.0.0" + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.2" + sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" - sources."is-url-1.2.4" - sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" - sources."isarray-1.0.0" + sources."is-wsl-2.2.0" + sources."is-yarn-global-0.3.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" + sources."isobject-4.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" + sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" - sources."jsprim-1.4.1" - sources."kind-of-6.0.3" - sources."latest-version-3.1.0" + sources."jsonfile-6.0.1" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."extsprintf-1.3.0" + ]; + }) + sources."keyv-3.1.0" + sources."latest-version-5.1.0" sources."locate-path-2.0.0" sources."lodash-4.17.19" sources."lodash.debounce-4.0.8" sources."loud-rejection-2.2.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" + sources."lru-cache-6.0.0" sources."macos-release-2.4.1" - sources."make-dir-1.3.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."md5-file-4.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."md5-file-5.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-3.1.10" + sources."micromatch-4.0.2" sources."mime-1.6.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."nice-try-1.0.5" sources."nopt-4.0.3" - sources."normalize-package-data-2.5.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-6.1.1" - sources."npm-run-path-2.0.2" - sources."oauth-sign-0.9.0" - (sources."object-copy-0.1.0" // { + (sources."normalize-package-data-2.5.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."hosted-git-info-2.8.8" + sources."semver-5.7.1" ]; }) - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" + sources."normalize-url-4.5.0" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-package-arg-8.0.1" + sources."npm-run-path-4.0.1" + sources."oauth-sign-0.9.0" sources."objectorarray-1.0.4" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."onetime-2.0.1" - sources."opn-5.5.0" + sources."onetime-5.1.1" + sources."open-7.1.0" sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" + sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" (sources."p-limit-1.3.0" // { dependencies = [ @@ -58715,30 +58470,32 @@ in }) sources."p-locate-2.0.0" sources."p-try-2.2.0" - sources."package-json-4.0.1" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."parent-module-1.0.1" sources."parseurl-1.3.3" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" - sources."path-type-3.0.0" + sources."path-type-4.0.0" sources."performance-now-2.1.0" - sources."pify-3.0.0" + sources."picomatch-2.2.2" + sources."pify-4.0.1" sources."pkg-up-2.0.0" sources."plist-3.0.1" - sources."posix-character-classes-0.1.1" - sources."prepend-http-1.0.4" + sources."prepend-http-2.0.0" sources."promzard-0.3.0" sources."proxy-addr-2.0.6" - sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" + sources."pupa-2.0.1" sources."q-1.5.1" sources."qs-6.7.0" sources."range-parser-1.2.1" @@ -58749,17 +58506,10 @@ in }) sources."rc-1.2.8" sources."read-1.0.7" - (sources."read-chunk-3.2.0" // { - dependencies = [ - sources."pify-4.0.1" - ]; - }) + sources."read-chunk-3.2.0" sources."read-package-json-2.1.1" - sources."regex-not-1.0.2" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" + sources."registry-auth-token-4.2.0" + sources."registry-url-5.1.0" (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" @@ -58768,150 +58518,81 @@ in }) sources."resolve-1.17.0" sources."resolve-from-4.0.0" - sources."resolve-url-0.2.1" - sources."restore-cursor-2.0.0" - sources."ret-0.1.15" + sources."responselike-1.0.2" + (sources."restore-cursor-2.0.0" // { + dependencies = [ + sources."mimic-fn-1.2.0" + sources."onetime-2.0.1" + ]; + }) + sources."reusify-1.0.4" + sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."rxjs-6.6.0" + sources."run-parallel-1.1.9" + sources."rxjs-6.6.2" sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.1.4" - sources."semver-5.7.1" - sources."semver-diff-2.1.0" - (sources."send-0.17.1" // { + sources."semver-7.3.2" + (sources."semver-diff-3.1.1" // { dependencies = [ - sources."ms-2.1.1" + sources."semver-6.3.0" ]; }) - sources."serve-static-1.14.1" - (sources."set-value-2.0.1" // { + (sources."send-0.17.1" // { dependencies = [ - sources."extend-shallow-2.0.1" + sources."ms-2.1.1" ]; }) + sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."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."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."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-url-0.4.0" + sources."slash-3.0.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.5" - 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."statuses-1.5.0" (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" ]; }) + sources."stringify-package-1.0.1" (sources."strip-ansi-5.2.0" // { dependencies = [ sources."ansi-regex-4.1.0" ]; }) - sources."strip-bom-3.0.0" + sources."strip-bom-4.0.0" sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" - (sources."term-size-1.2.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.7.0" - sources."get-stream-3.0.0" - ]; - }) + sources."supports-color-7.1.0" + sources."systeminformation-4.26.10" + sources."term-size-2.2.0" sources."through-2.3.8" - sources."timed-out-4.0.1" - sources."tmp-0.0.33" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" + sources."tmp-0.2.1" + sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-3.0.1" sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."type-fest-0.8.1" sources."type-is-1.6.18" + sources."typedarray-to-buffer-3.1.5" sources."underscore-1.10.2" - sources."union-value-1.0.1" - sources."unique-string-1.0.0" - sources."universalify-0.1.2" + sources."unique-string-2.0.0" + sources."universalify-1.0.0" sources."unpipe-1.0.0" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."unzip-response-2.0.1" - (sources."update-notifier-2.5.0" // { - dependencies = [ - sources."configstore-3.1.2" - ]; - }) + sources."update-notifier-4.1.0" sources."uri-js-4.2.2" - sources."urix-0.1.0" - sources."url-parse-lax-1.0.0" - sources."use-3.1.1" + sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" sources."valid-identifier-0.0.2" @@ -58919,20 +58600,37 @@ in sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."which-1.3.1" - sources."widest-line-2.0.1" - sources."windows-release-3.3.1" - (sources."with-open-file-0.1.7" // { + sources."which-2.0.2" + (sources."widest-line-3.1.0" // { dependencies = [ - sources."pify-4.0.1" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) + (sources."windows-release-3.3.1" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."execa-1.0.0" + sources."get-stream-4.1.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."path-key-2.0.1" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" + ]; + }) + sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" - sources."xdg-basedir-3.0.0" + sources."write-file-atomic-3.0.3" + sources."xdg-basedir-4.0.0" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.31" - sources."yallist-2.1.2" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -58961,7 +58659,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.0.1" sources."ansi-styles-3.2.1" @@ -59180,7 +58878,7 @@ in sources."p-map-3.0.0" sources."p-timeout-3.2.0" sources."p-try-2.2.0" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-exists-4.0.0" @@ -59329,7 +59027,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -59539,7 +59237,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -59548,7 +59246,7 @@ in sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -59887,7 +59585,7 @@ in sources."got-6.7.1" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -60352,10 +60050,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.33.1"; + version = "6.33.2"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.33.1.tgz"; - sha512 = "g+SeRgxjkNJjyqA2fKZsCcAQFMXSnPa9RXC5zggPT6D1YwJFndYfdHNXBg93gjc2c1P89DrvqZpdfCI6r9sQrw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.33.2.tgz"; + sha512 = "zdVxNUeI3Ywj3ls8K+NcssOn4KjfJ5QdSyTsgIf9AsOlDCioGh5//qE5/c4HH0Bn14J/WETEcSW62YJKlMFN0w=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -60364,7 +60062,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.718.0" + sources."aws-sdk-2.726.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."base64-js-1.3.1" @@ -60390,7 +60088,7 @@ in sources."form-data-2.3.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."http-signature-1.2.0" sources."http-status-1.4.2" sources."ieee754-1.1.13" @@ -60508,34 +60206,34 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.10.5" - sources."@babel/generator-7.10.5" + sources."@babel/core-7.11.1" + sources."@babel/generator-7.11.0" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" sources."@babel/helper-builder-react-jsx-experimental-7.10.5" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.10.5" + sources."@babel/helper-member-expression-to-functions-7.11.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.10.5" + sources."@babel/helper-module-transforms-7.11.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.10.5" - sources."@babel/plugin-proposal-object-rest-spread-7.10.4" + sources."@babel/parser-7.11.1" + sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-syntax-jsx-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.10.4" sources."@babel/plugin-transform-parameters-7.10.5" sources."@babel/plugin-transform-react-jsx-7.10.4" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.10.5" - sources."@babel/types-7.10.5" + sources."@babel/traverse-7.11.0" + sources."@babel/types-7.11.0" sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -60543,7 +60241,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -60648,7 +60346,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" @@ -60696,7 +60394,7 @@ in sources."map-obj-4.1.0" (sources."mem-6.1.0" // { dependencies = [ - sources."mimic-fn-3.0.0" + sources."mimic-fn-3.1.0" ]; }) (sources."meow-6.1.1" // { @@ -60720,7 +60418,7 @@ in sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."p-cancelable-2.0.0" sources."p-defer-1.0.0" sources."p-event-4.2.0" @@ -60729,7 +60427,7 @@ in sources."p-locate-3.0.0" sources."p-timeout-3.2.0" sources."p-try-2.2.0" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."path-exists-3.0.0" sources."path-key-2.0.1" sources."path-parse-1.0.6" @@ -60861,10 +60559,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.5.0"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.5.0.tgz"; - sha512 = "vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz"; + sha512 = "QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -60875,7 +60573,7 @@ in ]; }) sources."@types/color-name-1.1.1" - sources."acorn-7.3.1" + sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" sources."ajv-6.12.3" sources."ansi-colors-4.1.1" @@ -61013,7 +60711,7 @@ in ]; }) sources."@types/color-name-1.1.1" - sources."acorn-7.3.1" + sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" sources."ajv-6.12.3" sources."ansi-colors-4.1.1" @@ -61044,7 +60742,7 @@ in sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.5.0" + sources."eslint-7.6.0" sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" @@ -61195,7 +60893,7 @@ in sources."getpass-0.1.7" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."hasha-2.2.0" @@ -61435,13 +61133,13 @@ in sources."npm-run-path-4.0.1" sources."num-sort-2.1.0" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."os-tmpdir-1.0.2" sources."p-finally-2.0.1" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.6" @@ -61478,7 +61176,7 @@ in sources."resolve-1.17.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."shebang-command-2.0.0" @@ -61704,7 +61402,7 @@ in ]; }) sources."is-plain-object-2.0.4" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."is-windows-1.0.2" sources."isarray-1.0.0" @@ -61921,6 +61619,37 @@ in bypassCache = true; reconstructLock = true; }; + get-graphql-schema = nodeEnv.buildNodePackage { + name = "get-graphql-schema"; + packageName = "get-graphql-schema"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-graphql-schema/-/get-graphql-schema-2.1.2.tgz"; + sha512 = "1z5Hw91VrE3GrpCZE6lE8Dy+jz4kXWesLS7rCSjwOxf5BOcIedAZeTUJRIeIzmmR+PA9CKOkPTYFRJbdgUtrxA=="; + }; + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + sources."graphql-14.7.0" + sources."has-flag-3.0.0" + sources."iterall-1.3.0" + sources."minimist-1.2.5" + sources."node-fetch-2.6.0" + sources."supports-color-5.5.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Downloads the GraphQL Schema of an GraphQL endpoint URL"; + homepage = "https://github.com/graphcool/get-graphql-schema#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; git-run = nodeEnv.buildNodePackage { name = "git-run"; packageName = "git-run"; @@ -61976,7 +61705,7 @@ in sources."git-remote-ssb-2.0.4" sources."git-ssb-web-2.8.0" sources."hashlru-2.3.0" - sources."highlight.js-9.18.1" + sources."highlight.js-9.18.3" sources."increment-buffer-1.0.1" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -61991,8 +61720,8 @@ in sources."jsonpointer-4.1.0" sources."kvgraph-0.1.0" sources."kvset-1.0.0" - sources."libsodium-0.7.6" - sources."libsodium-wrappers-0.7.6" + sources."libsodium-0.7.8" + sources."libsodium-wrappers-0.7.8" sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" @@ -62338,7 +62067,7 @@ in sources."normalize-url-4.5.0" sources."npm-run-path-4.0.1" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" (sources."ora-4.0.5" // { dependencies = [ sources."chalk-3.0.0" @@ -62350,7 +62079,7 @@ in sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."package-json-6.5.0" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."path-exists-3.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.6" @@ -62382,7 +62111,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safer-buffer-2.1.2" sources."semver-6.3.0" sources."semver-diff-3.1.1" @@ -62456,35 +62185,35 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.10.5" + sources."@babel/runtime-7.11.1" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" - sources."@graphql-tools/delegate-6.0.15" - (sources."@graphql-tools/graphql-file-loader-6.0.15" // { + sources."@graphql-tools/delegate-6.0.16" + (sources."@graphql-tools/graphql-file-loader-6.0.16" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/import-6.0.15" // { + (sources."@graphql-tools/import-6.0.16" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/json-file-loader-6.0.15" // { + (sources."@graphql-tools/json-file-loader-6.0.16" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - sources."@graphql-tools/load-6.0.15" - sources."@graphql-tools/merge-6.0.15" - sources."@graphql-tools/schema-6.0.15" - (sources."@graphql-tools/url-loader-6.0.15" // { + sources."@graphql-tools/load-6.0.16" + sources."@graphql-tools/merge-6.0.16" + sources."@graphql-tools/schema-6.0.16" + (sources."@graphql-tools/url-loader-6.0.16" // { dependencies = [ sources."cross-fetch-3.0.5" ]; }) - sources."@graphql-tools/utils-6.0.15" - sources."@graphql-tools/wrap-6.0.15" + sources."@graphql-tools/utils-6.0.16" + sources."@graphql-tools/wrap-6.0.16" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -62492,7 +62221,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.0.1" @@ -62648,7 +62377,7 @@ in sources."graphql-subscriptions-1.1.0" sources."graphql-type-json-0.2.4" sources."har-schema-2.0.0" - (sources."har-validator-5.1.3" // { + (sources."har-validator-5.1.5" // { dependencies = [ sources."ajv-6.12.3" sources."fast-deep-equal-3.1.3" @@ -62685,7 +62414,7 @@ in sources."is-boolean-object-1.0.1" sources."is-callable-1.2.0" sources."is-date-object-1.0.2" - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -62693,7 +62422,7 @@ in sources."is-map-2.0.1" sources."is-number-7.0.0" sources."is-number-object-1.0.4" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-set-2.0.1" sources."is-stream-1.1.0" sources."is-string-1.0.5" @@ -62772,8 +62501,8 @@ in sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" sources."oas-linter-3.1.3" - sources."oas-resolver-2.4.1" - sources."oas-schema-walker-1.1.4" + sources."oas-resolver-2.4.2" + sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."oauth-sign-0.9.0" sources."object-inspect-1.8.0" @@ -62781,7 +62510,7 @@ in sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."open-7.0.4" sources."openapi-to-graphql-2.1.0" (sources."ora-4.0.4" // { @@ -62814,7 +62543,7 @@ in ]; }) sources."parent-module-1.0.1" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" (sources."pascal-case-3.1.1" // { dependencies = [ sources."tslib-1.13.0" @@ -62834,7 +62563,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."rc-1.2.8" - sources."reftools-1.1.3" + sources."reftools-1.1.4" sources."regenerator-runtime-0.13.7" sources."regexp.prototype.flags-1.3.0" sources."registry-auth-token-4.2.0" @@ -62850,7 +62579,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - (sources."rxjs-6.6.0" // { + (sources."rxjs-6.6.2" // { dependencies = [ sources."tslib-1.13.0" ]; @@ -64169,7 +63898,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.10.0" + sources."uglify-js-3.10.1" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -64226,7 +63955,7 @@ in sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-4.0.0" sources."http-signature-1.2.0" sources."inflight-1.0.6" @@ -64302,7 +64031,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."opener-1.5.1" - sources."portfinder-1.0.27" + sources."portfinder-1.0.28" sources."qs-6.9.4" sources."requires-port-1.0.0" sources."secure-compare-3.0.1" @@ -64474,7 +64203,7 @@ in sha512 = "l4g7U75E+WgrgNGH774djfTyp5Aw+2jJokYe9iCunSAbi/w+nRGHqTJfwbODLwiJQTnbXkM42FxgPRA29Ce7Bg=="; }; dependencies = [ - sources."@types/jquery-3.5.0" + sources."@types/jquery-3.5.1" sources."@types/sizzle-2.3.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -64663,12 +64392,12 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."mimic-fn-2.1.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."restore-cursor-3.1.0" ]; }) sources."ip-1.1.5" - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -64746,7 +64475,7 @@ in sources."rimraf-3.0.2" sources."rsvp-3.6.2" sources."run-async-2.4.1" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -64843,24 +64572,6 @@ in bypassCache = true; reconstructLock = true; }; - ios-deploy = nodeEnv.buildNodePackage { - name = "ios-deploy"; - packageName = "ios-deploy"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.10.0.tgz"; - sha512 = "sklB6PkJkWrHDublkZJeY4z9i7hl0nS2aRVse+/idGnb4eZddMQRfPVB4YzkEoyJ4FyW1I3sdLP6/cg/Imu/sw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "launch iOS apps iOS devices from the command line (Xcode 7)"; - homepage = "https://github.com/ios-control/ios-deploy#readme"; - license = "GPLv3"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "iosevka-build-deps-../../data/fonts/iosevka" = nodeEnv.buildNodePackage { name = "iosevka-build-deps"; packageName = "iosevka-build-deps"; @@ -64899,7 +64610,7 @@ in sources."chalk-2.4.2" sources."child-process-promise-2.2.1" sources."chownr-1.1.4" - sources."cldr-5.6.0" + sources."cldr-5.7.0" sources."cli-cursor-3.1.0" sources."clipper-lib-6.4.2" sources."cliui-6.0.0" @@ -64983,7 +64694,7 @@ in sources."glob-7.1.6" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."hashish-0.0.4" @@ -65047,7 +64758,7 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-locale-1.4.0" @@ -65340,17 +65051,17 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.165"; + version = "1.0.166"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.165.tgz"; - sha512 = "vWe6i72bToKp8246rOD3iZ5PG+roAzIuGCcK8I20sYTFrakJVRteuODNq65WN7K/txi69VPQYoxHcLsaUoYziQ=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.0.166.tgz"; + sha512 = "+wZT9vcD+fIFL3E4kkSKHhaphKq6sDrrFbVoiCyZRoY9+3sGvBedzYOPEoZpiF83YbbPR+WUSM54naB5q8xOYw=="; }; dependencies = [ - sources."@cronvel/get-pixels-3.3.1" + sources."@cronvel/get-pixels-3.4.0" sources."@yarnpkg/lockfile-1.1.0" - sources."abab-2.0.3" + sources."abab-2.0.4" sources."abbrev-1.1.1" - sources."acorn-7.3.1" + sources."acorn-7.4.0" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.1" @@ -65392,6 +65103,13 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" + (sources."aws-sdk-2.726.0" // { + dependencies = [ + sources."sax-1.2.1" + sources."uuid-3.3.2" + sources."xml2js-0.4.19" + ]; + }) sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."balanced-match-1.0.0" @@ -65404,7 +65122,11 @@ in sources."base64-js-1.3.1" sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bl-4.0.2" + (sources."bl-4.0.2" // { + dependencies = [ + sources."buffer-5.6.0" + ]; + }) sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -65412,7 +65134,7 @@ in ]; }) sources."browser-process-hrtime-1.0.0" - sources."buffer-5.6.0" + sources."buffer-4.9.2" sources."cache-base-1.0.1" sources."camel-case-3.0.0" sources."camelcase-4.1.0" @@ -65528,6 +65250,7 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" + sources."events-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -65564,7 +65287,6 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fault-1.0.4" - sources."fd-slicer-1.1.0" sources."file-type-10.11.0" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { @@ -65604,7 +65326,7 @@ in sources."glob-7.1.6" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-unicode-2.0.1" @@ -65627,7 +65349,7 @@ in sources."entities-2.0.3" ]; }) - sources."http-errors-1.7.3" + sources."http-errors-1.8.0" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" @@ -65699,9 +65421,10 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."joplin-turndown-4.0.28" + sources."jmespath-0.15.0" + sources."joplin-turndown-4.0.29" sources."joplin-turndown-plugin-gfm-1.0.12" - sources."jpeg-js-0.1.2" + sources."jpeg-js-0.4.1" sources."js-tokens-4.0.0" sources."jsbn-0.1.1" sources."jsdom-15.2.1" @@ -65711,7 +65434,7 @@ in sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."jssha-2.4.2" - (sources."katex-0.11.1" // { + (sources."katex-0.12.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -65764,7 +65487,7 @@ in sources."markdown-it-sub-1.0.0" sources."markdown-it-sup-1.0.0" sources."markdown-it-toc-done-right-4.1.0" - sources."md5-2.2.1" + sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" sources."memory-cache-0.2.0" @@ -65786,11 +65509,7 @@ in sources."mkdirp-classic-0.5.3" sources."moment-2.27.0" sources."ms-2.0.0" - (sources."multiparty-4.2.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."multiparty-4.2.2" sources."nan-2.14.1" (sources."nanomatch-1.2.13" // { dependencies = [ @@ -65866,12 +65585,11 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."pend-1.2.0" sources."performance-now-2.1.0" sources."pify-3.0.0" sources."pipe-functions-1.3.0" sources."pn-1.1.0" - sources."pngjs-2.3.1" + sources."pngjs-5.0.0" sources."posix-character-classes-0.1.1" sources."prebuild-install-5.3.3" sources."prelude-ls-1.1.2" @@ -65880,10 +65598,11 @@ in sources."proper-lockfile-2.0.1" sources."psl-1.8.0" sources."pump-3.0.0" - sources."punycode-2.1.1" + sources."punycode-1.3.2" sources."q-1.1.2" sources."qs-6.5.2" sources."query-string-4.3.4" + sources."querystring-0.2.0" sources."querystringify-2.1.1" sources."random-bytes-1.0.0" sources."rc-1.2.8" @@ -65898,18 +65617,19 @@ in sources."isobject-2.1.0" ]; }) - sources."remove-markdown-0.3.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" + sources."punycode-2.1.1" sources."tough-cookie-2.5.0" ]; }) sources."request-promise-core-1.1.4" (sources."request-promise-native-1.0.9" // { dependencies = [ + sources."punycode-2.1.1" sources."tough-cookie-2.5.0" ]; }) @@ -65932,7 +65652,7 @@ in ]; }) sources."setimmediate-1.0.5" - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."seventh-0.7.35" (sources."sharp-0.23.4" // { dependencies = [ @@ -66056,7 +65776,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.41.0" + sources."terminal-kit-1.42.0" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -66073,8 +65793,16 @@ in sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" - sources."tough-cookie-3.0.1" - sources."tr46-1.0.1" + (sources."tough-cookie-3.0.1" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) + (sources."tr46-1.0.1" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) sources."tree-kit-0.6.2" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -66104,8 +65832,13 @@ in ]; }) sources."upper-case-1.1.3" - sources."uri-js-4.2.2" + (sources."uri-js-4.2.2" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) sources."urix-0.1.0" + sources."url-0.10.3" sources."url-parse-1.4.7" sources."use-3.1.1" sources."uslug-1.0.4" @@ -66133,8 +65866,12 @@ in sources."wrappy-1.0.2" sources."ws-7.3.1" sources."xml-name-validator-3.0.0" - sources."xml2js-0.4.23" - sources."xmlbuilder-11.0.1" + (sources."xml2js-0.4.23" // { + dependencies = [ + sources."xmlbuilder-11.0.1" + ]; + }) + sources."xmlbuilder-9.0.7" sources."xmlchars-2.2.0" sources."yallist-4.0.0" sources."yargs-parser-7.0.0" @@ -66228,7 +65965,7 @@ in sha512 = "SbY+i9ONuxSK35cgVHaI8O9senTE4CDYAmGSDJ5l3+sfe62Ff4gy96osy6OW84t4K4A8iGnMrlRrsSItSNp3RQ=="; }; dependencies = [ - sources."@babel/parser-7.10.5" + sources."@babel/parser-7.11.1" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -66265,10 +66002,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.11.1"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.11.1.tgz"; - sha512 = "WXWePB8ssAH3DlD05IoqolsY6arhbll/1+i2JkRPpihQAuiNaR/gSt8VKIcxpV5m6XChP0hCwESQUqpuQMA8Tg=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.12.0.tgz"; + sha512 = "TwuuaUDmra0JMkuqvqy+WGo2xGHSNjv1BA1nTIgtH2K5z1jHuAEeAgp7laaR+hLRmajRjcrM71+vByBDanCyYA=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -66309,7 +66046,7 @@ in meta = { description = "Static analysis tool for JavaScript"; homepage = http://jshint.com/; - license = "(MIT AND JSON)"; + license = "MIT"; }; production = true; bypassCache = true; @@ -66524,7 +66261,7 @@ in sources."got-9.6.0" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."http-cache-semantics-4.1.0" @@ -66723,10 +66460,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-5.1.0.tgz"; - sha512 = "I3aPbkuIbwuBo6wSog97P5WnnhCgUTsWTu/bEw1vZVQFbXmKO3PK+cfFhZioOgVtJAuQxoyauGNjnwXNHMCxbw=="; + url = "https://registry.npmjs.org/karma/-/karma-5.1.1.tgz"; + sha512 = "xAlOr5PMqUbiKXSv5PCniHWV3aiwj6wIZ0gUVcwpTCPVQm/qH2WAMFWxtnpM6KJqhkRWrIpovR4Rb0rn8GtJzQ=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -67100,7 +66837,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."he-1.2.0" (sources."htmlparser2-3.8.3" // { @@ -67386,7 +67123,7 @@ in sources."@octokit/auth-token-2.4.2" (sources."@octokit/endpoint-6.0.5" // { dependencies = [ - sources."is-plain-object-4.1.0" + sources."is-plain-object-4.1.1" sources."universal-user-agent-6.0.0" ]; }) @@ -67405,7 +67142,7 @@ in (sources."@octokit/request-5.4.7" // { dependencies = [ sources."@octokit/request-error-2.0.2" - sources."is-plain-object-4.1.0" + sources."is-plain-object-4.1.1" sources."universal-user-agent-6.0.0" ]; }) @@ -67415,11 +67152,11 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-5.1.1" + sources."@octokit/types-5.2.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -67774,7 +67511,7 @@ in ]; }) sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -67842,7 +67579,7 @@ in sources."is-obj-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-ssh-1.3.1" sources."is-stream-1.1.0" sources."is-symbol-1.0.3" @@ -67897,7 +67634,7 @@ in sources."find-up-4.1.0" sources."locate-path-5.0.0" sources."p-locate-4.1.0" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."path-exists-4.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -68096,7 +67833,7 @@ in sources."rimraf-2.7.1" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -68227,7 +67964,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.10.0" + sources."uglify-js-3.10.1" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -68840,7 +68577,7 @@ in sources."glob-parent-2.0.0" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" (sources."has-binary2-1.0.3" // { dependencies = [ sources."isarray-2.0.1" @@ -69209,9 +68946,9 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.10.5" - sources."@babel/core-7.10.5" - sources."@babel/generator-7.10.5" + sources."@babel/compat-data-7.11.0" + sources."@babel/core-7.11.1" + sources."@babel/generator-7.11.0" 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" @@ -69222,16 +68959,17 @@ in 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.10.5" + sources."@babel/helper-member-expression-to-functions-7.11.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.10.5" + sources."@babel/helper-module-transforms-7.11.0" 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.10.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" @@ -69240,23 +68978,26 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.10.5" + sources."@babel/parser-7.11.1" sources."@babel/plugin-external-helpers-7.8.3" 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" + sources."@babel/plugin-proposal-export-namespace-from-7.10.4" sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" sources."@babel/plugin-proposal-numeric-separator-7.10.4" - sources."@babel/plugin-proposal-object-rest-spread-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.11.0" sources."@babel/plugin-proposal-private-methods-7.10.4" sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" 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" sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" @@ -69269,7 +69010,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.10.4" sources."@babel/plugin-transform-async-to-generator-7.10.4" sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.10.5" + sources."@babel/plugin-transform-block-scoping-7.11.1" sources."@babel/plugin-transform-classes-7.10.4" sources."@babel/plugin-transform-computed-properties-7.10.4" sources."@babel/plugin-transform-destructuring-7.10.4" @@ -69291,21 +69032,21 @@ in sources."@babel/plugin-transform-property-literals-7.10.4" sources."@babel/plugin-transform-regenerator-7.10.4" sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-runtime-7.10.5" + sources."@babel/plugin-transform-runtime-7.11.0" sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.10.4" + sources."@babel/plugin-transform-spread-7.11.0" sources."@babel/plugin-transform-sticky-regex-7.10.4" sources."@babel/plugin-transform-template-literals-7.10.5" sources."@babel/plugin-transform-typeof-symbol-7.10.4" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.10.4" + sources."@babel/preset-env-7.11.0" sources."@babel/preset-modules-0.1.3" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.10.5" + sources."@babel/runtime-7.11.1" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.10.5" - sources."@babel/types-7.10.5" + sources."@babel/traverse-7.11.0" + sources."@babel/types-7.11.0" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -69327,7 +69068,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.5" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -69354,12 +69095,12 @@ in sources."@xtuc/long-4.2.2" sources."JSONStream-1.3.5" sources."ace.improved-0.2.1" - sources."acorn-7.3.1" + sources."acorn-7.4.0" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" sources."ajv-6.12.3" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.1" + sources."ajv-keywords-3.5.2" sources."amdefine-1.0.1" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -69468,12 +69209,8 @@ in }) sources."brorand-1.1.0" sources."browser-pack-6.1.0" - (sources."browser-resolve-1.11.3" // { - dependencies = [ - sources."resolve-1.1.7" - ]; - }) - (sources."browserify-16.5.1" // { + sources."browser-resolve-2.0.0" + (sources."browserify-16.5.2" // { dependencies = [ sources."punycode-1.4.1" ]; @@ -69486,7 +69223,7 @@ in sources."bn.js-4.11.9" ]; }) - (sources."browserify-sign-4.2.0" // { + (sources."browserify-sign-4.2.1" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -69508,7 +69245,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001105" + sources."caniuse-lite-1.0.30001111" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -69585,7 +69322,7 @@ in ]; }) sources."core-util-is-1.0.2" - (sources."create-ecdh-4.0.3" // { + (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -69630,7 +69367,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.504" + sources."electron-to-chromium-1.3.520" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -69757,7 +69494,7 @@ in ]; }) sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" @@ -69906,7 +69643,7 @@ in }) sources."mkdirp-1.0.4" sources."mkdirp-classic-0.5.3" - sources."module-deps-6.2.2" + sources."module-deps-6.2.3" (sources."move-concurrently-1.0.1" // { dependencies = [ sources."mkdirp-0.5.5" @@ -69967,7 +69704,7 @@ in sources."paredit.js-0.3.6" sources."parents-1.0.1" sources."parse-asn1-5.1.5" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" @@ -70268,7 +70005,7 @@ in sources."vinyl-2.2.0" sources."vm-browserify-1.1.2" sources."walker-1.0.7" - sources."watchpack-1.7.2" + sources."watchpack-1.7.4" (sources."watchpack-chokidar2-2.0.0" // { dependencies = [ sources."anymatch-2.0.0" @@ -70283,7 +70020,7 @@ in sources."readdirp-2.2.1" ]; }) - (sources."webpack-4.43.0" // { + (sources."webpack-4.44.1" // { dependencies = [ sources."acorn-6.4.1" sources."micromatch-3.1.10" @@ -70415,7 +70152,7 @@ in sources."form-data-2.3.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-4.0.0" sources."http-signature-1.2.0" sources."is-absolute-url-3.0.3" @@ -70466,10 +70203,10 @@ in mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.0.2.tgz"; - sha512 = "vez108o65/wnYCRtkqkdqZTeY44rwPEezRZBZG7tZ8x9CCCni21ugu6s1LkEhEer2HVmWmLw/EGuCXS8ip45eQ=="; + url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.0.4.tgz"; + sha512 = "gErqy0H3MtARqamwEvhTYfefesjgvDMohmrfF4PrOhh9iFa/LxKRoDJtpCEGWgcMnb+C1GlFRBzNkDJtwgUmyA=="; }; dependencies = [ sources."acorn-5.7.4" @@ -70592,7 +70329,7 @@ in }) sources."gulplog-1.0.0" sources."har-schema-2.0.0" - (sources."har-validator-5.1.3" // { + (sources."har-validator-5.1.5" // { dependencies = [ sources."ajv-6.12.3" ]; @@ -71463,7 +71200,7 @@ in sources."tweetnacl-0.14.5" sources."type-1.2.0" sources."typescript-3.9.7" - sources."uglify-js-3.10.0" + sources."uglify-js-3.10.1" sources."uglify-to-browserify-1.0.2" sources."unc-path-regex-0.1.2" sources."union-value-1.0.1" @@ -71526,10 +71263,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.0.1"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.0.1.tgz"; - sha512 = "vefaXfdYI8+Yo8nPZQQi0QO2o+5q9UIMX1jZ1XMmK3+4+CQjc7+B0hPdUeglXiTlr8IHMVRo63IhO9Mzt6fxOg=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.1.1.tgz"; + sha512 = "p7FuGlYH8t7gaiodlFreseLxEmxTgvyG9RgPHODFPySNhwUehu8NIb0vdSt3WFckSneswZ0Un5typYcWElk7HQ=="; }; dependencies = [ sources."ansi-colors-4.1.1" @@ -71597,7 +71334,8 @@ in sources."is-glob-4.0.1" sources."is-map-2.0.1" sources."is-number-7.0.0" - sources."is-regex-1.1.0" + sources."is-plain-obj-1.1.0" + sources."is-regex-1.1.1" sources."is-set-2.0.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" @@ -71607,7 +71345,6 @@ in sources."iterate-value-1.0.2" sources."js-yaml-3.13.1" sources."locate-path-5.0.0" - sources."lodash-4.17.19" sources."log-symbols-3.0.0" sources."minimatch-3.0.4" sources."ms-2.1.2" @@ -71623,10 +71360,12 @@ in sources."path-is-absolute-1.0.1" sources."picomatch-2.2.2" sources."promise.allsettled-1.0.2" + sources."randombytes-2.1.0" sources."readdirp-3.3.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."serialize-javascript-3.0.0" + sources."safe-buffer-5.2.1" + sources."serialize-javascript-4.0.0" sources."set-blocking-2.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" @@ -71665,7 +71404,19 @@ in ]; }) sources."yargs-parser-13.1.2" - sources."yargs-unparser-1.6.0" + (sources."yargs-unparser-1.6.1" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."yargs-14.2.3" + sources."yargs-parser-15.0.1" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -71870,7 +71621,7 @@ in sources."glob-7.1.6" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-unicode-2.0.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" @@ -72348,7 +72099,7 @@ in sha512 = "In2GzDLER2Bm5SkuEQVrekrSFtPljpkMaEYcZxNkbTomYixI63PrCm1IJEZjEBjSkFaK5zY1t3sfEHKdAla+MQ=="; }; dependencies = [ - sources."@babel/runtime-7.10.5" + sources."@babel/runtime-7.11.1" sources."@node-red/editor-api-1.1.2" sources."@node-red/editor-client-1.1.2" (sources."@node-red/nodes-1.1.2" // { @@ -72569,7 +72320,7 @@ in }) sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" sources."help-me-1.1.0" @@ -72907,7 +72658,7 @@ in sources."glob-7.1.6" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-unicode-2.0.1" sources."hosted-git-info-2.8.8" sources."http-signature-1.2.0" @@ -73229,7 +72980,7 @@ in sources."@npmcli/installed-package-contents-1.0.5" sources."@npmcli/move-file-1.0.1" sources."@npmcli/promise-spawn-1.2.0" - sources."@npmcli/run-script-1.3.1" + sources."@npmcli/run-script-1.4.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" @@ -73339,7 +73090,7 @@ in sources."got-9.6.0" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" @@ -73418,7 +73169,7 @@ in }) sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" - sources."minipass-pipeline-1.2.3" + sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" (sources."minizlib-1.3.3" // { dependencies = [ @@ -73648,7 +73399,7 @@ in sources."glob-7.1.6" sources."graceful-fs-2.0.3" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-unicode-2.0.1" sources."http-signature-1.2.0" sources."inflight-1.0.6" @@ -73804,14 +73555,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.10.5" - (sources."@babel/core-7.10.5" // { + sources."@babel/compat-data-7.11.0" + (sources."@babel/core-7.11.1" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.10.5" // { + (sources."@babel/generator-7.11.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -73828,38 +73579,43 @@ in 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.10.5" + sources."@babel/helper-member-expression-to-functions-7.11.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.10.5" + sources."@babel/helper-module-transforms-7.11.0" 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.10.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.10.5" + sources."@babel/parser-7.11.1" 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" + sources."@babel/plugin-proposal-export-namespace-from-7.10.4" sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" sources."@babel/plugin-proposal-numeric-separator-7.10.4" - sources."@babel/plugin-proposal-object-rest-spread-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.11.0" sources."@babel/plugin-proposal-private-methods-7.10.4" sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.10.4" 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.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-jsx-7.10.4" + 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" @@ -73869,7 +73625,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.10.4" sources."@babel/plugin-transform-async-to-generator-7.10.4" sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.10.5" + sources."@babel/plugin-transform-block-scoping-7.11.1" sources."@babel/plugin-transform-classes-7.10.4" sources."@babel/plugin-transform-computed-properties-7.10.4" sources."@babel/plugin-transform-destructuring-7.10.4" @@ -73894,18 +73650,18 @@ in sources."@babel/plugin-transform-regenerator-7.10.4" sources."@babel/plugin-transform-reserved-words-7.10.4" sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.10.4" + sources."@babel/plugin-transform-spread-7.11.0" sources."@babel/plugin-transform-sticky-regex-7.10.4" sources."@babel/plugin-transform-template-literals-7.10.5" sources."@babel/plugin-transform-typeof-symbol-7.10.4" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.10.4" + sources."@babel/preset-env-7.11.0" sources."@babel/preset-modules-0.1.3" - sources."@babel/runtime-7.10.5" + sources."@babel/runtime-7.11.1" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.10.5" - sources."@babel/types-7.10.5" + sources."@babel/traverse-7.11.0" + sources."@babel/types-7.11.0" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -73915,8 +73671,8 @@ in sources."@parcel/watcher-1.12.1" sources."@parcel/workers-1.11.0" sources."@types/q-1.5.4" - sources."abab-2.0.3" - sources."acorn-7.3.1" + sources."abab-2.0.4" + sources."acorn-7.4.0" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.1" @@ -73996,7 +73752,7 @@ in sources."bn.js-4.11.9" ]; }) - (sources."browserify-sign-4.2.0" // { + (sources."browserify-sign-4.2.1" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -74023,7 +73779,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001105" + sources."caniuse-lite-1.0.30001111" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -74056,7 +73812,7 @@ in }) sources."core-util-is-1.0.2" sources."cosmiconfig-5.2.1" - (sources."create-ecdh-4.0.3" // { + (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -74157,7 +73913,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.504" + sources."electron-to-chromium-1.3.520" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -74230,7 +73986,7 @@ in sources."graceful-fs-4.2.4" sources."grapheme-breaker-0.3.2" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ @@ -74311,7 +74067,7 @@ in sources."is-number-3.0.0" sources."is-obj-2.0.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-resolvable-1.1.0" sources."is-svg-3.0.0" sources."is-symbol-1.0.3" @@ -74519,7 +74275,7 @@ in sources."postcss-value-parser-3.3.1" sources."posthtml-0.11.6" sources."posthtml-parser-0.4.2" - sources."posthtml-render-1.2.2" + sources."posthtml-render-1.2.3" sources."prelude-ls-1.1.2" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -74868,7 +74624,7 @@ in sources."graceful-fs-4.2.4" sources."handlebars-4.7.6" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-symbols-1.0.1" sources."hat-0.0.3" sources."heapdump-0.3.15" @@ -75001,7 +74757,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.10.0" + sources."uglify-js-3.10.1" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.2.2" @@ -75172,7 +74928,7 @@ in sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."is-utf8-0.2.1" sources."isarray-1.0.0" @@ -75474,7 +75230,6 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."fd-slicer-1.1.0" sources."fifo-0.1.4" sources."finalhandler-1.1.2" sources."flatten-0.0.1" @@ -75491,7 +75246,7 @@ in sources."glob-7.1.6" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" (sources."has-binary2-1.0.3" // { dependencies = [ sources."isarray-2.0.1" @@ -75564,7 +75319,13 @@ in ]; }) sources."ms-2.0.0" - sources."multiparty-4.2.1" + (sources."multiparty-4.2.2" // { + dependencies = [ + sources."http-errors-1.8.0" + sources."safe-buffer-5.2.1" + sources."setprototypeof-1.2.0" + ]; + }) sources."negotiator-0.6.2" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" @@ -75593,7 +75354,6 @@ in ]; }) sources."peer-wire-swarm-0.12.2" - sources."pend-1.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.6" @@ -75726,10 +75486,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.4.3"; + version = "5.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.4.3.tgz"; - sha512 = "Q9H70UBLnTJT8ikESW4ERC1/Yz7nPj1OmJbzNwuVcKVRHNMzSDTEBWjt0a3WFXsHi4Cfwd9gtBppTvY8lmkN/A=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.4.12.tgz"; + sha512 = "//Oru9g26OvTCe6bID3AJNiJ8B5SRd0vQBRH1gpoWxDh5kdPPpV4pge4B6ncWJUIl0yAVB9sSmDqDDheJP5+xQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -75951,7 +75711,7 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-7.3.1" + sources."acorn-7.4.0" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" (sources."asn1.js-4.10.1" // { @@ -75972,12 +75732,8 @@ in sources."brace-expansion-1.1.11" sources."brorand-1.1.0" sources."browser-pack-6.1.0" - (sources."browser-resolve-1.11.3" // { - dependencies = [ - sources."resolve-1.1.7" - ]; - }) - (sources."browserify-16.5.1" // { + sources."browser-resolve-2.0.0" + (sources."browserify-16.5.2" // { dependencies = [ sources."concat-stream-1.6.2" ]; @@ -75997,7 +75753,7 @@ in sources."bn.js-4.11.9" ]; }) - (sources."browserify-sign-4.2.0" // { + (sources."browserify-sign-4.2.1" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -76022,7 +75778,7 @@ in sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" sources."core-util-is-1.0.2" - (sources."create-ecdh-4.0.3" // { + (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -76099,7 +75855,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" - (sources."module-deps-6.2.2" // { + (sources."module-deps-6.2.3" // { dependencies = [ sources."concat-stream-1.6.2" ]; @@ -76215,10 +75971,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.13.5"; + version = "0.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.13.5.tgz"; - sha512 = "4Q0xNmAUBXJnoYJAe48nl0VAJm0gWqMbNDaXRR4XWwMike4AfFbPankC6uAVtSm7BabRJ0+hPD6ba+wiy1lPDw=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.13.6.tgz"; + sha512 = "0e7oA1gveyd8XLkBYcPWRC27PAFGTxpf6aVJWUfA79Q3lCCOP9BQBkr9a42FutP3q6GMc9TVW4mQ+xSEfhwOzA=="; }; dependencies = [ sources."isexe-2.0.0" @@ -76279,10 +76035,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.55"; + version = "1.1.59"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.55.tgz"; - sha512 = "sIcjNNfazzwyjUxx7pUS52W3oaxY6j6GnpyV8x0o3e6lqmLa2eU76QuVpx2jl87Zk9YG2o2EKXZEUWyHd87o3A=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.59.tgz"; + sha512 = "34PysYgl5bDdV7H4y5dv4fonKsJvI2H/YSDY6jvVtt0XI7Ld0k6lHzBZcVDO4kNLdJt0ekhwqC8w42oJyPYnWg=="; }; buildInputs = globalBuildInputs; meta = { @@ -76338,7 +76094,7 @@ in sources."is-date-object-1.0.2" sources."is-map-2.0.1" sources."is-number-object-1.0.4" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-set-2.0.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" @@ -76449,14 +76205,14 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.9.8"; + version = "0.9.10"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.9.8.tgz"; - sha512 = "JW7krzhX+P3qSjTvBMpTRjX/JHrnvHeIWcpZB4RaaC0qTL/DwcgA+IJNpiQ0+jV+bkHaPjHcT0T4pjWh+5VTaw=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.9.10.tgz"; + sha512 = "2rfbQp8uNpQEw/4hRYes3fVrOAYfgK7jYw3t/A9R4EpMSF6jtzJLA/sl1SQh2zWaF5z1ckXEvUW9B8c+NDc//g=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/generator-7.10.5" // { + (sources."@babel/generator-7.11.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -76465,19 +76221,34 @@ in sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.10.5" - sources."@babel/runtime-7.10.5" + sources."@babel/parser-7.11.1" + sources."@babel/runtime-7.11.1" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.10.5" - sources."@babel/types-7.10.5" - sources."@emotion/is-prop-valid-0.8.8" - sources."@emotion/memoize-0.7.4" - sources."@emotion/unitless-0.7.5" + sources."@babel/traverse-7.11.0" + sources."@babel/types-7.11.0" + (sources."@emotion/babel-utils-0.6.10" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) + sources."@emotion/hash-0.6.6" + (sources."@emotion/is-prop-valid-0.8.8" // { + dependencies = [ + sources."@emotion/memoize-0.7.4" + ]; + }) + sources."@emotion/memoize-0.6.6" + sources."@emotion/serialize-0.9.1" + sources."@emotion/stylis-0.7.1" + sources."@emotion/unitless-0.6.7" + sources."@emotion/utils-0.8.2" sources."@types/color-name-1.1.1" - sources."@types/node-13.13.14" + sources."@types/node-13.13.15" + sources."@types/parse-json-4.0.0" + sources."abbrev-1.1.1" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -76493,7 +76264,14 @@ in sources."util-0.10.3" ]; }) - sources."babel-plugin-styled-components-1.10.7" + (sources."babel-plugin-emotion-9.2.11" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."source-map-0.5.7" + ]; + }) + sources."babel-plugin-macros-2.8.0" + sources."babel-plugin-styled-components-1.11.1" sources."babel-plugin-syntax-jsx-6.18.0" sources."base64-js-1.3.1" sources."better-ajv-errors-0.6.7" @@ -76509,7 +76287,7 @@ in sources."bn.js-4.11.9" ]; }) - (sources."browserify-sign-4.2.0" // { + (sources."browserify-sign-4.2.1" // { dependencies = [ sources."inherits-2.0.4" sources."readable-stream-3.6.0" @@ -76524,6 +76302,7 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."call-me-maybe-1.0.1" + sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelize-1.0.0" sources."chalk-2.4.2" @@ -76535,24 +76314,30 @@ in sources."clsx-1.1.1" sources."co-4.6.0" sources."code-error-fragment-0.0.230" - sources."code-point-at-1.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" + (sources."convert-source-map-1.7.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."core-js-3.6.5" sources."core-util-is-1.0.2" - (sources."create-ecdh-4.0.3" // { + sources."cosmiconfig-6.0.0" + (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.11.9" ]; }) + sources."create-emotion-9.2.12" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."cross-spawn-6.0.5" sources."crypto-browserify-3.12.0" sources."css-color-keywords-1.0.0" - sources."css-to-react-native-2.3.2" + sources."css-to-react-native-3.0.0" + sources."csstype-2.6.13" sources."debug-4.2.0" sources."decamelize-1.2.0" sources."decko-1.2.0" @@ -76571,24 +76356,24 @@ in ]; }) sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" + sources."emotion-9.2.12" + sources."error-ex-1.3.2" sources."es6-promise-3.3.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."eventemitter3-4.0.4" sources."events-3.2.0" sources."evp_bytestokey-1.0.3" - sources."execa-1.0.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fill-range-7.0.1" + sources."find-root-1.1.0" sources."find-up-4.1.0" sources."foreach-2.0.5" sources."format-util-1.0.5" sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" - sources."get-stream-4.1.0" sources."glob-parent-5.1.1" sources."globals-11.12.0" sources."good-listener-1.2.2" @@ -76607,94 +76392,82 @@ in ]; }) sources."hmac-drbg-1.0.1" + sources."hoist-non-react-statics-3.3.2" sources."http2-client-1.3.3" sources."https-browserify-1.0.0" sources."ieee754-1.1.13" + sources."import-fresh-3.2.1" sources."inherits-2.0.1" - sources."invert-kv-2.0.0" + sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."is-stream-1.1.0" - sources."is-what-3.10.0" sources."isarray-2.0.5" - sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsesc-2.5.2" + sources."json-parse-better-errors-1.0.2" sources."json-pointer-0.6.0" sources."json-schema-ref-parser-6.1.0" sources."json-schema-traverse-0.3.1" sources."json-to-ast-2.1.0" sources."jsonpointer-4.1.0" - sources."lcid-2.0.0" sources."leven-3.1.0" + sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.19" sources."loose-envify-1.4.0" sources."lunr-2.3.8" - sources."map-age-cleaner-0.1.3" sources."mark.js-8.11.1" sources."marked-0.7.0" sources."md5.js-1.3.5" - sources."mem-4.3.0" sources."memoize-one-5.1.1" - sources."merge-anything-2.4.4" (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.11.9" ]; }) - sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."mkdirp-1.0.4" sources."mobx-4.15.4" - sources."mobx-react-6.1.5" - sources."mobx-react-lite-1.5.2" + sources."mobx-react-6.2.5" + sources."mobx-react-lite-2.0.7" sources."ms-2.1.2" sources."neo-async-2.6.2" - sources."nice-try-1.0.5" sources."node-fetch-h2-2.3.0" sources."node-libs-browser-2.2.1" sources."node-readfiles-0.2.0" + sources."nopt-1.0.10" sources."normalize-path-3.0.0" - sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" sources."oas-linter-3.1.3" - (sources."oas-resolver-2.4.1" // { - dependencies = [ - sources."yargs-15.4.1" - ]; - }) - sources."oas-schema-walker-1.1.4" - sources."oas-validator-3.4.0" + sources."oas-resolver-2.4.2" + sources."oas-schema-walker-1.1.5" + sources."oas-validator-4.0.7" sources."object-assign-4.1.1" - sources."once-1.4.0" sources."ono-4.0.11" - sources."openapi-sampler-1.0.0-beta.15" + sources."openapi-sampler-1.0.0-beta.16" sources."os-browserify-0.3.0" - sources."os-locale-3.1.0" - sources."p-defer-1.0.0" - sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."pako-1.0.11" + sources."parent-module-1.0.1" sources."parse-asn1-5.1.5" + sources."parse-json-5.0.1" sources."path-browserify-0.0.1" sources."path-exists-4.0.0" - sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."path-type-4.0.0" sources."pbkdf2-3.1.1" sources."perfect-scrollbar-1.5.0" sources."picomatch-2.2.2" sources."polished-3.6.5" - sources."postcss-value-parser-3.3.1" + sources."postcss-value-parser-4.1.0" sources."prismjs-1.20.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -76704,7 +76477,6 @@ in sources."bn.js-4.11.9" ]; }) - sources."pump-3.0.0" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -76712,7 +76484,7 @@ in sources."randomfill-1.0.4" sources."react-16.13.1" sources."react-dom-16.13.1" - sources."react-dropdown-1.7.0" + sources."react-dropdown-aria-2.0.7" sources."react-is-16.13.1" sources."react-tabs-3.1.1" (sources."readable-stream-2.3.7" // { @@ -76724,29 +76496,28 @@ in ]; }) sources."readdirp-3.4.0" - sources."redoc-2.0.0-rc.29" - sources."reftools-1.1.3" + sources."redoc-2.0.0-rc.36" + sources."reftools-1.1.4" sources."regenerator-runtime-0.13.7" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" + sources."resolve-1.17.0" + sources."resolve-from-4.0.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."scheduler-0.19.1" sources."select-1.1.2" - sources."semver-5.7.1" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shallowequal-1.1.0" sources."should-13.2.3" sources."should-equal-2.0.0" sources."should-format-3.0.3" sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" - sources."signal-exit-3.0.3" - sources."slugify-1.4.4" + sources."slugify-1.4.5" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stickyfill-1.1.1" @@ -76755,47 +76526,25 @@ in sources."string-width-4.2.0" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" - sources."strip-eof-1.0.0" - sources."styled-components-4.4.1" - sources."stylis-3.5.4" - sources."stylis-rule-sheet-0.0.10" - sources."supports-color-5.5.0" - (sources."swagger2openapi-5.4.0" // { + (sources."styled-components-5.1.1" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."cliui-4.1.0" - sources."find-up-3.0.0" - sources."get-caller-file-1.0.3" - sources."is-fullwidth-code-point-1.0.0" - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."require-main-filename-1.0.1" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - ]; - }) - sources."strip-ansi-4.0.0" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) - sources."yargs-12.0.5" - sources."yargs-parser-11.1.1" + sources."@emotion/stylis-0.8.5" + sources."@emotion/unitless-0.7.5" ]; }) + sources."stylis-3.5.4" + sources."stylis-rule-sheet-0.0.10" + sources."supports-color-5.5.0" + sources."swagger2openapi-6.2.2" sources."timers-browserify-2.0.11" sources."tiny-emitter-2.1.0" sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" - sources."tslib-1.13.0" + sources."touch-2.0.2" + sources."tslib-2.0.0" sources."tty-browserify-0.0.0" - sources."uglify-js-3.10.0" + sources."uglify-js-3.10.1" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -76809,7 +76558,6 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" - sources."which-1.3.1" sources."which-module-2.0.0" sources."wordwrap-1.0.0" (sources."wrap-ansi-6.2.0" // { @@ -76819,26 +76567,10 @@ in sources."color-name-1.1.4" ]; }) - sources."wrappy-1.0.2" sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yaml-1.10.0" - (sources."yargs-13.3.2" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."cliui-5.0.0" - sources."emoji-regex-7.0.3" - sources."find-up-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."wrap-ansi-5.1.0" - sources."yargs-parser-13.1.2" - ]; - }) + sources."yargs-15.4.1" sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; @@ -76872,10 +76604,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.22.2"; + version = "2.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.22.2.tgz"; - sha512 = "2a4Mch4f0W2lEvkPuxtz0GfrtfgLj9bdd/oC9L3LozGOCnmLqO7ivMfKbCJoRgqWIU2UqAcbxRFSwmIKx+uStA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.23.0.tgz"; + sha512 = "vLNmZFUGVwrnqNAJ/BvuLk1MtWzu4IuoqsH9UWK5AIdO3rt8/CSiJNvPvCIvfzrbNsqKbNzPAG1V2O4eTe2XZg=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -76917,21 +76649,21 @@ in sources."@types/node-fetch-2.5.7" sources."@types/resolve-1.17.1" sources."@types/vscode-1.47.0" - (sources."@typescript-eslint/eslint-plugin-3.7.0" // { + (sources."@typescript-eslint/eslint-plugin-3.8.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/experimental-utils-3.7.0" - sources."@typescript-eslint/parser-3.7.0" - sources."@typescript-eslint/types-3.7.0" - (sources."@typescript-eslint/typescript-estree-3.7.0" // { + sources."@typescript-eslint/experimental-utils-3.8.0" + sources."@typescript-eslint/parser-3.8.0" + sources."@typescript-eslint/types-3.8.0" + (sources."@typescript-eslint/typescript-estree-3.8.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/visitor-keys-3.7.0" - sources."acorn-7.3.1" + sources."@typescript-eslint/visitor-keys-3.8.0" + sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" sources."agent-base-4.3.0" sources."ajv-6.12.3" @@ -77010,7 +76742,7 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.5.0" // { + (sources."eslint-7.6.0" // { dependencies = [ sources."semver-7.3.2" ]; @@ -77081,8 +76813,9 @@ in sources."is-map-2.0.1" sources."is-module-1.0.0" sources."is-number-7.0.0" + sources."is-plain-obj-1.1.0" sources."is-reference-1.2.1" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-set-2.0.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" @@ -77118,7 +76851,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.0.1" // { + (sources."mocha-8.1.1" // { dependencies = [ sources."debug-3.2.6" sources."has-flag-4.0.0" @@ -77163,6 +76896,7 @@ in sources."promise.allsettled-1.0.2" sources."pseudomap-1.0.2" sources."punycode-2.1.1" + sources."randombytes-2.1.0" sources."read-1.0.7" sources."readable-stream-3.6.0" sources."readdirp-3.3.0" @@ -77172,10 +76906,10 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.22.2" + sources."rollup-2.23.0" sources."safe-buffer-5.2.1" sources."semver-6.3.0" - sources."serialize-javascript-3.0.0" + sources."serialize-javascript-4.0.0" sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -77258,7 +76992,16 @@ in ]; }) sources."yargs-parser-13.1.2" - sources."yargs-unparser-1.6.0" + (sources."yargs-unparser-1.6.1" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."yargs-14.2.3" + sources."yargs-parser-15.0.1" + ]; + }) sources."yauzl-2.10.0" sources."yazl-2.5.1" ]; @@ -77334,7 +77077,7 @@ in sources."fresh-0.2.0" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."http-auth-2.0.7" sources."http-signature-1.2.0" sources."inherits-2.0.4" @@ -77528,14 +77271,13 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.75.1"; + version = "1.78.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.75.1.tgz"; - sha512 = "aKCn/9qUh6SAG2Mb3Djqldzz8ft0W7+7L9Bg4wkj/lBXgSyjP6xcJR/NQJaMM81Eeu9jCfCcBB9Xs7VbRCking=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.78.1.tgz"; + sha512 = "Dw3x2+fnZ+Tgb3nGTYfGe78AIT/AOda8gttwKAoCUPScNDoF8Hjy8YvLuqLQg/o7daWouFUCHQ9Mv0ehN/Qazg=="; }; dependencies = [ sources."2-thenable-1.0.0" - sources."@babel/parser-7.10.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -77550,9 +77292,9 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" - sources."@serverless/cli-1.5.1" + sources."@serverless/cli-1.5.2" sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-2.32.0" // { + (sources."@serverless/components-2.34.1" // { dependencies = [ sources."globby-10.0.2" sources."semver-7.3.2" @@ -77563,11 +77305,11 @@ in sources."fs-extra-7.0.1" ]; }) - sources."@serverless/enterprise-plugin-3.6.16" + sources."@serverless/enterprise-plugin-3.7.0" sources."@serverless/event-mocks-1.1.1" sources."@serverless/inquirer-1.1.2" - sources."@serverless/platform-client-1.0.10" - (sources."@serverless/platform-client-china-1.0.27" // { + sources."@serverless/platform-client-1.1.1" + (sources."@serverless/platform-client-china-1.0.32" // { dependencies = [ sources."archiver-4.0.2" sources."async-3.2.0" @@ -77584,7 +77326,7 @@ in }) sources."@serverless/template-1.1.3" sources."@serverless/utils-1.2.0" - sources."@serverless/utils-china-0.1.19" + sources."@serverless/utils-china-0.1.22" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-0.2.17" @@ -77594,18 +77336,11 @@ in sources."@types/lodash-4.14.158" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."@types/object-assign-4.0.30" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/tough-cookie-4.0.0" - (sources."@typescript-eslint/typescript-estree-2.34.0" // { - dependencies = [ - sources."debug-4.2.0" - sources."ms-2.1.2" - sources."semver-7.3.2" - ]; - }) sources."adm-zip-0.4.16" sources."after-0.8.2" sources."agent-base-5.1.1" @@ -77619,7 +77354,6 @@ in sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" - sources."app-module-path-2.2.0" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" @@ -77658,12 +77392,11 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-module-types-2.6.0" sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.718.0" // { + (sources."aws-sdk-2.726.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -77717,11 +77450,7 @@ in sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."caw-2.0.1" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) + sources."chalk-2.4.2" sources."chardet-0.7.0" (sources."child-process-ext-2.1.1" // { dependencies = [ @@ -77781,12 +77510,7 @@ in }) sources."concat-map-0.0.1" sources."config-chain-1.1.12" - (sources."configstore-3.1.2" // { - dependencies = [ - sources."make-dir-1.3.0" - sources."pify-3.0.0" - ]; - }) + sources."configstore-3.1.2" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -77806,18 +77530,12 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.30" + sources."dayjs-1.8.32" sources."debug-3.1.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."decomment-0.9.2" (sources."decompress-4.2.1" // { dependencies = [ - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) sources."pify-2.3.0" ]; }) @@ -77846,47 +77564,11 @@ in ]; }) sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" sources."defer-to-connect-1.1.3" sources."deferred-0.7.11" sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - (sources."dependency-tree-7.2.1" // { - dependencies = [ - sources."debug-4.2.0" - sources."ms-2.1.2" - ]; - }) - sources."detective-amd-3.0.0" - sources."detective-cjs-3.1.1" - sources."detective-es6-2.2.0" - (sources."detective-less-1.0.2" // { - dependencies = [ - sources."debug-4.2.0" - sources."ms-2.1.2" - ]; - }) - (sources."detective-postcss-3.0.1" // { - dependencies = [ - sources."debug-4.2.0" - sources."ms-2.1.2" - ]; - }) - (sources."detective-sass-3.0.1" // { - dependencies = [ - sources."debug-4.2.0" - sources."ms-2.1.2" - ]; - }) - (sources."detective-scss-2.0.1" // { - dependencies = [ - sources."debug-4.2.0" - sources."ms-2.1.2" - ]; - }) - sources."detective-stylus-1.0.0" - sources."detective-typescript-5.8.0" sources."diagnostics-1.1.1" sources."dijkstrajs-1.0.1" sources."dir-glob-3.0.1" @@ -77903,7 +77585,6 @@ in sources."http-cache-semantics-3.8.1" sources."keyv-3.0.0" sources."lowercase-keys-1.0.0" - sources."make-dir-1.3.0" sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" sources."pify-3.0.0" @@ -77931,9 +77612,7 @@ in ]; }) sources."engine.io-parser-2.2.0" - sources."enhanced-resolve-4.3.0" sources."env-variable-0.0.6" - sources."errno-0.1.7" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-promisify-6.1.1" @@ -77945,13 +77624,9 @@ in sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.3" - sources."eslint-visitor-keys-1.3.0" sources."esniff-1.1.0" sources."esprima-4.0.1" sources."essentials-1.1.1" - sources."estraverse-4.3.0" - sources."esutils-2.0.3" sources."event-emitter-0.3.5" sources."events-1.1.1" (sources."execa-0.7.0" // { @@ -78005,19 +77680,11 @@ in sources."fd-slicer-1.1.0" sources."fecha-4.2.0" sources."figures-3.2.0" - sources."file-exists-dazinatorfork-1.0.2" sources."file-type-5.2.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" sources."filesize-3.6.1" - (sources."filing-cabinet-2.5.1" // { - dependencies = [ - sources."debug-4.2.0" - sources."ms-2.1.2" - ]; - }) sources."fill-range-7.0.1" - sources."find-0.3.0" (sources."find-process-1.4.3" // { dependencies = [ sources."debug-2.6.9" @@ -78025,7 +77692,6 @@ in }) sources."find-requires-1.0.0" sources."flat-5.0.0" - sources."flatten-1.0.3" sources."follow-redirects-1.5.10" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -78046,8 +77712,6 @@ in sources."fs2-0.3.8" sources."fsevents-2.1.3" sources."function-bind-1.1.1" - sources."get-amd-module-type-3.0.0" - sources."get-own-enumerable-property-symbols-3.0.2" sources."get-proxy-2.1.0" sources."get-stdin-6.0.0" sources."get-stream-4.1.0" @@ -78093,13 +77757,11 @@ in sources."to-regex-range-2.1.1" ]; }) - sources."gonzales-pe-4.3.0" sources."got-9.6.0" sources."graceful-fs-4.2.4" - sources."graceful-readlink-1.0.1" sources."graphlib-2.1.8" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."has-flag-3.0.0" @@ -78132,7 +77794,6 @@ in sources."immediate-3.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."indexes-of-1.0.1" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -78143,6 +77804,12 @@ in sources."figures-2.0.0" ]; }) + (sources."inquirer-autocomplete-prompt-1.0.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + sources."figures-2.0.0" + ]; + }) sources."into-stream-3.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.3.2" @@ -78167,16 +77834,13 @@ in sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" sources."is-redirect-1.0.0" - sources."is-regexp-1.0.0" - sources."is-relative-path-1.0.2" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-url-1.2.4" sources."is-windows-1.0.2" (sources."is-wsl-2.2.0" // { dependencies = [ - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" ]; }) sources."isarray-2.0.1" @@ -78239,7 +77903,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."levn-0.3.0" sources."lie-3.3.0" sources."lodash-4.17.19" sources."lodash.defaults-4.2.0" @@ -78261,23 +77924,14 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" sources."lru-queue-0.1.0" - (sources."make-dir-2.1.0" // { + (sources."make-dir-1.3.0" // { dependencies = [ - sources."pify-4.0.1" - sources."semver-5.7.1" + sources."pify-3.0.0" ]; }) sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."memoizee-0.4.14" - (sources."memory-fs-0.5.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) sources."merge2-1.4.1" sources."methods-1.1.2" sources."micromatch-4.0.2" @@ -78294,13 +77948,6 @@ in ]; }) sources."mkdirp-0.5.5" - sources."module-definition-3.3.0" - (sources."module-lookup-amd-6.2.0" // { - dependencies = [ - sources."debug-4.2.0" - sources."ms-2.1.2" - ]; - }) sources."moment-2.27.0" sources."ms-2.0.0" sources."mute-stream-0.0.7" @@ -78312,7 +77959,6 @@ in sources."nice-try-1.0.5" sources."node-dir-0.1.17" sources."node-fetch-2.6.0" - sources."node-source-walk-4.2.0" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" (sources."npm-conf-1.1.3" // { @@ -78347,7 +77993,7 @@ in sources."onetime-2.0.1" (sources."open-7.1.0" // { dependencies = [ - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" ]; }) (sources."opn-5.5.0" // { @@ -78355,7 +78001,6 @@ in sources."is-wsl-1.1.0" ]; }) - sources."optionator-0.8.3" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-event-2.3.1" @@ -78374,7 +78019,6 @@ in sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-loader-1.0.10" - sources."path-parse-1.0.6" sources."path-type-4.0.0" sources."pend-1.2.0" sources."performance-now-2.1.0" @@ -78383,16 +78027,6 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."posix-character-classes-0.1.1" - sources."postcss-7.0.32" - sources."postcss-values-parser-1.5.0" - (sources."precinct-6.3.1" // { - dependencies = [ - sources."commander-2.20.3" - sources."debug-4.2.0" - sources."ms-2.1.2" - ]; - }) - sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" sources."prettyoutput-1.2.0" sources."process-nextick-args-2.0.1" @@ -78400,10 +78034,9 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.10.1" // { dependencies = [ - sources."@types/node-13.13.14" + sources."@types/node-13.13.15" ]; }) - sources."prr-1.0.1" sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."pump-3.0.0" @@ -78429,10 +78062,6 @@ in }) sources."request-promise-core-1.1.4" sources."request-promise-native-1.0.9" - sources."requirejs-2.3.6" - sources."requirejs-config-file-3.1.2" - sources."resolve-1.17.0" - sources."resolve-dependency-path-2.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -78440,17 +78069,12 @@ in sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-lookup-3.0.0" sources."sax-1.2.1" - (sources."seek-bzip-1.0.5" // { - dependencies = [ - sources."commander-2.8.1" - ]; - }) + sources."seek-bzip-1.0.6" sources."semver-6.3.0" (sources."semver-diff-2.1.0" // { dependencies = [ @@ -78558,18 +78182,11 @@ in ]; }) sources."string_decoder-1.3.0" - sources."stringify-object-3.3.0" sources."strip-ansi-5.2.0" sources."strip-dirs-2.1.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - (sources."stylus-lookup-3.0.2" // { - dependencies = [ - sources."debug-4.2.0" - sources."ms-2.1.2" - ]; - }) (sources."superagent-3.8.3" // { dependencies = [ sources."isarray-1.0.0" @@ -78578,14 +78195,13 @@ in sources."string_decoder-1.1.1" ]; }) - sources."supports-color-6.1.0" + sources."supports-color-5.5.0" (sources."tabtab-3.0.2" // { dependencies = [ sources."debug-4.2.0" sources."ms-2.1.2" ]; }) - sources."tapable-1.1.3" sources."tar-stream-2.1.3" sources."term-size-1.2.0" sources."text-hex-1.0.0" @@ -78606,20 +78222,15 @@ in sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."traverse-0.6.6" - sources."traverse-chain-0.1.0" sources."trim-repeated-1.0.0" sources."triple-beam-1.3.0" sources."tslib-1.13.0" - sources."tsutils-3.17.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-2.0.0" - sources."type-check-0.3.2" sources."type-fest-0.11.0" - sources."typescript-3.9.7" sources."unbzip2-stream-1.4.3" sources."union-value-1.0.1" - sources."uniq-1.0.1" sources."unique-string-1.0.0" sources."universalify-0.1.2" (sources."unset-value-1.0.0" // { @@ -78657,7 +78268,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."whatwg-fetch-3.2.0" + sources."whatwg-fetch-3.3.1" sources."which-1.3.1" sources."widest-line-2.0.1" (sources."winston-3.2.1" // { @@ -78673,7 +78284,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."ws-7.3.1" @@ -78789,7 +78399,7 @@ in sources."getpass-0.1.7" sources."global-https://github.com/component/global/archive/v2.0.1.tar.gz" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-binary-data-0.1.1" sources."has-cors-1.0.3" (sources."htmlparser2-3.7.3" // { @@ -79327,17 +78937,17 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.364.2"; + version = "1.369.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.364.2.tgz"; - sha512 = "fzJXS3wTSlSN9COYTZR+f+4+HGQljkIoJ72xrLCidZzla594fl7YMAVi5/vBfaHYYGLAlWp3bTse7UcpLUpz+Q=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.369.3.tgz"; + sha512 = "I54pQeG7i/fLQfBQYK+hL/Yr3g9FPuSnVWKroRFdEaB6vfNSRBA2nd3cKPz9iTVm8v72dSZvixsvR6s+7iDi6g=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" - sources."@sindresorhus/is-3.0.0" + sources."@sindresorhus/is-3.1.0" (sources."@snyk/cli-interface-2.8.1" // { dependencies = [ (sources."@snyk/dep-graph-1.19.0" // { @@ -79363,7 +78973,7 @@ in sources."@snyk/gemfile-1.2.0" sources."@snyk/graphlib-2.1.9-patch" sources."@snyk/inquirer-6.2.2-patch" - sources."@snyk/java-call-graph-builder-1.11.1" + sources."@snyk/java-call-graph-builder-1.12.3" sources."@snyk/lodash-4.17.15-patch" sources."@snyk/rpm-parser-2.0.0" sources."@snyk/ruby-semver-2.2.0" @@ -79393,7 +79003,7 @@ in sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.14" + sources."@types/node-13.13.15" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.5" @@ -79497,7 +79107,7 @@ in sources."cli-cursor-2.1.0" sources."cli-spinner-0.2.10" sources."cli-width-2.2.1" - sources."clipanion-2.4.2" + sources."clipanion-2.4.4" (sources."cliui-3.2.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -79637,7 +79247,7 @@ in sources."is-callable-1.2.0" sources."is-ci-2.0.0" sources."is-deflate-1.0.0" - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -79800,7 +79410,7 @@ in sources."rimraf-2.7.1" sources."run-async-2.4.1" sources."run-parallel-1.1.9" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -79825,7 +79435,7 @@ in ]; }) sources."tmp-0.2.1" - sources."uuid-8.2.0" + sources."uuid-8.3.0" ]; }) sources."snyk-go-parser-1.4.1" @@ -79864,7 +79474,7 @@ in ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.17.3" // { + (sources."snyk-mvn-plugin-2.18.2" // { dependencies = [ sources."tmp-0.1.0" sources."tslib-1.11.1" @@ -80330,7 +79940,6 @@ in sources."assign-symbols-1.0.0" sources."async-each-1.0.3" sources."async-single-1.0.5" - sources."async-write-2.1.0" sources."atob-2.1.2" (sources."atomic-file-2.0.1" // { dependencies = [ @@ -80614,7 +80223,7 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-set-2.0.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" @@ -80672,8 +80281,8 @@ in }) sources."levelup-4.4.0" sources."libnested-1.5.0" - sources."libsodium-0.7.6" - sources."libsodium-wrappers-0.7.6" + sources."libsodium-0.7.8" + sources."libsodium-wrappers-0.7.8" sources."lodash.clonedeep-4.5.0" sources."lodash.get-4.4.2" sources."log-symbols-1.0.2" @@ -81002,7 +80611,7 @@ in sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" sources."ssb-config-3.4.4" - (sources."ssb-db-20.2.2" // { + (sources."ssb-db-20.3.0" // { dependencies = [ sources."glob-7.1.6" sources."mkdirp-1.0.4" @@ -81245,7 +80854,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.718.0" // { + (sources."aws-sdk-2.726.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -81505,7 +81114,7 @@ in sources."is-my-json-valid-2.20.5" sources."is-promise-2.2.2" sources."is-property-1.0.2" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -81514,7 +81123,7 @@ in sources."isstream-0.1.2" sources."jmespath-0.15.0" sources."jpeg-turbo-0.4.0" - sources."js-base64-2.6.3" + sources."js-base64-2.6.4" sources."js-stringify-1.0.2" sources."js-yaml-3.2.7" sources."jsbn-0.1.1" @@ -81722,7 +81331,7 @@ in sources."aws-sign2-0.7.0" sources."caseless-0.12.0" sources."form-data-2.3.3" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."http-signature-1.2.0" sources."oauth-sign-0.9.0" sources."punycode-2.1.1" @@ -82057,7 +81666,7 @@ in sources."has-symbols-1.0.1" sources."is-callable-1.2.0" sources."is-date-object-1.0.2" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."js-yaml-3.14.0" sources."mdn-data-2.0.4" @@ -82662,7 +82271,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.10.0" + sources."uglify-js-3.10.1" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -82769,7 +82378,7 @@ in sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."http-signature-1.2.0" sources."is-fullwidth-code-point-2.0.0" sources."is-typedarray-1.0.0" @@ -82894,28 +82503,28 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "11.6.3"; + version = "11.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-11.6.3.tgz"; - sha512 = "tTLLgB49zkJgq6GYDJOT6F31kHLulFjzovCHpN6ycv8d/aPcYl9vv7f/luR33YBQZdnGLtn+j8+G4GJAZ6Uz6w=="; + url = "https://registry.npmjs.org/textlint/-/textlint-11.7.6.tgz"; + sha512 = "o9nhbylWjOErba1gq2bMoJzughp9JK2VbENR+NCiMsNNEiaJ1P8jbnrL3ES86D6e0QMxziR79w5l7VmmdmLjCw=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/ast-tester-2.1.6" - sources."@textlint/ast-traverse-2.1.7" - sources."@textlint/feature-flag-3.1.6" - sources."@textlint/fixer-formatter-3.1.13" - sources."@textlint/kernel-3.2.1" - sources."@textlint/linter-formatter-3.1.12" - sources."@textlint/markdown-to-ast-6.1.7" - sources."@textlint/module-interop-1.0.2" - sources."@textlint/text-to-ast-3.1.7" - sources."@textlint/textlint-plugin-markdown-5.1.12" - sources."@textlint/textlint-plugin-text-4.1.13" - sources."@textlint/types-1.3.1" - sources."@textlint/utils-1.0.3" + sources."@textlint/ast-node-types-4.3.4" + sources."@textlint/ast-tester-2.2.4" + sources."@textlint/ast-traverse-2.2.5" + sources."@textlint/feature-flag-3.2.4" + sources."@textlint/fixer-formatter-3.2.5" + sources."@textlint/kernel-3.3.6" + sources."@textlint/linter-formatter-3.2.5" + sources."@textlint/markdown-to-ast-6.2.5" + sources."@textlint/module-interop-1.1.4" + sources."@textlint/text-to-ast-3.2.4" + sources."@textlint/textlint-plugin-markdown-5.2.6" + sources."@textlint/textlint-plugin-text-4.2.6" + sources."@textlint/types-1.4.5" + sources."@textlint/utils-1.1.4" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-regex-2.1.1" @@ -82983,7 +82592,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."is-hexadecimal-1.0.4" sources."is-plain-obj-1.1.0" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."is-utf8-0.2.1" sources."is-whitespace-character-1.0.4" @@ -83001,7 +82610,7 @@ in sources."log-symbols-1.0.2" sources."map-like-2.0.0" sources."markdown-escapes-1.0.4" - sources."md5-2.2.1" + sources."md5-2.3.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -83065,7 +82674,6 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."string.prototype.padstart-3.1.0" sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" @@ -83132,7 +82740,7 @@ in sha1 = "9139c65b8da891c983b368a50a286338cd76777a"; }; dependencies = [ - sources."@textlint/ast-node-types-4.2.5" + sources."@textlint/ast-node-types-4.3.4" sources."txt-to-ast-3.0.3" ]; buildInputs = globalBuildInputs; @@ -83162,7 +82770,7 @@ in sources."has-symbols-1.0.1" sources."is-callable-1.2.0" sources."is-date-object-1.0.2" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."match-index-1.0.3" sources."object-inspect-1.8.0" @@ -83185,31 +82793,36 @@ in textlint-rule-alex = nodeEnv.buildNodePackage { name = "textlint-rule-alex"; packageName = "textlint-rule-alex"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-2.0.0.tgz"; - sha512 = "qyQsrKkSsBTk4PvQlRDDWW+A4mogoctjVAJjIDyQBVcyTqjJtkYfUNCrCXSLawnVTCgf+9ST+LuH44PoCxx2qA=="; + url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-2.1.0.tgz"; + sha512 = "+ctxNHWJNfO7IXMj+D4XOBHL1Gj7/vnroCjw8wByPxpCngfr/fmMYyaJ5H5v9dIQjY+WuPmpAp3xM4zkZqjHJQ=="; }; dependencies = [ + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/highlight-7.10.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.1" + sources."@textlint/ast-node-types-4.3.4" + sources."@textlint/types-1.4.5" + sources."@types/minimist-1.2.0" + sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" - sources."alex-8.1.1" + sources."alex-8.2.0" sources."ansi-align-3.0.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" - sources."array-find-index-1.0.2" sources."array-iterate-1.1.4" - sources."arrify-1.0.1" + sources."arrify-2.0.1" sources."bail-1.0.5" sources."balanced-match-1.0.0" sources."boundary-1.0.1" (sources."boxen-3.2.0" // { dependencies = [ sources."camelcase-5.3.1" + sources."type-fest-0.3.1" ]; }) sources."brace-expansion-1.1.11" @@ -83222,8 +82835,12 @@ in sources."pump-3.0.0" ]; }) - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" + sources."camelcase-6.0.0" + (sources."camelcase-keys-6.2.2" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -83247,7 +82864,6 @@ in sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" - sources."currently-unhandled-0.4.1" sources."cuss-1.20.0" sources."debug-4.2.0" sources."decamelize-1.2.0" @@ -83272,7 +82888,7 @@ in sources."extend-3.0.2" sources."fault-1.0.4" sources."figures-3.2.0" - sources."find-up-2.1.0" + sources."find-up-4.1.0" sources."fn-name-2.0.1" sources."format-0.2.2" sources."from-0.1.7" @@ -83289,6 +82905,7 @@ in ]; }) sources."graceful-fs-4.2.4" + sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" sources."hast-util-embedded-1.0.5" @@ -83307,7 +82924,7 @@ in sources."ignore-5.1.8" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."indent-string-3.2.0" + sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -83333,31 +82950,37 @@ in sources."is-yarn-global-0.3.0" sources."isarray-0.0.1" sources."isexe-2.0.0" + sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."keyv-3.1.0" + sources."kind-of-6.0.3" sources."latest-version-5.1.0" sources."limit-spawn-0.0.3" - sources."load-json-file-4.0.0" + sources."lines-and-columns-1.1.6" sources."load-plugin-2.3.1" - sources."locate-path-2.0.0" + sources."locate-path-5.0.0" sources."lodash.difference-4.5.0" sources."lodash.intersection-4.4.0" - sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" sources."make-dir-1.3.0" - sources."map-obj-2.0.0" + sources."map-obj-4.1.0" sources."map-stream-0.1.0" sources."markdown-escapes-1.0.4" sources."mdast-comment-marker-1.1.2" sources."mdast-util-to-nlcst-3.2.3" - sources."meow-5.0.0" + sources."meow-7.0.1" sources."mimic-response-1.0.1" + sources."min-indent-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minimist-options-3.0.2" + (sources."minimist-options-4.1.0" // { + dependencies = [ + sources."arrify-1.0.1" + ]; + }) sources."ms-2.1.2" sources."nlcst-is-literal-1.2.1" sources."nlcst-normalize-2.1.4" @@ -83372,9 +82995,9 @@ in sources."os-homedir-1.0.2" sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" @@ -83382,15 +83005,14 @@ in }) sources."parse-english-4.1.3" sources."parse-entities-1.2.2" - sources."parse-json-4.0.0" + sources."parse-json-5.0.1" sources."parse-latin-4.2.1" sources."parse5-5.1.1" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.6" - sources."path-type-3.0.0" sources."pause-stream-0.0.11" sources."pify-3.0.0" sources."pluralize-8.0.0" @@ -83400,13 +83022,21 @@ in sources."pseudomap-1.0.2" sources."pump-1.0.3" sources."pump-chain-1.0.0" - sources."quick-lru-1.1.0" + sources."quick-lru-4.0.1" sources."quotation-1.1.3" sources."rc-1.2.8" - sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) sources."readable-stream-1.0.34" - sources."redent-2.0.0" + sources."redent-3.0.0" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."rehype-parse-6.0.2" @@ -83464,9 +83094,8 @@ in sources."string-width-3.1.0" sources."string_decoder-0.10.31" sources."strip-ansi-5.2.0" - sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" - sources."strip-indent-2.0.0" + sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" sources."supports-color-5.5.0" @@ -83482,10 +83111,10 @@ in sources."to-readable-stream-1.0.0" sources."to-vfile-6.1.0" sources."trim-0.0.1" - sources."trim-newlines-2.0.0" + sources."trim-newlines-3.0.0" sources."trim-trailing-lines-1.1.3" sources."trough-1.0.5" - sources."type-fest-0.3.1" + sources."type-fest-0.13.1" sources."typedarray-0.0.6" sources."unherit-1.1.3" (sources."unified-8.4.2" // { @@ -83494,7 +83123,11 @@ in ]; }) sources."unified-diff-3.0.1" - sources."unified-engine-7.0.0" + (sources."unified-engine-7.0.0" // { + dependencies = [ + sources."parse-json-4.0.0" + ]; + }) sources."unified-message-control-2.0.0" sources."unique-string-1.0.0" sources."unist-util-inspect-4.1.4" @@ -83511,7 +83144,7 @@ in sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."vfile-4.1.1" + sources."vfile-4.2.0" sources."vfile-find-up-5.0.1" sources."vfile-location-2.0.6" sources."vfile-message-2.0.4" @@ -83542,7 +83175,11 @@ in sources."xdg-basedir-3.0.0" sources."xtend-4.0.2" sources."yallist-2.1.2" - sources."yargs-parser-10.1.0" + (sources."yargs-parser-18.1.3" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -83684,8 +83321,8 @@ in sha512 = "HydBbkWjnMn4KrnlpnusY1BGjIG+64UySxRCvRphUAIiuJL2nbkdrIIiOjwfQhllKUa7Sf33bs6RAcbEWjZVfg=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.1" + sources."@textlint/ast-node-types-4.3.4" + sources."@textlint/types-1.4.5" sources."boundary-1.0.1" sources."buffer-from-1.1.1" sources."concat-stream-2.0.0" @@ -83698,7 +83335,7 @@ in sources."inherits-2.0.4" sources."is-callable-1.2.0" sources."is-date-object-1.0.2" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."object-assign-4.1.1" sources."object-inspect-1.8.0" @@ -83750,7 +83387,7 @@ in sources."has-symbols-1.0.1" sources."is-callable-1.2.0" sources."is-date-object-1.0.2" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" @@ -83771,14 +83408,14 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.5.tgz"; - sha512 = "2oEtKX3xLpV+/K3vYiqMVeoCa5XcIylBRVV9swAXz2xTC9sg4qcJTbn4Ts0P1wZ0TZ4GPnaDj4Eb9PLFx7Ypyw=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.6.tgz"; + sha512 = "9xvmzSaye+7MJBkuq7+oVskCiSXQc/TaCeGoSV4+6n2JYMBOFu8OiDKKE3HDtnLlg9K7H0mbhNEySLGF9kPntQ=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.1" + sources."@textlint/ast-node-types-4.3.4" + sources."@textlint/types-1.4.5" sources."boundary-1.0.1" sources."lodash-4.17.19" sources."split-lines-2.0.0" @@ -83807,8 +83444,8 @@ in sha512 = "kLw4qL8RwY2lCNqgKveHc5sjCDlS5Tdw2TXWOrHvSvQxqaVOwsv3+51oMIQLGfJzQrhFSMlSlw5MvfaOerBvPQ=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.1" + sources."@textlint/ast-node-types-4.3.4" + sources."@textlint/types-1.4.5" sources."boundary-1.0.1" sources."lodash-4.17.19" sources."strip-json-comments-3.1.1" @@ -83847,7 +83484,7 @@ in sources."is-callable-1.2.0" sources."is-capitalized-1.0.0" sources."is-date-object-1.0.2" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" sources."object-inspect-1.8.0" @@ -83875,8 +83512,8 @@ in sha1 = "3c79b04091319d4e8be5fb442c596bf500e8493e"; }; dependencies = [ - sources."@textlint/ast-node-types-4.2.5" - sources."@textlint/types-1.3.1" + sources."@textlint/ast-node-types-4.3.4" + sources."@textlint/types-1.4.5" sources."adverb-where-0.0.9" sources."boundary-1.0.1" sources."define-properties-1.1.3" @@ -83923,7 +83560,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" @@ -84074,7 +83711,7 @@ in sources."graceful-fs-4.2.4" sources."grapheme-splitter-1.0.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."has-flag-4.0.0" @@ -84289,12 +83926,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - (sources."strtok3-6.0.3" // { - dependencies = [ - sources."debug-4.2.0" - sources."ms-2.1.2" - ]; - }) + sources."strtok3-6.0.4" sources."supports-color-7.1.0" sources."tar-4.4.13" sources."tlds-1.207.0" @@ -84345,10 +83977,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.118.3"; + version = "0.119.1"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.118.3.tgz"; - sha512 = "ijECXrNzDkHieoeh2H69kgawTGH8DiamhR4uBN8jEM7VHSKvfTdEvOoHsA8Aq7dh7PHAxhlqBsN5arBI3KixSw=="; + url = "https://registry.npmjs.org/three/-/three-0.119.1.tgz"; + sha512 = "GHyh/RiUfQ5VTiWIVRRTANYoXc1PFB1y+jDVRTb649nif1uX1F06PT1TKU3k2+F/MN4UJ3PWvQB53fY2OqKqKw=="; }; buildInputs = globalBuildInputs; meta = { @@ -84427,7 +84059,7 @@ in sources."glob-7.1.6" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."http-signature-1.2.0" sources."humanize-0.0.9" sources."inflight-1.0.6" @@ -84830,10 +84462,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz"; - sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.1.tgz"; + sha512 = "RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -84859,7 +84491,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -84920,7 +84552,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-4.0.2" - sources."diff2html-3.1.9" + sources."diff2html-3.1.11" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -84985,7 +84617,7 @@ in sources."ini-1.3.5" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.0" sources."is-wsl-2.2.0" @@ -85169,6 +84801,24 @@ in bypassCache = true; reconstructLock = true; }; + vim-language-server = nodeEnv.buildNodePackage { + name = "vim-language-server"; + packageName = "vim-language-server"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.1.0.tgz"; + sha512 = "i0PTJh2XEPEUvRn78j1nxTlNVcTOKr4FLwIwhkjaC0ovGGViwnBgRd7StM0NS3UCvcVzLNy78Hu31S7RHkiHbw=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "vim language server"; + homepage = "https://github.com/iamcco/vim-language-server#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; vscode-css-languageserver-bin = nodeEnv.buildNodePackage { name = "vscode-css-languageserver-bin"; packageName = "vscode-css-languageserver-bin"; @@ -85344,11 +84994,10 @@ in sources."glob-7.1.6" sources."got-6.7.1" sources."graceful-fs-4.2.4" - sources."graceful-readlink-1.0.1" sources."gray-matter-2.1.1" sources."handlebars-4.7.6" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" (sources."has-ansi-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -85447,14 +85096,10 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - (sources."seek-bzip-1.0.5" // { - dependencies = [ - sources."commander-2.8.1" - ]; - }) + sources."seek-bzip-1.0.6" sources."semver-5.7.1" sources."signal-exit-3.0.3" sources."source-map-0.6.1" @@ -85493,7 +85138,7 @@ in sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.10.0" + sources."uglify-js-3.10.1" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -85552,7 +85197,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -85748,7 +85393,7 @@ in }) (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ - sources."acorn-7.3.1" + sources."acorn-7.4.0" sources."debug-4.2.0" sources."eslint-scope-5.1.0" sources."espree-6.2.1" @@ -86178,7 +85823,7 @@ in sources."run-async-2.4.1" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -86399,7 +86044,7 @@ in sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."vfile-4.1.1" + sources."vfile-4.2.0" sources."vfile-location-2.0.6" sources."vfile-message-2.0.4" (sources."vfile-reporter-6.0.1" // { @@ -86414,7 +86059,7 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - (sources."vscode-css-languageservice-4.3.0" // { + (sources."vscode-css-languageservice-4.3.1" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-uri-2.1.2" @@ -86478,10 +86123,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "4.3.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-4.3.0.tgz"; - sha512 = "1BCFeXuMY3QHnlkiUqgCV4ODNN84X3mX4GJk+Gb8tFv0Z8Grj4LneYa4A/0txoxpsz5E05THnKtb31t0XPJ8EQ=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-5.0.0.tgz"; + sha512 = "K5rzVijxNbOjxv+au1Sj7J82s1/CCyBQ9bhJE9TWdOD3OLELhC3bWJHyNJ1u2sT+kf8guaJjFvPnd6WG67PHtw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -86496,42 +86141,35 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/polyfill-7.7.0" - sources."@babel/runtime-7.7.7" - sources."@babel/runtime-corejs3-7.10.5" + sources."@babel/polyfill-7.10.4" + sources."@babel/runtime-7.10.5" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."JSONSelect-0.2.1" - sources."acorn-6.4.1" + sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.26.0" // { - dependencies = [ - sources."@babel/runtime-7.10.2" - ]; - }) + sources."addons-linter-2.1.0" sources."adm-zip-0.4.16" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."ajv-merge-patch-4.1.0" - (sources."ansi-align-3.0.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - sources."ansi-escapes-3.2.0" + sources."ansi-align-3.0.0" + sources."ansi-colors-4.1.1" sources."ansi-regex-2.1.1" sources."ansi-styles-4.2.1" sources."any-promise-1.3.0" - sources."anymatch-2.0.0" + (sources."anymatch-3.1.1" // { + dependencies = [ + sources."normalize-path-3.0.0" + ]; + }) (sources."archiver-2.1.1" // { dependencies = [ sources."async-2.6.3" @@ -86565,6 +86203,7 @@ in sources."async-0.2.10" sources."async-each-1.0.3" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atomic-sleep-1.0.0" sources."aws-sign2-0.7.0" @@ -86577,7 +86216,7 @@ in }) sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-1.13.1" + sources."binary-extensions-2.1.0" sources."bindings-1.5.0" (sources."bl-1.2.2" // { dependencies = [ @@ -86598,6 +86237,7 @@ in (sources."boxen-4.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" + sources."camelcase-5.3.1" sources."chalk-3.0.0" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -86606,12 +86246,7 @@ in ]; }) sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) + sources."braces-3.0.2" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -86619,7 +86254,7 @@ in sources."buffer-equal-constant-time-1.0.1" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" - sources."bunyan-1.8.12" + sources."bunyan-1.8.14" sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -86627,18 +86262,16 @@ in ]; }) sources."callsites-3.1.0" - sources."camelcase-5.3.1" + sources."camelcase-6.0.0" sources."caseless-0.12.0" sources."chalk-4.1.0" - sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.3" - (sources."chokidar-2.1.8" // { + (sources."chokidar-3.4.1" // { dependencies = [ - sources."fsevents-1.2.13" sources."normalize-path-3.0.0" ]; }) - (sources."chrome-launcher-0.13.3" // { + (sources."chrome-launcher-0.13.4" // { dependencies = [ sources."mkdirp-0.5.5" sources."rimraf-3.0.2" @@ -86663,8 +86296,6 @@ in ]; }) sources."cli-boxes-2.2.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -86703,7 +86334,6 @@ in sources."configstore-5.0.1" sources."copy-descriptor-0.1.1" sources."core-js-2.6.11" - sources."core-js-pure-3.6.5" sources."core-util-is-1.0.2" sources."crc-3.8.0" (sources."crc32-stream-2.0.0" // { @@ -86713,18 +86343,14 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."css-select-1.2.0" sources."css-what-2.1.3" sources."dashdash-1.14.1" sources."debounce-1.2.0" sources."debug-2.6.9" - sources."decamelize-3.2.0" + sources."decamelize-4.0.0" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-equal-1.1.1" @@ -86737,10 +86363,9 @@ in sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - (sources."dispensary-0.51.2" // { + (sources."dispensary-0.52.0" // { dependencies = [ sources."async-3.2.0" - sources."pino-6.0.0" ]; }) sources."doctrine-3.0.0" @@ -86755,6 +86380,7 @@ in sources."ecdsa-sig-formatter-1.0.11" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" + sources."enquirer-2.3.6" sources."entities-1.1.2" sources."error-ex-1.3.2" sources."es-abstract-1.17.6" @@ -86762,34 +86388,21 @@ in sources."es6-error-4.1.1" sources."es6-promise-2.3.0" sources."es6-promisify-6.1.1" + sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-5.16.0" // { + (sources."eslint-7.5.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."ansi-regex-5.0.0" sources."debug-4.2.0" - sources."espree-5.0.1" - sources."has-flag-3.0.0" - sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."semver-5.7.1" - sources."strip-ansi-4.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" + sources."strip-ansi-6.0.0" ]; }) sources."eslint-plugin-no-unsanitized-3.1.2" - sources."eslint-scope-4.0.3" - sources."eslint-utils-1.4.3" - sources."eslint-visitor-keys-1.2.0" - (sources."espree-6.2.1" // { - dependencies = [ - sources."acorn-7.3.1" - ]; - }) + sources."eslint-scope-5.1.0" + sources."eslint-utils-2.1.0" + sources."eslint-visitor-keys-1.3.0" + sources."espree-7.2.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ @@ -86800,17 +86413,7 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."event-to-promise-0.8.0" - (sources."execa-4.0.3" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."mimic-fn-2.1.0" - sources."onetime-5.1.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."execa-4.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -86826,22 +86429,19 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" sources."kind-of-5.1.0" ]; }) sources."extend-3.0.2" - sources."extend-shallow-3.0.2" - (sources."external-editor-3.1.0" // { + (sources."extend-shallow-3.0.2" // { dependencies = [ - sources."tmp-0.0.33" + sources."is-extendable-1.0.1" ]; }) (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" ]; }) sources."extsprintf-1.3.0" @@ -86856,22 +86456,17 @@ in sources."fast-redact-2.0.0" sources."fast-safe-stringify-2.0.7" sources."fd-slicer-1.1.0" - sources."figures-2.0.0" sources."file-entry-cache-5.0.1" sources."file-uri-to-path-1.0.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) + sources."fill-range-7.0.1" sources."find-up-4.1.0" - (sources."firefox-profile-1.3.1" // { + (sources."firefox-profile-2.0.0" // { dependencies = [ sources."async-2.5.0" + sources."fs-extra-4.0.3" ]; }) - sources."first-chunk-stream-3.0.0" + sources."first-chunk-stream-4.0.0" sources."flat-cache-2.0.1" sources."flatstr-1.0.12" sources."flatted-2.0.2" @@ -86881,12 +86476,17 @@ in sources."form-data-2.3.3" sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" - sources."fs-extra-4.0.3" + (sources."fs-extra-9.0.1" // { + dependencies = [ + sources."jsonfile-6.0.1" + sources."universalify-1.0.0" + ]; + }) sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - (sources."fx-runner-1.0.12" // { + (sources."fx-runner-1.0.13" // { dependencies = [ sources."commander-2.9.0" sources."isexe-1.1.2" @@ -86897,19 +86497,10 @@ in sources."get-stream-5.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - (sources."git-rev-sync-2.0.0" // { - dependencies = [ - sources."graceful-fs-4.1.15" - ]; - }) sources."glob-7.1.6" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) + sources."glob-parent-5.1.1" sources."global-dirs-2.0.1" - sources."globals-11.12.0" + sources."globals-12.4.0" (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" @@ -86919,13 +86510,18 @@ in sources."graceful-readlink-1.0.1" sources."growly-1.3.0" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."kind-of-4.0.0" ]; }) @@ -86934,7 +86530,6 @@ in 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."ieee754-1.1.13" sources."ignore-4.0.6" sources."import-fresh-3.2.1" @@ -86943,48 +86538,31 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-6.5.2" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."strip-ansi-5.2.0" - sources."supports-color-5.5.0" - ]; - }) - sources."interpret-1.4.0" sources."invert-kv-3.0.1" sources."is-absolute-0.1.7" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" - sources."is-binary-path-1.0.1" + sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-callable-1.2.0" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" - sources."is-docker-2.0.0" - sources."is-extendable-1.0.1" + sources."is-docker-2.1.1" + sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" sources."is-mergeable-object-1.1.1" sources."is-npm-4.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-relative-0.1.3" sources."is-stream-2.0.0" sources."is-symbol-1.0.3" @@ -87033,7 +86611,7 @@ in ]; }) sources."lcid-3.1.1" - sources."levn-0.3.0" + sources."levn-0.4.1" sources."lighthouse-logger-1.2.0" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" @@ -87056,26 +86634,44 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-1.0.25" - (sources."mem-5.1.1" // { + sources."mdn-browser-compat-data-1.0.31" + sources."mem-5.1.1" + sources."merge-stream-2.0.0" + (sources."micromatch-3.1.10" // { dependencies = [ - sources."mimic-fn-2.1.0" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-range-2.1.1" ]; }) - sources."merge-stream-2.0.0" - sources."micromatch-3.1.10" sources."mime-db-1.44.0" sources."mime-types-2.1.27" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mixin-deep-1.3.2" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."mkdirp-1.0.4" sources."moment-2.27.0" sources."ms-2.0.0" sources."multimatch-4.0.0" - sources."mute-stream-0.0.7" (sources."mv-2.1.1" // { dependencies = [ sources."glob-6.0.4" @@ -87091,20 +86687,15 @@ in sources."ncp-2.0.0" sources."neo-async-2.6.2" sources."next-tick-1.1.0" - sources."nice-try-1.0.5" sources."node-forge-0.7.6" - (sources."node-notifier-6.0.0" // { + (sources."node-notifier-7.0.2" // { dependencies = [ - sources."semver-6.3.0" + sources."uuid-8.3.0" ]; }) sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" - (sources."npm-run-path-4.0.1" // { - dependencies = [ - sources."path-key-3.1.1" - ]; - }) + sources."npm-run-path-4.0.1" sources."nth-check-1.0.2" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" @@ -87128,12 +86719,11 @@ in sources."object.assign-4.1.0" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-2.0.1" - sources."open-7.0.0" - sources."optionator-0.8.3" + sources."onetime-5.1.1" + sources."open-7.1.0" + sources."optionator-0.9.1" sources."os-locale-5.0.0" sources."os-shim-0.1.3" - sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-defer-1.0.0" sources."p-is-promise-2.1.0" @@ -87147,18 +86737,17 @@ in }) sources."pako-1.0.11" sources."parent-module-1.0.1" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" sources."parse5-3.0.3" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" - sources."path-parse-1.0.6" + sources."path-key-3.1.1" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pino-6.3.2" + sources."picomatch-2.2.2" + sources."pino-6.4.0" sources."pino-std-serializers-2.4.2" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.32" // { @@ -87175,7 +86764,7 @@ in sources."supports-color-6.1.0" ]; }) - sources."prelude-ls-1.1.2" + sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" sources."probe-image-size-5.0.0" sources."process-nextick-args-2.0.1" @@ -87183,6 +86772,7 @@ in sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" + sources."pupa-2.0.1" sources."qs-6.5.2" sources."quick-format-unescaped-4.0.1" (sources."rc-1.2.8" // { @@ -87191,18 +86781,11 @@ in ]; }) sources."readable-stream-3.6.0" - (sources."readdirp-2.2.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."rechoir-0.6.2" + sources."readdirp-3.4.0" sources."regenerator-runtime-0.13.7" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.0" - sources."regexpp-2.0.1" + sources."regexpp-3.1.0" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" (sources."relaxed-json-1.0.3" // { @@ -87221,15 +86804,11 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" - sources."run-async-2.4.1" - sources."rxjs-6.6.0" sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" @@ -87245,23 +86824,16 @@ in (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" ]; }) sources."sha.js-2.4.11" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" - sources."shelljs-0.7.7" sources."shellwords-0.1.1" - (sources."sign-addon-2.0.5" // { + (sources."sign-addon-2.0.6" // { dependencies = [ - sources."core-js-3.6.4" - sources."es6-promisify-6.0.2" - sources."punycode-1.4.1" - sources."request-2.88.0" - sources."source-map-support-0.5.16" - sources."tough-cookie-2.4.3" + sources."core-js-3.6.5" ]; }) sources."signal-exit-3.0.3" @@ -87287,7 +86859,6 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" sources."kind-of-5.1.0" sources."source-map-0.5.7" ]; @@ -87331,16 +86902,11 @@ in }) sources."stream-parser-0.3.1" sources."stream-to-array-2.3.0" - (sources."stream-to-promise-2.2.0" // { - dependencies = [ - sources."end-of-stream-1.1.0" - sources."once-1.3.3" - ]; - }) - (sources."string-width-2.1.1" // { + sources."stream-to-promise-3.0.0" + (sources."string-width-3.1.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."string.prototype.trimend-1.0.1" @@ -87349,17 +86915,15 @@ in sources."strip-ansi-3.0.1" sources."strip-bom-4.0.0" sources."strip-bom-buf-2.0.0" - sources."strip-bom-stream-4.0.0" - sources."strip-final-newline-2.0.0" - sources."strip-json-comments-3.0.1" - sources."supports-color-7.1.0" - (sources."table-5.4.6" // { + (sources."strip-bom-stream-4.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."first-chunk-stream-3.0.0" ]; }) + sources."strip-final-newline-2.0.0" + sources."strip-json-comments-3.1.1" + sources."supports-color-7.1.0" + sources."table-5.4.6" (sources."tar-stream-1.6.2" // { dependencies = [ sources."readable-stream-2.3.7" @@ -87372,7 +86936,11 @@ in sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."through-2.3.8" - sources."tmp-0.1.0" + (sources."tmp-0.2.1" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) sources."to-buffer-1.1.1" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -87381,24 +86949,19 @@ in }) sources."to-readable-stream-1.0.0" sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" + sources."to-regex-range-5.0.1" sources."tosource-1.0.0" sources."tough-cookie-2.5.0" sources."tr46-2.0.2" sources."traverse-0.4.6" - sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" + sources."type-check-0.4.0" sources."type-detect-4.0.8" sources."type-fest-0.8.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - (sources."union-value-1.0.1" // { - dependencies = [ - sources."is-extendable-0.1.1" - ]; - }) + sources."union-value-1.0.1" sources."unique-string-2.0.0" sources."universalify-0.1.2" (sources."unset-value-1.0.0" // { @@ -87412,7 +86975,7 @@ in ]; }) sources."upath-1.2.0" - (sources."update-notifier-4.0.0" // { + (sources."update-notifier-4.1.0" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -87423,13 +86986,40 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" + sources."v8-compile-cache-2.1.1" sources."verror-1.10.0" - sources."watchpack-1.6.1" + sources."watchpack-1.7.4" + (sources."watchpack-chokidar2-2.0.0" // { + dependencies = [ + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."fsevents-1.2.13" + sources."glob-parent-3.1.0" + sources."is-binary-path-1.0.1" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."normalize-path-3.0.0" + sources."readable-stream-2.3.7" + sources."readdirp-2.2.1" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + sources."to-regex-range-2.1.1" + ]; + }) sources."wcwidth-1.0.1" sources."webidl-conversions-5.0.0" sources."whatwg-url-8.1.0" sources."when-3.7.7" - sources."which-1.3.1" + sources."which-2.0.2" sources."which-module-2.0.0" (sources."widest-line-3.1.0" // { dependencies = [ @@ -87458,14 +87048,13 @@ in ]; }) sources."write-file-atomic-3.0.3" - sources."ws-7.2.3" + sources."ws-7.3.1" sources."xdg-basedir-4.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - sources."xregexp-4.3.0" sources."xtend-4.0.2" sources."y18n-4.0.0" - (sources."yargs-15.3.1" // { + (sources."yargs-15.4.1" // { dependencies = [ sources."ansi-regex-5.0.0" sources."decamelize-1.2.0" @@ -87477,6 +87066,7 @@ in }) (sources."yargs-parser-18.1.3" // { dependencies = [ + sources."camelcase-5.3.1" sources."decamelize-1.2.0" ]; }) @@ -87507,10 +87097,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.43.0"; + version = "4.44.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; - sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz"; + sha512 = "4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ=="; }; dependencies = [ sources."@webassemblyjs/ast-1.9.0" @@ -87536,7 +87126,7 @@ in sources."acorn-6.4.1" sources."ajv-6.12.3" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.1" + sources."ajv-keywords-3.5.2" sources."anymatch-3.1.1" sources."aproba-1.2.0" sources."arr-diff-4.0.0" @@ -87584,7 +87174,7 @@ in sources."bn.js-4.11.9" ]; }) - (sources."browserify-sign-4.2.0" // { + (sources."browserify-sign-4.2.1" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -87636,7 +87226,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - (sources."create-ecdh-4.0.3" // { + (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -87996,7 +87586,7 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" - sources."watchpack-1.7.2" + sources."watchpack-1.7.4" (sources."watchpack-chokidar2-2.0.0" // { dependencies = [ sources."anymatch-2.0.0" @@ -88352,11 +87942,11 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."accepts-1.3.7" sources."ajv-6.12.3" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.1" + sources."ajv-keywords-3.5.2" sources."ansi-colors-3.2.4" sources."ansi-html-0.0.7" sources."ansi-regex-2.1.1" @@ -88611,7 +88201,7 @@ in sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-stream-1.1.0" sources."is-symbol-1.0.3" sources."is-windows-1.0.2" @@ -88695,7 +88285,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pkg-dir-3.0.0" - (sources."portfinder-1.0.27" // { + (sources."portfinder-1.0.28" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -88944,7 +88534,7 @@ in sources."@types/json-schema-7.0.5" sources."aggregate-error-3.0.1" sources."ajv-6.12.3" - sources."ajv-keywords-3.5.1" + sources."ajv-keywords-3.5.2" sources."array-union-2.1.0" sources."balanced-match-1.0.0" sources."big.js-5.2.2" @@ -88991,7 +88581,7 @@ in sources."minipass-3.1.3" sources."minipass-collect-1.0.2" sources."minipass-flush-1.0.5" - sources."minipass-pipeline-1.2.3" + sources."minipass-pipeline-1.2.4" sources."minizlib-2.1.0" sources."mkdirp-1.0.4" sources."normalize-path-3.0.0" @@ -89062,7 +88652,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.14" + sources."@types/node-13.13.15" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -89168,7 +88758,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-1.9.1" sources."is-ascii-1.0.0" - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-file-1.0.0" sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" @@ -89406,7 +88996,7 @@ in sources."prettier-1.19.1" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.7.0" + sources."vscode-json-languageservice-3.8.0" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -89464,14 +89054,14 @@ in sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/runtime-7.10.5" + sources."@babel/runtime-7.11.1" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.24" + sources."@types/node-14.0.27" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.0.1" @@ -89740,7 +89330,7 @@ in sources."graceful-fs-4.2.4" sources."grouped-queue-1.1.0" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" (sources."has-ansi-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -90069,7 +89659,7 @@ in sources."root-check-1.0.0" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -90330,7 +89920,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."npm-run-path-4.0.1" - sources."onetime-5.1.0" + sources."onetime-5.1.1" sources."path-key-3.1.1" sources."restore-cursor-3.1.0" sources."semver-7.3.2" @@ -90376,7 +89966,7 @@ in sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."parse-json-5.0.0" + sources."parse-json-5.0.1" (sources."path-type-3.0.0" // { dependencies = [ sources."pify-3.0.0" diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 1331c10d426b9..f384704a1c4ac 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,25 +1,24 @@ { lib, fetchurl, buildDunePackage, opaline, ocaml , alcotest -, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, ocaml_lwt, pandoc, re }: +, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, odoc, ocaml_lwt, pandoc, re }: buildDunePackage rec { pname = "mdx"; - version = "1.6.0"; + version = "1.7.0"; + useDune2 = true; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - sha256 = "18m4ay226dwbgnwp3ia6bfcm033dvp9yby0lbddqn8ak374m2k3b"; + sha256 = "0vpc30sngl3vpychrfvjwyi93mk311x3f2azlkxasgcj69fq03i7"; }; nativeBuildInputs = [ cppo ]; buildInputs = [ cmdliner ]; - propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version re ]; + propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version odoc re ]; checkInputs = [ alcotest ocaml_lwt pandoc ]; doCheck = true; - dontStrip = lib.versions.majorMinor ocaml.version == "4.04"; - outputs = [ "bin" "lib" "out" ]; installPhase = '' diff --git a/pkgs/development/ocaml-modules/mustache/default.nix b/pkgs/development/ocaml-modules/mustache/default.nix new file mode 100644 index 0000000000000..267aa17e9e42d --- /dev/null +++ b/pkgs/development/ocaml-modules/mustache/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, ezjsonm, menhir, ounit }: + +buildDunePackage rec { + pname = "mustache"; + version = "3.1.0"; + src = fetchFromGitHub { + owner = "rgrinberg"; + repo = "ocaml-mustache"; + rev = "v${version}"; + sha256 = "19v8rk8d8lkfm2rmhdawfgadji6wa267ir5dprh4w9l1sfj8a1py"; + }; + + buildInputs = [ ezjsonm ]; + propagatedBuildInputs = [ menhir ]; + + doCheck = true; + checkInputs = [ ounit ]; + + meta = { + description = "Mustache logic-less templates in OCaml"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 3d5afd52abdda..84f54fd7af62a 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -26,11 +26,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.19"; + version = "0.29.21"; src = fetchPypi { inherit pname version; - sha256 = "0n2j87nka8cs772qc60d0c7lrpvsw0y8p3qzvhrsi3nmq1yqmycp"; + sha256 = "1bcwpra7c6k30yvic3sw2v3rq2dr40ypc4zqif6kr52mpn4wnyp5"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 04b2d898e66a1..c3b624a7bceda 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -19,6 +19,10 @@ buildPythonPackage rec { sha256 = "0s94m17yph1gq9f2svipb3bbwbw1s4j3zf2xkg5h91006v8286r6"; }; + postPatch = '' + substituteInPlace alot/settings/manager.py --replace /usr/share "$out/share" + ''; + nativeBuildInputs = lib.optional withManpage sphinx; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix new file mode 100644 index 0000000000000..b1ed1c45f85a4 --- /dev/null +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, voluptuous, aiohttp, async-timeout, python-didl-lite, defusedxml +, pytest, pytest-asyncio }: + +buildPythonPackage rec { + pname = "async-upnp-client"; + version = "0.14.14"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "StevenLooman"; + repo = "async_upnp_client"; + rev = version; + sha256 = "1ysj72l4z78h427ar95x7af0jw0xq1cbca0k8b34vqyyhgs8wc6y"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + defusedxml + python-didl-lite + voluptuous + ]; + + checkInputs = [ + pytest + pytest-asyncio + ]; + + meta = with lib; { + description = "Asyncio UPnP Client library for Python/asyncio."; + homepage = "https://github.com/StevenLooman/async_upnp_client"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index d36328d7225b1..dda3d35f6adda 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ''; # https://github.com/Martiusweb/asynctest/issues/132 - doCheck = pythonOlder "3.8"; + doCheck = pythonOlder "3.7"; checkPhase = '' ${python.interpreter} -m unittest test diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 2dabb70197b5f..1b40aa9c1408b 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.3"; + version = "1.5.4"; src = fetchPypi { inherit pname version; - sha256 = "60fd8c4341bab59963dafd5d2a566e94f547e660b9b396f772afe67d8481dbf0"; + sha256 = "d21d3901cb0da6ebd1e83fc9b0dfbde8b46afc2ede4fe32fbda0c7c6118ca094"; }; propagatedBuildInputs = [ pycodestyle toml ]; diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix new file mode 100644 index 0000000000000..b560c9ec0832a --- /dev/null +++ b/pkgs/development/python-modules/brother/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, pysnmp +, asynctest, pytestcov, pytestrunner, pytest-asyncio, pytest-trio, pytest-tornasync }: + +buildPythonPackage rec { + pname = "brother"; + version = "0.1.14"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bieniu"; + repo = pname; + rev = version; + sha256 = "11pkr30bxrzgbz6bi42dyhav6qhr7rz9fb6a13297g7wa77jn4r4"; + }; + + propagatedBuildInputs = [ + pysnmp + ]; + + checkInputs = [ + asynctest + pytestcov + pytestrunner + pytest-asyncio + pytest-trio + pytest-tornasync + ]; + + meta = with lib; { + description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP."; + homepage = "https://github.com/bieniu/brother"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix new file mode 100644 index 0000000000000..aabcd4de93433 --- /dev/null +++ b/pkgs/development/python-modules/bsdiff4/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, aflplusplus +}: + +buildPythonPackage rec { + pname = "bsdiff4"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "17fc0dd4204x5gqapvbrc4kv83jdajs00jxm739586pl0iapybrw"; + }; + + checkPhase = '' + mv bsdiff4 _bsdiff4 + python -c 'import bsdiff4; bsdiff4.test()' + ''; + + meta = with stdenv.lib; { + description = "binary diff and patch using the BSDIFF4-format"; + homepage = "https://github.com/ilanschnell/bsdiff4"; + license = licenses.bsdProtection; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index 98fc3b9ff058f..83fc0d371c1d1 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -10,7 +10,7 @@ , networkx , numpy , pandas -, pythonProtobuf # pythonPackages.protobuf +, protobuf , requests , scipy , sortedcontainers @@ -28,15 +28,15 @@ buildPythonPackage rec { pname = "cirq"; - version = "0.8.0"; + version = "0.8.2"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "quantumlib"; repo = "cirq"; rev = "v${version}"; - sha256 = "01nnv7r595sp60wvp7750lfdjwdsi4q0r4lmaj6li09zsdw0r4b3"; + sha256 = "0xs46s19idh8smf80zhgraxwh3lphcdbljdrhxwhi5xcc41dfsmf"; }; patches = [ @@ -48,14 +48,6 @@ buildPythonPackage rec { }) ]; - # Cirq locks protobuf==3.8.0, but tested working with default pythonPackages.protobuf (3.7). This avoids overrides/pythonPackages.protobuf conflicts - postPatch = '' - substituteInPlace requirements.txt \ - --replace "networkx~=2.4" "networkx" \ - --replace "protobuf==3.8.0" "protobuf" \ - --replace "freezegun~=0.3.15" "freezegun" - ''; - propagatedBuildInputs = [ freezegun google_api_core @@ -63,7 +55,7 @@ buildPythonPackage rec { matplotlib networkx pandas - pythonProtobuf + protobuf requests scipy sortedcontainers diff --git a/pkgs/development/python-modules/click-datetime/default.nix b/pkgs/development/python-modules/click-datetime/default.nix new file mode 100644 index 0000000000000..ba710d74355d8 --- /dev/null +++ b/pkgs/development/python-modules/click-datetime/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, click }: + +buildPythonPackage rec { + pname = "click-datetime"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "click-contrib"; + repo = pname; + rev = version; + sha256 = "1yxagk4wd2h77nxml19bn2y26fv2xw2n9g981ls8mjy0g51ms3gh"; + }; + + propagatedBuildInputs = [ click ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "click_datetime" ]; + + meta = with lib; { + description = "Datetime type support for click."; + homepage = "https://github.com/click-contrib/click-datetime"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 7219f48e6f994..9f7bb3f1adb99 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "2.9.2"; # Also update the hash in vectors.nix + version = "3.0"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229"; + sha256 = "0lr06a9317n2iwfqwz9mpalqm99acqwk1478arvyj1jj0ay4v4lf"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 096eab77bec3b..02a3f44bb098e 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1d4iykcv7cn9j399hczlxm5pzxmqy6d80h3j16dkjwlmv3293b4r"; + sha256 = "0fa26ggksyhknb43cja1g0jwp35qkdbavivdq6yynj1igd2z1vsj"; }; # No tests included diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 855ee930b7725..5d1fd9ef0be4f 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "dbus-python"; - version = "1.2.12"; + version = "1.2.16"; format = "other"; outputs = [ "out" "dev" ]; src = fetchPypi { inherit pname version; - sha256 = "0q7jmldv0bxxqnbj63cd7i81vs6y85xys4r0n63z4n2y9wndxm6d"; + sha256 = "196m5rk3qzw5nkmgzjl7wmq0v7vpwfhh8bz2sapdi5f9hqfqy8qi"; }; patches = [ diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index b9e8e25ac437f..8e8fd28f0b543 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -1,25 +1,17 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi }: buildPythonPackage rec { pname = "decorator"; - version = "4.4.1"; + version = "4.4.2"; src = fetchPypi { inherit pname version; - sha256 = "54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce"; + sha256 = "1rxzhk5zwiggk45hl53zydvy70lk654kg0nc1p54090p402jz9p3"; }; - patches = [ - (fetchpatch { - url = "https://github.com/micheles/decorator/commit/3265f2755d16c0a3dfc9f1feee39722ddc11ee80.patch"; - sha256 = "1q5nmff30vccqq5swf2ivm8cn7x3lhz8c9qpj0zddgs2y7fw8syz"; - }) - ]; - meta = with lib; { homepage = "https://pypi.python.org/pypi/decorator"; description = "Better living through Python with decorators"; diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix new file mode 100644 index 0000000000000..1cdf0449c68c2 --- /dev/null +++ b/pkgs/development/python-modules/deepmerge/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, vcver }: + +buildPythonPackage rec { + pname = "deepmerge"; + version = "0.1.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0d1ab9lxwymqxxd58j50id1wib48xym3ss5xw172i2jfwwwzfdrx"; + }; + + propagatedBuildInputs = [ + vcver + ]; + + # depends on https://pypi.org/project/uranium/ + doCheck = false; + + pythonImportsCheck = [ "deepmerge" ]; + + meta = with lib; { + description = "A toolset to deeply merge python dictionaries."; + homepage = "http://deepmerge.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix new file mode 100644 index 0000000000000..557be014f86cd --- /dev/null +++ b/pkgs/development/python-modules/eliot/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, aiocontextvars +, boltons +, hypothesis +, pyrsistent +, pytest +, setuptools +, six +, testtools +, zope_interface +}: + +buildPythonPackage rec { + pname = "eliot"; + version = "1.12.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wabv7hk63l12881f4zw02mmj06583qsx2im0yywdjlj8f56vqdn"; + }; + + checkInputs = [ + hypothesis + testtools + pytest + ]; + + propagatedBuildInputs = [ + aiocontextvars + boltons + pyrsistent + setuptools + six + zope_interface + ]; + + pythonImportsCheck = [ "eliot" ]; + + # Tests run eliot-prettyprint in out/bin. + # test_parse_stream is broken, skip it. + checkPhase = '' + export PATH=$out/bin:$PATH + pytest -k 'not test_parse_stream' + ''; + + meta = with stdenv.lib; { + homepage = "https://eliot.readthedocs.io"; + description = "Logging library that tells you why it happened"; + license = licenses.asl20; + maintainers = [ maintainers.dpausp ]; + }; +} diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 4b28e07a6cee1..37ffc8beca556 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.29.0"; + version = "1.31.0"; src = fetchPypi { inherit pname version; - sha256 = "0f681c1ebd5472b804baa391b16dc59d92b065903999566f4776bfbd010bcec9"; + sha256 = "3b08cbd3f4d5b60e3bff8f859e6e03db739967a684268164abc940415e23ca51"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix index 8bb20fafe76e1..c951c97b20f4d 100644 --- a/pkgs/development/python-modules/gyp/default.nix +++ b/pkgs/development/python-modules/gyp/default.nix @@ -14,10 +14,6 @@ buildPythonPackage { sha256 = "0r9phq5yrmj968vdvy9vivli35wn1j9a6iwshp69wl7q4p0x8q2b"; }; - prePatch = stdenv.lib.optionals stdenv.isDarwin '' - sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' pylib/gyp/xcode_emulation.py - ''; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-darwin-cflags.patch ./no-xcode.patch diff --git a/pkgs/development/python-modules/gyp/no-xcode.patch b/pkgs/development/python-modules/gyp/no-xcode.patch index d202b7224744f..0e46865846a87 100644 --- a/pkgs/development/python-modules/gyp/no-xcode.patch +++ b/pkgs/development/python-modules/gyp/no-xcode.patch @@ -1,12 +1,25 @@ ---- a/pylib/gyp/xcode_emulation.py -+++ b/pylib/gyp/xcode_emulation.py -@@ -1470,7 +1470,8 @@ +--- gyp-old/pylib/gyp/xcode_emulation.py 1980-01-02 00:00:00.000000000 -0600 ++++ gyp/pylib/gyp/xcode_emulation.py 2020-08-02 20:24:24.871322520 -0500 +@@ -1407,10 +1407,10 @@ + raise GypError("xcodebuild returned unexpected results") + except: + version = CLTVersion() +- if version: ++ if version and re.match(r'(\d\.\d\.?\d*)', version): + version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0] + else: +- raise GypError("No Xcode or CLT version detected!") ++ version = '7.0.0' + # The CLT has no build information, so we return an empty string. + version_list = [version, ''] + version = version_list[0] +@@ -1667,7 +1667,8 @@ sdk_root = xcode_settings._SdkRoot(configuration) if not sdk_root: sdk_root = xcode_settings._XcodeSdkPath('') - env['SDKROOT'] = sdk_root -+ if sdk_root: -+ env['SDKROOT'] = sdk_root ++ if not sdk_root: ++ env['SDKROOT'] = '' if not additional_settings: additional_settings = {} diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix new file mode 100644 index 0000000000000..de9c7995bde97 --- /dev/null +++ b/pkgs/development/python-modules/hwi/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mnemonic +, ecdsa +, typing-extensions +, hidapi +, libusb1 +, pyaes +, trezor +, btchip +, ckcc-protocol +}: + +buildPythonPackage rec { + pname = "hwi"; + version = "1.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "eec460a51eb556500c1eca92015be246d5714cd53171407a76da71e4346048ae"; + }; + + propagatedBuildInputs = [ + mnemonic + ecdsa + typing-extensions + hidapi + libusb1 + pyaes + trezor + btchip + ckcc-protocol + ]; + + patches = [ ./relax-deps.patch ]; + + # tests are not packaged in the released tarball + doCheck = false; + + pythonImportsCheck = [ + "hwilib" + ]; + + meta = { + description = "Bitcoin Hardware Wallet Interface"; + homepage = "https://github.com/bitcoin-core/hwi"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/hwi/relax-deps.patch b/pkgs/development/python-modules/hwi/relax-deps.patch new file mode 100644 index 0000000000000..ff6c6b9768f62 --- /dev/null +++ b/pkgs/development/python-modules/hwi/relax-deps.patch @@ -0,0 +1,16 @@ +--- a/setup.py ++++ b/setup.py +@@ -98,10 +98,10 @@ package_data = \ + modules = \ + ['hwi', 'hwi-qt'] + install_requires = \ +-['ecdsa>=0.13.0,<0.14.0', +- 'hidapi>=0.7.99,<0.8.0', ++['ecdsa', ++ 'hidapi', + 'libusb1>=1.7,<2.0', ++ 'mnemonic', +- 'mnemonic>=0.18.0,<0.19.0', + 'pyaes>=1.6,<2.0', + 'typing-extensions>=3.7,<4.0'] + diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix new file mode 100644 index 0000000000000..d3574af9d3144 --- /dev/null +++ b/pkgs/development/python-modules/liblarch/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, python +, pygobject3 +, xvfb_run +, gobject-introspection +, gtk3 +, pythonOlder +}: + +buildPythonPackage rec { + version = "3.0.1"; + pname = "liblarch"; + disabled = pythonOlder "3.5.0"; + + src = fetchFromGitHub { + owner = "getting-things-gnome"; + repo = "liblarch"; + rev = "v${version}"; + sha256 = "0xv2mfvyzipbny3iz8vll77wsqxfwh28xj6bj1ff0l452waph45m"; + }; + + checkInputs = [ + gobject-introspection # for setup hook + gtk3 + ]; + + propagatedBuildInputs = [ + pygobject3 + ]; + + checkPhase = '' + runHook preCheck + ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \ + ${python.interpreter} nix_run_setup test + runHook postCheck + ''; + + meta = with stdenv.lib; { + description = "A python library built to easily handle data structure such are lists, trees and acyclic graphs"; + homepage = "https://github.com/getting-things-gnome/liblarch"; + downloadPage = "https://github.com/getting-things-gnome/liblarch/releases"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ oyren ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index f39e71ed6901c..aa009e0a3e732 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub , cython , libxml2 , libxslt @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.5.0"; + version = "4.5.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${version}"; - sha256 = "1i3bhg8xb502afq4ar3kgvvi1hy83l4af2gznfwqvb5b221fr7ak"; + sha256 = "1d0cpwdjxfzwjzmnz066ibzicyj2vhx15qxmm775l8hxqi65xps4"; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs @@ -25,7 +25,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "lxml" "lxml.etree" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = "https://lxml.de"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix new file mode 100644 index 0000000000000..5cf070d610fbc --- /dev/null +++ b/pkgs/development/python-modules/openwebifpy/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, requests, zeroconf, wakeonlan +, python }: + +buildPythonPackage rec { + pname = "openwebifpy"; + version = "3.1.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zqa74i54ww9qjciiv8s58mxbs6vxq06cq5k4pxfarc0l75l4gh2"; + }; + + propagatedBuildInputs = [ + requests + zeroconf + wakeonlan + ]; + + checkPhase = '' + ${python.interpreter} setup.py test + ''; + + meta = with lib; { + description = "Provides a python interface to interact with a device running OpenWebIf"; + homepage = "https://openwebifpy.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} + diff --git a/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch b/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch deleted file mode 100644 index d5b669dab7a91..0000000000000 --- a/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a027e2590d5d2d384d23568a8d47b7095054b6b7 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk <fridh@fridh.nl> -Date: Thu, 19 Dec 2019 19:51:07 +0100 -Subject: [PATCH] Find include directory - ---- - pybind11/__init__.py | 33 +-------------------------------- - 1 file changed, 1 insertion(+), 32 deletions(-) - -diff --git a/pybind11/__init__.py b/pybind11/__init__.py -index c625e8c..c8a707b 100644 ---- a/pybind11/__init__.py -+++ b/pybind11/__init__.py -@@ -2,35 +2,4 @@ from ._version import version_info, __version__ # noqa: F401 imported but unuse - - - def get_include(user=False): -- from distutils.dist import Distribution -- import os -- import sys -- -- # Are we running in a virtual environment? -- virtualenv = hasattr(sys, 'real_prefix') or \ -- sys.prefix != getattr(sys, "base_prefix", sys.prefix) -- -- # Are we running in a conda environment? -- conda = os.path.exists(os.path.join(sys.prefix, 'conda-meta')) -- -- if virtualenv: -- return os.path.join(sys.prefix, 'include', 'site', -- 'python' + sys.version[:3]) -- elif conda: -- if os.name == 'nt': -- return os.path.join(sys.prefix, 'Library', 'include') -- else: -- return os.path.join(sys.prefix, 'include') -- else: -- dist = Distribution({'name': 'pybind11'}) -- dist.parse_config_files() -- -- dist_cobj = dist.get_command_obj('install', create=True) -- -- # Search for packages in user's home directory? -- if user: -- dist_cobj.user = user -- dist_cobj.prefix = "" -- dist_cobj.finalize_options() -- -- return os.path.dirname(dist_cobj.install_headers) -+ return "@include@" --- -2.23.0 - diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 3cfdbba31c1f3..079c93db4501b 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - sha256 = "0k89w4bsfbpzw963ykg1cyszi3h3nk393qd31m6y46pcfxkqh4rd"; + sha256 = "13hcj6g7k7yvj7nry2ar6f5mg58ln7frrvq1cg5f8mczxh1ch6zl"; }; nativeBuildInputs = [ cmake ]; @@ -40,14 +40,6 @@ buildPythonPackage rec { dontUsePipInstall = true; dontUseSetuptoolsCheck = true; - patches = [ - ./0001-Find-include-directory.patch - ]; - - postPatch = '' - substituteInPlace pybind11/__init__.py --subst-var-by include "$out/include" - ''; - preFixup = '' pushd .. export PYBIND11_USE_CMAKE=1 @@ -65,7 +57,7 @@ buildPythonPackage rec { scipy ]; - meta = { + meta = with lib; { homepage = "https://github.com/pybind/pybind11"; description = "Seamless operability between C++11 and Python"; longDescription = '' @@ -73,7 +65,7 @@ buildPythonPackage rec { C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code. ''; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.yuriaisaka ]; + license = licenses.bsd3; + maintainers = with maintainers;[ yuriaisaka ]; }; } diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 74606902722a8..9e38d64039707 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -3,13 +3,13 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { pname = "pygobject"; - version = "3.36.0"; + version = "3.36.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vysyr586mfjm7biraw1nynpw4f1qajynkm6m40ybadsnpgx50w6"; + sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyhs100/default.nix b/pkgs/development/python-modules/pyhs100/default.nix new file mode 100644 index 0000000000000..2e6d7164b8bf1 --- /dev/null +++ b/pkgs/development/python-modules/pyhs100/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, click, click-datetime, deprecation +, pytest, voluptuous }: + +buildPythonPackage rec { + pname = "pyHS100"; + version = "0.3.5.1"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "GadgetReactor"; + repo = pname; + rev = version; + sha256 = "1vddr9sjn6337i1vx0mm7pb3qibvl2gx6nx18vm4fajgv9vcjxny"; + }; + + propagatedBuildInputs = [ + click + click-datetime + deprecation + ]; + + checkInputs = [ + pytest + voluptuous + ]; + + checkPhase = '' + py.test pyHS100 + ''; + + meta = with lib; { + description = "Python Library to control TPLink Switch (HS100 / HS110)"; + homepage = "https://github.com/GadgetReactor/pyHS100"; + license = licenses.gpl3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix new file mode 100644 index 0000000000000..cf6b67c548b61 --- /dev/null +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +, aiohttp, deepmerge, yarl +, aresponses, pytest, pytest-asyncio, pytestcov }: + +buildPythonPackage rec { + pname = "pyipp"; + version = "0.10.1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "ctalkington"; + repo = "python-ipp"; + rev = version; + sha256 = "0y9mkrx66f4m77jzfgdgmvlqismvimb6hm61j2va7zapm8dyabvr"; + }; + + propagatedBuildInputs = [ + aiohttp + deepmerge + yarl + ]; + + checkInputs = [ + aresponses + pytest + pytest-asyncio + pytestcov + ]; + + checkPhase = '' + pytest -q . + ''; + + meta = with lib; { + description = "Asynchronous Python client for Internet Printing Protocol (IPP)"; + homepage = "https://github.com/ctalkington/python-ipp"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-tornasync/default.nix b/pkgs/development/python-modules/pytest-tornasync/default.nix new file mode 100644 index 0000000000000..be1e76d21e4f4 --- /dev/null +++ b/pkgs/development/python-modules/pytest-tornasync/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +, pytest, tornado }: + +buildPythonPackage rec { + pname = "pytest-tornasync"; + version = "0.6.0.post2"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "eukaryote"; + repo = pname; + # upstream does not keep git tags in sync with pypy releases + # https://github.com/eukaryote/pytest-tornasync/issues/9 + rev = "c5f013f1f727f1ca1fcf8cc748bba7f4a2d79e56"; + sha256 = "04cg1cfrr55dbi8nljkpcsc103i5c6p0nr46vjr0bnxgkxx03x36"; + }; + + propagatedBuildInputs = [ + pytest + tornado + ]; + + checkInputs = [ + pytest + tornado + ]; + + checkPhase = '' + pytest test + ''; + + meta = with lib; { + description = "py.test plugin for testing Python 3.5+ Tornado code"; + homepage = "https://github.com/eukaryote/pytest-tornasync"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix new file mode 100644 index 0000000000000..53bdbdf1f4426 --- /dev/null +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, trio, async_generator, hypothesis, outcome, pytest, pytestcov }: + +buildPythonPackage rec { + pname = "pytest-trio"; + version = "0.6.0"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "python-trio"; + repo = pname; + rev = "v${version}"; + sha256 = "09v2031yxm8ryhq12205ldcck76n3wwqhjjsgfmn6dxfiqb0vbw9"; + }; + + propagatedBuildInputs = [ + trio + async_generator + outcome + pytest + ]; + + checkInputs = [ + pytest + pytestcov + hypothesis + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Pytest plugin for trio"; + homepage = "https://github.com/python-trio/pytest-trio"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/python-didl-lite/default.nix b/pkgs/development/python-modules/python-didl-lite/default.nix new file mode 100644 index 0000000000000..e160c1aa623f7 --- /dev/null +++ b/pkgs/development/python-modules/python-didl-lite/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, defusedxml +, pytest }: + +buildPythonPackage rec { + pname = "python-didl-lite"; + version = "1.2.4"; + disabled = pythonOlder "3.5.3"; + + src = fetchFromGitHub { + owner = "StevenLooman"; + repo = pname; + rev = version; + sha256 = "0jf1d5m4r8qd3pn0hh1xqbkblkx9wzrrcmk7qa7q8lzfysp4z217"; + }; + + propagatedBuildInputs = [ + defusedxml + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "DIDL-Lite (Digital Item Declaration Language) tools for Python"; + homepage = "https://github.com/StevenLooman/python-didl-lite"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index ea937bef1bee4..6830c7c134304 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -2,27 +2,29 @@ , lib , buildPythonPackage , fetchFromGitHub -, numpy -, scipy -, matplotlib -, pandas -, astropy -, parfive , pythonOlder -, sqlalchemy -, scikitimage -, glymur -, beautifulsoup4 -, drms -, python-dateutil -, zeep -, tqdm + , asdf +, astropy , astropy-helpers +, beautifulsoup4 +, drms +, glymur , hypothesis +, matplotlib +, numpy +, pandas +, parfive , pytest-astropy -, pytestcov , pytest-mock +, pytestcov +, python-dateutil +, scikitimage +, scipy +, sqlalchemy +, towncrier +, tqdm +, zeep }: buildPythonPackage rec { @@ -47,6 +49,7 @@ buildPythonPackage rec { parfive sqlalchemy scikitimage + towncrier glymur beautifulsoup4 drms diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index e3578cbf8d2a8..d650f350bd287 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -32,16 +32,24 @@ let }; in rustPlatform.buildRustPackage rec { pname = "tokenizers"; - version = "0.8.1.rc1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "python-v${version}"; - sha256 = "1bzvfffnjjskx8zlq1qsqfd47570my2wnbq4ip8i1hkz10q900qv"; + sha256 = "0sxdwx05hr87j2z32rk4rgwn6a26w9r7m5fgj6ah1sgagiiyxbjw"; }; - cargoSha256 = "0s5z3g1njb7wlyb32ba6xas4zc62c3zhmp1mrvghmaxpvljp6k7b"; + # Update parking_lot to be compatible with recent Rust versions, that + # replace asm! by llvm_asm!: + # + # https://github.com/Amanieu/parking_lot/pull/223 + # + # Remove once upstream updates this dependency. + cargoPatches = [ ./update-parking-lot.diff ]; + + cargoSha256 = "0cdkxmj8z2wdspn6r62lqlpvd0sj1z0cmb1zpqaajxvr0b2kjlj8"; sourceRoot = "source/bindings/python"; diff --git a/pkgs/development/python-modules/tokenizers/update-parking-lot.diff b/pkgs/development/python-modules/tokenizers/update-parking-lot.diff new file mode 100644 index 0000000000000..d8f144465ac97 --- /dev/null +++ b/pkgs/development/python-modules/tokenizers/update-parking-lot.diff @@ -0,0 +1,63 @@ +diff --git a/bindings/python/Cargo.lock b/bindings/python/Cargo.lock +index f50db71..ea71817 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -269,7 +269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "lock_api" +-version = "0.3.3" ++version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -337,16 +337,16 @@ dependencies = [ + + [[package]] + name = "parking_lot" +-version = "0.10.0" ++version = "0.10.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] + name = "parking_lot_core" +-version = "0.7.0" ++version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -409,7 +409,7 @@ dependencies = [ + "inventory 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "paste 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "pyo3cls 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -768,7 +768,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" + "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + "checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" +-"checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" ++"checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" + "checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + "checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" + "checksum memoffset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8" +@@ -777,8 +777,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum number_prefix 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" + "checksum onig 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd91ccd8a02fce2f7e8a86655aec67bc6c171e6f8e704118a0e8c4b866a05a8a" + "checksum onig_sys 69.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3814583fad89f3c60ae0701d80e87e1fd3028741723deda72d0d4a0ecf0cb0db" +-"checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc" +-"checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1" ++"checksum parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" ++"checksum parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" + "checksum paste 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab4fb1930692d1b6a9cfabdde3d06ea0a7d186518e2f4d67660d8970e2fa647a" + "checksum paste-impl 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "a62486e111e571b1e93b710b61e8f493c0013be39629b714cb166bdb06aa5a8a" + "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix new file mode 100644 index 0000000000000..a7573e669a8ca --- /dev/null +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, click +, click-default-group +, incremental +, jinja2 +, pytestCheckHook +, toml +, twisted +, git # shells out to git +}: + +buildPythonPackage rec { + pname = "towncrier"; + version = "19.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "15l1gb0hhi9pf3mhhb9vpc93w6w3hrih2ljmzbkgfb3dwqd1l9a8"; + }; + + propagatedBuildInputs = [ + click + click-default-group + incremental + jinja2 + toml + ]; + + # zope.interface collision + doCheck = !isPy27; + checkInputs = [ git twisted pytestCheckHook ]; + pythonImportsCheck = [ "towncrier" ]; + + meta = with lib; { + description = "Utility to produce useful, summarised news files"; + homepage = "https://github.com/twisted/towncrier/"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index e16f4027ce547..37d1043f215d8 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.12.0"; + version = "0.12.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0ycmpwjv5xp25993divjhaq5j766zgcy22xx39xfc1pcvldq5g7n"; + sha256 = "1w19m9lws55k9sjhras47hpfpqwq1jm5vy135nj65yhkblygqg19"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 5095265e33f69..608ce8b65fea1 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchFromGitHub, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub{ owner = "python"; repo = "typed_ast"; rev = version; - sha256 = "0l0hz809f7i356kmqkvfsaswiidb98j9hs9rrjnfawzqcbffzgyb"; + sha256 = "086r9qhls6mz1w72a6d1ld3m4fbkxklf6mgwbs8wpw0zlxjm7y40"; }; # Only works with Python 3.3 and newer; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/vcver/default.nix b/pkgs/development/python-modules/vcver/default.nix new file mode 100644 index 0000000000000..74b44cddc464b --- /dev/null +++ b/pkgs/development/python-modules/vcver/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, packaging +, fetchurl, python }: + +buildPythonPackage rec { + pname = "vcver"; + version = "0.2.10"; + + src = fetchFromGitHub { + owner = "toumorokoshi"; + repo = "vcver-python"; + rev = "c5d8a6f1f0e49bb25f5dbb07312e42cb4da096d6"; + sha256 = "1cvgs70jf7ki78338zaglaw2dkvyndmx15ybd6k4zqwwsfgk490b"; + }; + + propagatedBuildInputs = [ + packaging + ]; + + # circular dependency on test tool uranium https://pypi.org/project/uranium/ + doCheck = false; + + pythonImportTests = [ "vcver" ]; + + meta = with lib; { + description = "Reference Implementation of vcver"; + homepage = "https://github.com/toumorokoshi/vcver-python"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix new file mode 100644 index 0000000000000..06f3265d42489 --- /dev/null +++ b/pkgs/development/python-modules/vulture/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, coverage, pytest, pytestcov }: + +buildPythonPackage rec { + pname = "vulture"; + version = "1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1sbwbwkpk3s7iwnwsdrvj1ydw9lgbn3xqhji7f8y5y6vvr77i53v"; + }; + + checkInputs = [ coverage pytest pytestcov ]; + checkPhase = "pytest"; + + meta = with stdenv.lib; { + description = "Finds unused code in Python programs"; + homepage = "https://github.com/jendrikseipp/vulture"; + license = licenses.mit; + maintainers = with maintainers; [ mcwitt ]; + }; +} diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index fd1c2c964a223..b8797c3dfe24d 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.14.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = "${version}"; - sha256 = "1ilqynjvvczxdvsfszkmrz1casrbsbklw8nbgh5l1nx8kxsp5lx7"; + sha256 = "1skiaiz3xyi6cf62fkg7i7ahncm7vcg3aq4s4a5lrls30gr0n288"; }; nativeBuildInputs = [ @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "0jcn1b4v9glh058sfd270b33g988n672q50f8kyhwl8xip7xzj06"; + cargoSha256 = "1klmdwpqk995pdyms40x7gk4l2mf4ncj7cgknl91kmyvpn4j1y4g"; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; @@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/xd009642/tarpaulin"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ hugoreeves ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index 3f90e5f73436a..ff6d7765ead07 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "radare2-cutter"; - version = "1.10.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "0qj8jyij02nif4jpirl09ygwnv8a9zi3vkb5sf5s8mg7qwlpnvyk"; + sha256 = "1xvdap7hpkjz6rg0ngnql1p18p93b8w9gv130g818nwcjsh9i2y5"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index f77ea1602f4f6..7d42b772234d0 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -110,24 +110,24 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "24545"; - gittap = "4.4.0"; - gittip = "9ea0b7ce566cfdcfb3513f407c4056915204294a"; - rev = "4.4.0"; - version = "4.4.0"; - sha256 = "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s"; - cs_ver = "4.0.1"; - cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; + version_commit = "25005"; + gittap = "4.5.0"; + gittip = "9d7eda5ec7367d1682e489e92d1be8e37e459296"; + rev = "4.5.0"; + version = "4.5.0"; + sha256 = "1vnvfgg48bccm41pdyjsql6fy1pymmfnip4w2w56b45d7rqcc3v8"; + cs_ver = "4.0.2"; + cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; }; r2-for-cutter = generic { - version_commit = "24605"; - gittap = "4.4.0"; - gittip = "9ea0b7ce566cfdcfb3513f407c4056915204294a"; - rev = "9ea0b7ce566cfdcfb3513f407c4056915204294a"; - version = "2020-04-14"; - sha256 = "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s"; - cs_ver = "4.0.1"; - cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; + version_commit = "25024"; + gittap = "4.5.0"; + gittip = "9d7eda5ec7367d1682e489e92d1be8e37e459296"; + rev = "9d7eda5ec7367d1682e489e92d1be8e37e459296"; + version = "2020-07-17"; + sha256 = "1vnvfgg48bccm41pdyjsql6fy1pymmfnip4w2w56b45d7rqcc3v8"; + cs_ver = "4.0.2"; + cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; }; #</generated> } diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 9d8e999c385ca..2e485b3ed67ba 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }: stdenv.mkDerivation rec { - name = "valgrind-3.15.0"; + name = "valgrind-3.16.1"; src = fetchurl { url = "https://sourceware.org/pub/valgrind/${name}.tar.bz2"; - sha256 = "1ccawxrni8brcvwhygy12iprkvz409hbr9xkk1bd03gnm2fplz21"; + sha256 = "1jik19rcd34ip8a5c9nv5wfj8k8maqb8cyclr4xhznq2gcpkl7y9"; }; outputs = [ "out" "dev" "man" "doc" ]; @@ -38,10 +38,6 @@ stdenv.mkDerivation rec { sed -i coregrind/link_tool_exe_darwin.in \ -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g' - echo "substitute hardcoded /usr/include/mach with ${xnu}/include/mach" - substituteInPlace coregrind/Makefile.in \ - --replace /usr/include/mach ${xnu}/include/mach - substituteInPlace coregrind/m_debuginfo/readmacho.c \ --replace /usr/bin/dsymutil ${stdenv.cc.bintools.bintools}/bin/dsymutil @@ -54,7 +50,8 @@ stdenv.mkDerivation rec { postPatch = ""; configureFlags = - stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit"; + stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit" + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include"; doCheck = false; # fails diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/development/tools/bazel-kazel/default.nix index 9f1ab778ac8d3..a91c642029b09 100644 --- a/pkgs/development/tools/bazel-kazel/default.nix +++ b/pkgs/development/tools/bazel-kazel/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.0.7"; + version = "0.0.10"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "0g4lgz5xgmxabaa8pygmdnrnslfrcb84vgr6bninl9v5zz4wajbm"; + sha256 = "1l3dz77h58v1sr7k8cabq5bbdif5w96zdcapax69cv1frr9jbrcb"; }; - vendorSha256 = "1lizvg9r7cck1cgk20np2syv4ljbc0zj1kydiiajf7y5x7d3lwha"; + vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf"; subPackages = [ "cmd/kazel" ]; diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 45fb791f3a69a..219bd6e30e3b2 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200629"; + version = "20200710"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "1cxmsz48ap6gpwx5qkkvvfsiqxc7zpn8gzmhvc1jsfha68195ms5"; + sha256 = "0v5paqdc0wnqlw4dy45mnydkmabsky33nvd7viwd2ygg351zqf35"; }; nativeBuildInputs = [ getopt ]; diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch index e0399d0a6c6e8..75873d6055c07 100644 --- a/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -1,11 +1,8 @@ diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt -index 8aff8f6..af1852d 100644 +index 1b6bb00d4c..487114daa8 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt -@@ -791,12 +791,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc" - endif() - endif() - +@@ -893,7 +893,6 @@ endif() # On Apple we need CoreFoundation and CoreServices if(APPLE) target_link_libraries(CMakeLib "-framework CoreFoundation") @@ -13,13 +10,11 @@ index 8aff8f6..af1852d 100644 endif() if(WIN32 AND NOT UNIX) - # We need the rpcrt4 library on Windows. - # We need the crypt32 library on Windows for crypto/cert APIs. diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx -index e353a37..b06f842 100644 +index a5ce5d18f4..3d6838ce82 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx -@@ -35,11 +35,6 @@ +@@ -43,11 +43,6 @@ struct cmLinkImplementation; @@ -32,12 +27,12 @@ index e353a37..b06f842 100644 # include "cmXMLParser.h" diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt -index d7af6e2..d4808fc 100644 +index bfcaf30bb7..1da540aee5 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt -@@ -1662,11 +1662,6 @@ IF(MSVC) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) - ENDIF(MSVC) +@@ -2007,11 +2007,6 @@ IF(ENABLE_TEST) + ENDIF(ENABLE_TEST) + ENDIF() -# We need CoreServices on Mac OS. -IF(APPLE) @@ -45,16 +40,5 @@ index d7af6e2..d4808fc 100644 -ENDIF(APPLE) - add_subdirectory(libarchive) - - install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive) -index e505bdd..f45557d 100644 ---- a/Utilities/cmlibuv/src/unix/darwin-proctitle.c -+++ b/Utilities/cmlibuv/src/unix/darwin-proctitle.c -@@ -30,7 +30,6 @@ - - #if !TARGET_OS_IPHONE - # include <CoreFoundation/CoreFoundation.h> --# include <ApplicationServices/ApplicationServices.h> - #endif - - #define S(s) pCFStringCreateWithCString(NULL, (s), kCFStringEncodingUTF8) + IF(0) # CMake does not build libarchive's command-line tools. + add_subdirectory(cat) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index a9a3fd71a6bb4..0b296f023adc9 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.17.3"; + version = "3.18.0"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "0h4c3nwk7wmzcmmlwyb16zmjqr44l4k591m2y9p9zp3m498hvmhb"; + sha256 = "0aby67jn3i0rqhj6cvpm0f7idw3dl7jayaqxa9hkk9w2jk5zzd43"; }; patches = [ diff --git a/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch b/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch index eb3df1e4ff6af..6607a9c6ed1f3 100644 --- a/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch @@ -1,7 +1,8 @@ -diff -ur cmake-3.12.1/Utilities/cmlibuv/CMakeLists.txt cmake-3.12.1-patched/Utilities/cmlibuv/CMakeLists.txt ---- cmake-3.12.1/Utilities/cmlibuv/CMakeLists.txt 2018-08-09 21:14:08.000000000 +0900 -+++ cmake-3.12.1-patched/Utilities/cmlibuv/CMakeLists.txt 2018-08-13 10:14:53.000000000 +0900 -@@ -173,6 +173,22 @@ +diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt +index 7625cf65d9..167903e309 100644 +--- a/Utilities/cmlibuv/CMakeLists.txt ++++ b/Utilities/cmlibuv/CMakeLists.txt +@@ -193,6 +193,22 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") src/unix/kqueue.c src/unix/proctitle.c ) @@ -24,9 +25,10 @@ diff -ur cmake-3.12.1/Utilities/cmlibuv/CMakeLists.txt cmake-3.12.1-patched/Util endif() if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/fsevents.c ---- cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c 2018-08-09 21:14:08.000000000 +0900 -+++ cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/fsevents.c 2018-08-13 10:01:29.000000000 +0900 +diff --git a/Utilities/cmlibuv/src/unix/fsevents.c b/Utilities/cmlibuv/src/unix/fsevents.c +index a51f29b3f6..3f6bf01968 100644 +--- a/Utilities/cmlibuv/src/unix/fsevents.c ++++ b/Utilities/cmlibuv/src/unix/fsevents.c @@ -21,7 +21,7 @@ #include "uv.h" #include "internal.h" @@ -35,17 +37,17 @@ diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c cmake-3.12.1-patched +#if !HAVE_CORESERVICES_CORESERVICES_H || MAC_OS_X_VERSION_MAX_ALLOWED < 1070 /* iOS (currently) doesn't provide the FSEvents-API (nor CoreServices) */ - -@@ -38,7 +38,7 @@ + /* macOS prior to 10.7 doesn't provide the full FSEvents API so use kqueue */ +@@ -39,7 +39,7 @@ int uv__fsevents_close(uv_fs_event_t* handle) { void uv__fsevents_loop_delete(uv_loop_t* loop) { } -#else /* TARGET_OS_IPHONE */ +#else /* !HAVE_CORESERVICES_CORESERVICES_H */ - #include <dlfcn.h> - #include <assert.h> -@@ -916,4 +916,4 @@ + #include "darwin-stub.h" + +@@ -920,4 +920,4 @@ int uv__fsevents_close(uv_fs_event_t* handle) { return 0; } diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch index 2f5e4d62c86dc..b71c2dd444160 100644 --- a/pkgs/development/tools/build-managers/cmake/search-path.patch +++ b/pkgs/development/tools/build-managers/cmake/search-path.patch @@ -1,9 +1,10 @@ -diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake ---- cmake-3.9.1/Modules/Platform/UnixPaths.cmake 2017-08-10 13:36:32.000000000 +0000 -+++ cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake 2017-09-03 01:24:31.901473539 +0000 -@@ -22,9 +22,6 @@ - # List common installation prefixes. These will be used for all - # search types. +diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake +index b9381c3d7d..cecc40a89e 100644 +--- a/Modules/Platform/UnixPaths.cmake ++++ b/Modules/Platform/UnixPaths.cmake +@@ -26,9 +26,6 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) + # please make sure to keep Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst + # synchronized list(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard - /usr/local /usr / @@ -11,7 +12,7 @@ diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Pl # CMake install location "${_CMAKE_INSTALL_DIR}" ) -@@ -43,31 +40,26 @@ +@@ -47,24 +44,19 @@ endif() # Non "standard" but common install prefixes list(APPEND CMAKE_SYSTEM_PREFIX_PATH @@ -39,12 +40,7 @@ diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Pl ) if(CMAKE_SYSROOT_COMPILE) - set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}") - else() - set(_cmake_sysroot_compile "${CMAKE_SYSROOT}") - endif() - - # Default per-language values. These may be later replaced after +@@ -77,15 +69,15 @@ endif() # parsing the implicit directory information from compiler output. set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} @@ -62,11 +58,12 @@ diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Pl + @libc_dev@/include ) - # Enable use of lib32 and lib64 search path variants by default. -diff -ur cmake-3.9.1/Modules/Platform/WindowsPaths.cmake cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake ---- cmake-3.9.1/Modules/Platform/WindowsPaths.cmake 2017-08-10 13:36:32.000000000 +0000 -+++ cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake 2017-09-03 01:19:32.808355986 +0000 -@@ -66,7 +66,7 @@ + unset(_cmake_sysroot_compile) +diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake +index b9e2f17979..ab517cd4a7 100644 +--- a/Modules/Platform/WindowsPaths.cmake ++++ b/Modules/Platform/WindowsPaths.cmake +@@ -70,7 +70,7 @@ endif() if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index ccb03c39a75fe..3fc893fd07cf7 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.7.4"; + version = "0.8.0"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "1zcl0yqy5sdy7p9d0b113mwv0f7fi0nhhgy9f0vyk12xjdj3kim5"; + sha256 = "04pf76iyrbq2h2hksx0r2fmnd0d9mi6an24zvfv7k79rch11cql1"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 3b1e0aaa00f64..3def4a05bd730 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "0nhqw8s8m819mhb0kpji0if8ji9cmkcb821zab7h65azk0p8qh20"; + sha256 = "15pnyi6gay287vkcrgsirsyyps3ya2lsih1ljkcsqdxzr596mcv3"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 5049eb07b8717..104b1c46e09d2 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.10.1"; + version = "3.10.2"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1q20iswakhnrmsmlcsjnhl3glj4p0314gridqyy4wh7s77bcakg5"; + sha256 = "19wdflkp4n0pds4lkliagg8l5kf9db5f5bn39akhwasc4yj0g7j2"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix new file mode 100644 index 0000000000000..95108c21bb9cf --- /dev/null +++ b/pkgs/development/tools/eliot-tree/default.nix @@ -0,0 +1,38 @@ +{ stdenv, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "eliot-tree"; + version = "19.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "18gvijsm0vh3x83mv8dd80c3mpm80r7i111qsg4y7rj4i590phma"; + }; + + checkInputs = with python3Packages; [ + testtools + pytest + ]; + + propagatedBuildInputs = with python3Packages; [ + colored + eliot + iso8601 + jmespath + setuptools + toolz + ]; + + # Tests run eliot-tree in out/bin. + checkPhase = '' + export PATH=$out/bin:$PATH + pytest + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/jonathanj/eliottree"; + description = "Render Eliot logs as an ASCII tree"; + license = licenses.mit; + maintainers = [ maintainers.dpausp ]; + }; +} diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 19d898ce99303..be38e1fdf444b 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.5.0"; + version = "6.5.3"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "0qag8xz347vwwqlwirlz5vnhvfga79ihwqp1y0rbqzhcnwpjzc69"; + sha256 = "1gxa9gg7di79kl6aayryhrkm3nzn3sc7hg2x1ldy1q72x6wz41sc"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index f11a7fc35d690..0915f3e966afa 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gosec"; - version = "2.3.0"; + version = "2.4.0"; goPackagePath = "github.com/securego/gosec"; @@ -12,10 +12,12 @@ buildGoModule rec { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "0z782rr4z0nhlj6cmjd17pbi65zabpmb83mv4y93wi4qa7kkpm2g"; + sha256 = "0mqijzr3vj4wycykqpjz9xw9fhpbnzz988z2q3nldb5ax0pyrxca"; }; - vendorSha256 = "0zrmhqcid8xr6i1xxg3s8sll8a667w2vmn5asdw0b43k6k3h941p"; + vendorSha256 = "063dpq1k5lykp18gshlgg098yvppicv3cz8gjn1mvfhac2rl9yqr"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitTag=${src.rev} -X main.BuildDate=unknown" ]; meta = with stdenv.lib; { homepage = "https://github.com/securego/gosec"; diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 45be855a66135..178a949a63a34 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "079cyk12r662z8njaawdqfjab1giy5xkjhln2rns03j5n67ixhgj"; + sha256 = "08bb865gl1ykqr7wm7a1jikjdlc2dqv1f3hllnwwr630c8y4k806"; }; vendorSha256 = "1injixhllv41glb3yz276gjrkiwwkfimrhb367d2pvjpzqmhplan"; diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 959cfdd5d073b..bf4f83f902107 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "k6"; - version = "0.27.0"; + version = "0.27.1"; goPackagePath = "github.com/loadimpact/k6"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "loadimpact"; repo = pname; rev = "v${version}"; - sha256 = "15p81bv9z1nxixvwnfqynycwxvla3f1ldxnj9invna1sjx7lx3qq"; + sha256 = "0ni7x64al49adzy6kwzxyi56w556qy34888hxsldjrnndlchc0vz"; }; subPackages = [ "./" ]; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index c7a1ba35fec3d..635f1d6492e71 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,8 +2,8 @@ buildGoModule rec { pname = "kustomize"; - version = "3.8.0"; - # rev is the 3.8.0 commit, mainly for kustomize version command output + version = "3.8.1"; + # rev is the 3.8.1 commit, mainly for kustomize version command output rev = "6a50372dd5686df22750b0c729adaf369fbf193c"; buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in @@ -17,14 +17,14 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "1v86gqn16xh28gi2fa6jgbbk0clrcng3sbr1az42iy4mm4nmsriy"; + sha256 = "07zdp6xv8viwnaz1qacwhg82dlzcrgb8dls6yz9qk4qcnsk6badx"; }; # avoid finding test and development commands sourceRoot = "source/kustomize"; deleteVendor = true; - vendorSha256 = "03z40gi9nrj120cd57pa3fmi8grldyxa65a1lkvlc2r3z9g29vdw"; + vendorSha256 = "01ff3w4hwp4ynqhg8cplv0i2ixs811d2x2j6xbh1lslyyh3z3wc5"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 9d37dcfd5d23d..7425357536cae 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.20.6"; + version = "0.20.9"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "0zim9ipwh2vkw2g41rw3p35i8fz208hyr71npfn4as8f1nl4gi4i"; + sha256 = "1jmg2z8yza8cy6xcyam4pvk0sp6zvw6b8vbn3b3h0pklfa7wz9pg"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 6d9149d4107a1..5d032d42108fe 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.3.6"; + version = "1.3.7"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "0jmj5xpj4invvpp289gh81vq7b4mmfhqb2h50yjn7wgdicyn295a"; + sha256 = "1f9fhp10fdm18g33kxl70l6l3x1k8p81h2c3zahjmhlg0sam78zw"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index a6265ba89d035..fcddf1d0cacc3 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -1,53 +1,54 @@ -{ stdenv, fetchFromGitHub, php, flex, makeWrapper }: +{ stdenv, fetchFromGitHub, php, flex }: + +# Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being +# invoked and complains about it being an unknown toolset. We could use `makeWrapper`, but +# then we’d need to still craft a script that does the `php libexec/arcanist/bin/...` dance +# anyway... So just do everything at once. +let makeArcWrapper = toolset: '' + cat << WRAPPER > $out/bin/${toolset} + #!$shell -e + export PATH='${php}/bin/'\''${PATH:+':'}\$PATH + exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@" + WRAPPER + chmod +x $out/bin/${toolset} +''; -let - libphutil = fetchFromGitHub { - owner = "phacility"; - repo = "libphutil"; - rev = "cc2a3dbf590389400da55563cb6993f321ec6d73"; - sha256 = "1k7sr3racwz845i7r5kdwvgqrz8gldz07pxj3yw77s58rqbix3ad"; - }; - arcanist = fetchFromGitHub { - owner = "phacility"; - repo = "arcanist"; - rev = "21a1828ea06cf031e93082db8664d73efc88290a"; - sha256 = "05rq9l9z7446ks270viay57r5ibx702b5bnlf4ck529zc4abympx"; - }; in + stdenv.mkDerivation { pname = "arcanist"; - version = "20200127"; - - src = [ arcanist libphutil ]; - buildInputs = [ php makeWrapper flex ]; + version = "20200711"; - unpackPhase = '' - cp -aR ${libphutil} libphutil - cp -aR ${arcanist} arcanist - chmod +w -R libphutil arcanist - ''; + src = fetchFromGitHub { + owner = "phacility"; + repo = "arcanist"; + rev = "2565cc7b4d1dbce6bc7a5b3c4e72ae94be4712fe"; + sha256 = "0jiv4aj4m5750dqw9r8hizjkwiyxk4cg4grkr63sllsa2dpiibxw"; + }; + buildInputs = [ php flex ]; postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' - substituteInPlace libphutil/support/xhpast/Makefile \ + substituteInPlace support/xhpast/Makefile \ --replace "-minline-all-stringops" "" ''; buildPhase = '' - ( - cd libphutil/support/xhpast - make clean all install - ) + make xhpast -C support/xhpast ''; + installPhase = '' mkdir -p $out/bin $out/libexec - cp -R libphutil $out/libexec/libphutil - cp -R arcanist $out/libexec/arcanist - ${if stdenv.isDarwin then '' - echo "#! $shell -e" > $out/bin/arc - echo "exec ${php}/bin/php $out/libexec/arcanist/scripts/arcanist.php "'"$@"' >> $out/bin/arc - chmod +x $out/bin/arc'' - else '' - ln -s $out/libexec/arcanist/scripts/arcanist.php $out/bin/arc''} + make install -C support/xhpast + cp -R $src $out/libexec/arcanist + + ${makeArcWrapper "arc"} + ${makeArcWrapper "phage"} + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/arc help diff -- > /dev/null + $out/bin/phage help alias -- > /dev/null ''; meta = { diff --git a/pkgs/development/tools/misc/argbash/default.nix b/pkgs/development/tools/misc/argbash/default.nix index 0cc25ddf20b6b..fc1d3550e8294 100644 --- a/pkgs/development/tools/misc/argbash/default.nix +++ b/pkgs/development/tools/misc/argbash/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "argbash"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "matejak"; repo = "argbash"; rev = "${version}"; - sha256 = "0zara7v3pnwiwkpb0x0g37pxhmim4425q4gba712f6djj115r1mr"; + sha256 = "1h6kw510r43b6d6rjhkhw4d67nc7grak4mgqs9ngjjv07qj3qfqc"; }; sourceRoot = "source/resources"; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 500d80d4bb8f4..93add837290bb 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, m4, perl }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { name = "autoconf-2.69"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index cd05ea354ca2b..b352e63a27cca 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -10,6 +10,11 @@ , texinfo }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + let reuseLibs = enableShared && withAllTargets; diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index b301324e95617..2e3e4acfdc1b9 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation { name = "gnum4-1.4.18"; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 74ba7f55093dc..f23b5a9c8fdd8 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, perlPackages, gettext }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { name = "help2man-1.47.16"; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 9f260121df2b2..716a305878529 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -24,12 +24,12 @@ # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-07-28"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "858eb41fab0c8e2a885dc95f629eac8d56c7449c"; - sha256 = "17j0prprasdg0vvl2w8z99jwxzrjjr60gjgnky3k8ha399fm32pa"; + rev = "77c33c1d71a8c303f53ccad577eb0a3799e87bda"; + sha256 = "10pwiww96dbbszzvnj7abn851h89n30ziahjj2zm3liyzyvbylyf"; }; nix = nixFlakes; diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index debc4107882b3..199c6504f392a 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -1,5 +1,10 @@ {stdenv, fetchurl, m4, perl}: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { name = "libtool-1.5.26"; diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index 8541c7a307a24..bb88862a8e8ed 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.16"; + version = "1.17"; src = fetchgit { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git"; rev = "v${version}"; - sha256 = "1gfc9v4dgs811v1zjk0d9hsgmizllw2hibc83ykmakzysimaxsy3"; + sha256 = "13dxsmhpf9n2wqggf4gd6f12rm0vhv0q96jd50gkvaxzzvgpzzbc"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 5119225d9ae67..5d2309333a6b6 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { name = "patchelf-0.11"; diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 13386fb9e854d..0662a2800848d 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "05y8683f0r8bf8gn5miiwqkfz550s2c9kmvz0a1g7y99r9n6kzjk"; + sha256 = "1xi5dfdy66qa6xvy60fk2lmp9gxyi0nfkyvybcazn8mrd99hfh6l"; }; vendorSha256 = "0cxi01jxg89lsk91dv782746i8g9ksanx8igmgafq9vq25lld7yg"; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index cbae92dd6d13e..ccbed6d430aff 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.7"; + version = "5.8"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "1n6cfz3i2krkyvxpdp3kmxhf7sy5xp0danzaiirbk5fdkfgvb15j"; + sha256 = "1abs3svkg9985f4jrxx34sj1dcpsf95vv1a0g01c777zgygncjnz"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 1fb8a6b2f0d77..ec51dc2259d94 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -6,6 +6,11 @@ , interactive ? false, ncurses, procps }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + let crossBuildTools = interactive && stdenv.hostPlatform != stdenv.buildPlatform; in diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index ba8fa4bba6fca..c267b2757a436 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -1,6 +1,6 @@ { lib, buildDunePackage, fetchurl, makeWrapper , curly, fmt, bos, cmdliner, re, rresult, logs -, odoc, opam-format, opam-core, opam-state +, odoc, opam-format, opam-core, opam-state, yojson , opam, git, findlib, mercurial, bzip2, gnutar, coreutils , alcotest, mdx }: @@ -10,27 +10,33 @@ let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ]; in buildDunePackage rec { pname = "dune-release"; - version = "1.3.3"; + version = "1.4.0"; minimumOCamlVersion = "4.06"; src = fetchurl { url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "04qmgvjh1233ri878wi5kifdd1070w5pbfkd8yk3nnqnslz35zlb"; + sha256 = "1frinv1rsrm30q6jclicsswpshkdwwdgxx7sp6q9w4c2p211n1ln"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core - rresult logs odoc bos ]; - checkInputs = [ alcotest mdx ]; + rresult logs odoc bos yojson ]; + checkInputs = [ alcotest mdx ] ++ runtimeInputs; doCheck = true; useDune2 = true; - # remove check for curl in PATH, since curly is patched - # to have a fixed path to the binary in nix store postPatch = '' + # remove check for curl in PATH, since curly is patched + # to have a fixed path to the binary in nix store sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml + + # set bogus user info in git so git commit doesn't fail + sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' \ + tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t + # ignore weird yes error message + sed -i 's/yes |/yes 2>\/dev\/null |/' tests/bin/no_doc/run.t ''; # tool specific env vars have been deprecated, use PATH diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 001c424603998..d785302ebb54b 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "184ri2w1n1yvhar1aq3fcxibdxx67728dz6gy5rf33j4hvr5kyay"; + sha256 = "1sc8ax198z42vhc3l6i04kknm9g44whifjivs19qgi3sybrw2vjg"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index a157041cf98ca..7954a50a7e045 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "0.18.2"; + version = "0.19.2"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "02vzxqbh4yw9yvr9cr43hyi0v4hzii4mdb8am41n5y71bcld73v8"; + sha256 = "1lmnxw6l6lknvbwmw5xh238i0j452sib37fw8ybxp64zwvj2sac0"; }; - vendorSha256 = "0kdbpm6phdcw1rcjggrdvc8hgs3hjc81545qh8jv6zwipmn89i1p"; + vendorSha256 = "1xk3zw8w2fynww0z4d66nlclhjf52bk4cv3bh51yyd1mr808lip5"; subPackages = [ "cmd/operator-sdk" ]; diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index ba2caac96c90d..357c8ea17cfd7 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, m4, perl, help2man }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { pname = "bison"; version = "3.6.4"; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index a64d6871235a8..8302d0a111e90 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-07-13"; + rev = "2020-08-03"; version = "unstable-${rev}"; - sha256 = "1mfhqq3wr2pxyr571xsyhlw4ikiqc0m7w6i31qmj4xq59klc003h"; - cargoSha256 = "09abiyc4cr47qxmvmc2az0addwxny0wpg9gilg8s8awgx1irxcqc"; + sha256 = "07xd9gwzjqnjsb5rnxfa9vxc6dmh04mbd1dcwxsz9fv9dcnsx21l"; + cargoSha256 = "0sa8yd3a6y2505w0n9l7d1v03c7dl07zw78fx5r3f4p3lc65n8b4"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 33d93650605d2..e418bd1ed6e71 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "0dxagp4gyn7057zcp78bhhr9qfbblvsynds2b0f4b3di8kg65m7f"; + sha256 = "03s22sx8yp5z69nqgyng5nbqy1qy8wdlrh5h9ghk1j249lig21fz"; fetchSubmodules = true; }; - cargoSha256 = "1fgi6hbziky7szw18wma87bx8i74ax9dc90yyldvjikn4hjc8ipc"; + cargoSha256 = "1lg7rclhm0jz7hiyzq2ff73zkyg24ndys78q830w30zx4lh4y50d"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 572c256dccee8..612f95b2e0f24 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -1,9 +1,8 @@ -{ callPackage, openssl, icu67, python3, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl; - icu = icu67; python = python3; }; in diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix index 40b6748693d19..800da177a3dc9 100644 --- a/pkgs/games/frotz/default.nix +++ b/pkgs/games/frotz/default.nix @@ -1,25 +1,40 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ fetchFromGitLab +, libao +, libmodplug +, libsamplerate +, libsndfile +, libvorbis +, ncurses +, stdenv }: stdenv.mkDerivation rec { - version = "2.44"; + version = "2.52"; pname = "frotz"; - src = fetchFromGitHub { + src = fetchFromGitLab { + domain = "gitlab.com"; owner = "DavidGriffith"; repo = "frotz"; rev = version; - sha256 = "0gjkk4gxzqmxfdirrz2lr0bms6l9fc31vkmlywigkbdlh8wxgypp"; + sha256 = "11ca1dz31b7s5vxjqncwjwmbbcr2m5v2rxjn49g4gnvwd6mqw48y"; }; - makeFlags = [ "CC=cc" "PREFIX=$(out)" "CURSES=-lncurses" ]; - - buildInputs = [ ncurses ]; + buildInputs = [ libao libmodplug libsamplerate libsndfile libvorbis ncurses ]; + preBuild = '' + makeFlagsArray+=( + CC="cc" + CFLAGS="-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600" + LDFLAGS="-lncursesw -ltinfo" + ) + ''; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = "http://frotz.sourceforge.net/"; + homepage = "https://davidgriffith.gitlab.io/frotz/"; + changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS"; description = "A z-machine interpreter for Infocom games and other interactive fiction."; platforms = platforms.unix; - maintainers = [ maintainers.nicknovitski ]; + maintainers = with maintainers; [ nicknovitski ddelabru ]; license = licenses.gpl2; }; } diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index fd4303eb2b1db..492ccbb63abf1 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -17,7 +17,7 @@ , useTcmalloc ? true}: assert cudaSupport -> ( - libGL_driver != null && + libGL_driver != null && cudatoolkit != null && cudnn != null); @@ -29,36 +29,21 @@ assert useTcmalloc -> ( gperftools != null); let - env = if cudaSupport + env = if cudaSupport then gcc8Stdenv else stdenv; in env.mkDerivation rec { pname = "katago"; - version = "1.4.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; - rev = "v${version}"; - sha256 = "14xs2bm8sky9cdsjdahjqs82q6blzcw05f5d9r1h171dm1hcx566"; + rev = "${version}"; + sha256 = "0ajdjdmlzwh7zwk5v0k9zzjawgkf7w30pzqp5bhcsdqz4svvyll2"; }; - # To workaround CMake 3.17.0's new buggy behavior wrt CUDA Compiler testing - # See the following tracking issues: - # KataGo: - # - Issue #225: https://github.com/lightvector/KataGo/issues/225 - # - PR #227: https://github.com/lightvector/KataGo/pull/227 - # CMake: - # - Issue #20708: https://gitlab.kitware.com/cmake/cmake/-/issues/20708 - patches = [ - (fetchpatch { - name = "227.patch"; - url = "https://patch-diff.githubusercontent.com/raw/lightvector/KataGo/pull/227.patch"; - sha256 = "03f1vmdjhb79mpj95sijcwla8acy32clrjgrn4xqw5h90zdgj511"; - }) - ]; - nativeBuildInputs = [ cmake makeWrapper diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index 2d08a1da99986..0fe327b308e96 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation { pname = "OpenJK"; - version = "2019-11-29"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "JACoders"; repo = "OpenJK"; - rev = "eed60925ad1b0d513d3747264f3bf98615fa4b2a"; - sha256 = "0b33cr540vz7w7dlagqf3yldmyx9y2pri20j44pd8fxapq4krrmb"; + rev = "0a336ce4dffe6505e3f754b59732402a1db95752"; + sha256 = "1xagbz42hi3ivs208mnay2dbgh90pmwwbar2p1yfhj3zl3cghcs8"; }; dontAddPrefix = true; diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 9e38852a02a57..fe2e978c4cc44 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -3,13 +3,13 @@ , pcre, makeWrapper }: let - version = "558"; + version = "730-july-preview"; src = fetchFromGitHub { owner = "OpenXRay"; repo = "xray-16"; rev = version; - sha256 = "1wnkx9g0ww4f5pljrb0wzs054jzkig1i5hlz1p509rfvnhc50afp"; + sha256 = "1nish3sbpk0hsag7r4nyx8j6pl9mlgx58v8dhzg2vwj2q32isyb2"; fetchSubmodules = true; }; @@ -40,7 +40,6 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ]; - installFlags = [ "DESTDIR=${placeholder "out"}" ]; buildInputs = [ glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo @@ -54,11 +53,6 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - mv $out/var/empty/* $out - install -Dm755 $out/games/xr_3da $out/bin/xr_3da - install -Dm644 $src/License.txt $out/share/licenses/openxray/License.txt - rm -r $out/var $out/games - # needed because of SDL_LoadObject library loading code wrapProgram $out/bin/xr_3da \ --prefix LD_LIBRARY_PATH : $out/lib diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 9ed7061b196d1..81b5e626c8e87 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2020.725.0"; + version = "2020.801.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "0s7pgqnszz1ahjg4jni7q6009n1xpa46ndzsv179czz4xa09namf"; + sha256 = "02klqc56fskc8r8p3z9d38r1i0rwgglfilb97pdqm1ph8jpr1c20"; }; nativeBuildInputs = [ dotnet-sdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 3e7174d8ad431..a7f2214fb5bb8 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -365,9 +365,14 @@ sha256 = "0fx8698k71vzr8pdc6q8bsbzg6r8a42s4hkzmiyv13ibmyb5q68k"; }) (fetchNuGet { + name = "Microsoft.Diagnostics.NETCore.Client"; + version = "0.2.61701"; + sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1"; + }) + (fetchNuGet { name = "Microsoft.Diagnostics.Runtime"; - version = "1.1.127808"; - sha256 = "14xhiw6h5ck444vrmj79r0ral4dvcrak02ib0v7z0qx2c69vkdmc"; + version = "2.0.137201"; + sha256 = "0cfsd8nn6y30bqzx1pf9xi29jnxap1fgk720zdpz93kqzqv8r0vc"; }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; @@ -581,8 +586,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2020.723.0"; - sha256 = "19cijwky9rq77ba1kpgihl46jclif30bkhnpfj4x17bhwc4f8cs6"; + version = "2020.730.1"; + sha256 = "0hsrb01rhcpan00bwk9zxzgj1ghsgsmx36g7sd8rlygr3v5sfvmr"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -591,8 +596,8 @@ }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2020.715.0"; - sha256 = "1d1zx6n6z1gjvmw12z29hsy9g0iqqipfgs125zmy4ydsx09xb6vc"; + version = "2020.731.0"; + sha256 = "1q58c627p0yz6b2y4c1hrrr4l9hii418y1vk6hv24x1csdsf3x8p"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; @@ -716,18 +721,18 @@ }) (fetchNuGet { name = "Sentry"; - version = "2.1.4"; - sha256 = "11pb6zpgjypfjy5g51anznngr8hcspkj1swgj9rhz8y1dcv5aba7"; + version = "2.1.5"; + sha256 = "094rhsn5rfk7f2ygk6jgv3cq01gv3a8lnqa85l593ys3957j0qhs"; }) (fetchNuGet { name = "Sentry.PlatformAbstractions"; - version = "1.1.0"; - sha256 = "19grscddh2ipp1q7hx3a3bckpxgpfxfffp2shc32jryqyxsba87y"; + version = "1.1.1"; + sha256 = "10mxyxmyjpr0y1ik2j55pp7ifn101sw319cbpf28i2xbfp0cvcaj"; }) (fetchNuGet { name = "Sentry.Protocol"; - version = "2.1.4"; - sha256 = "0mm1a7vxl4raka1917sqshbbxvrf5sxmcba7hjwrmz13cx86l6v0"; + version = "2.1.5"; + sha256 = "1yjgn6na14rr6crmm886x597h9gdjyasgxx3n9m3zn7ig8726mpg"; }) (fetchNuGet { name = "SharpCompress"; @@ -736,8 +741,8 @@ }) (fetchNuGet { name = "SharpCompress"; - version = "0.25.1"; - sha256 = "0nkfflf1wnwgx1n52scnvq38q25khimjz67nwralipgrmwnynnr9"; + version = "0.26.0"; + sha256 = "03cygf8p44j1bfn6z9cn2xrw6zhvhq17xac1sph5rgq7vq2m5iq5"; }) (fetchNuGet { name = "SharpFNT"; @@ -825,6 +830,11 @@ sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; }) (fetchNuGet { + name = "System.Buffers"; + version = "4.5.1"; + sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; + }) + (fetchNuGet { name = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; @@ -850,6 +860,11 @@ sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.7.1"; + sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; + }) + (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; @@ -1075,6 +1090,11 @@ sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) (fetchNuGet { + name = "System.Memory"; + version = "4.5.4"; + sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; + }) + (fetchNuGet { name = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; @@ -1185,6 +1205,11 @@ sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) (fetchNuGet { + name = "System.Reflection.Metadata"; + version = "1.8.1"; + sha256 = "17xxl3m99wa4hcpqy42vl8qb1jk2jfq32rj3sfjc1a46hi2si5jj"; + }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; diff --git a/pkgs/games/sfrotz/default.nix b/pkgs/games/sfrotz/default.nix new file mode 100644 index 0000000000000..6e4839703a1c9 --- /dev/null +++ b/pkgs/games/sfrotz/default.nix @@ -0,0 +1,69 @@ +{ fetchFromGitLab +, freetype +, libao +, libjpeg +, libmodplug +, libpng +, libsamplerate +, libsndfile +, libvorbis +, pkg-config +, SDL2 +, SDL2_mixer +, stdenv +, zlib }: + +stdenv.mkDerivation rec { + pname = "sfrotz"; + version = "2.52"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "DavidGriffith"; + repo = "frotz"; + rev = version; + sha256 = "11ca1dz31b7s5vxjqncwjwmbbcr2m5v2rxjn49g4gnvwd6mqw48y"; + }; + + buildInputs = [ + freetype + libao + libjpeg + libmodplug + libpng + libsamplerate + libsndfile + libvorbis + SDL2 + SDL2_mixer + zlib + ]; + nativeBuildInputs = [ pkg-config ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + buildPhase = "make sdl"; + installTargets = [ "install_sfrotz" ]; + + meta = with stdenv.lib; { + description = + "Interpreter for Infocom and other Z-Machine games (SDL interface)"; + longDescription = '' + Frotz is a Z-Machine interpreter. The Z-machine is a virtual machine + designed by Infocom to run all of their text adventures. It went through + multiple revisions during the lifetime of the company, and two further + revisions (V7 and V8) were created by Graham Nelson after the company's + demise. The specification is now quite well documented; this version of + Frotz supports version 1.0. + + This version of Frotz fully supports all these versions of the Z-Machine + including the graphical version 6. Graphics and sound are created through + the use of the SDL libraries. AIFF sound effects and music in MOD and OGG + formats are supported when packaged in Blorb container files or optionally + from individual files. + ''; + homepage = "https://davidgriffith.gitlab.io/frotz/"; + changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS"; + license = licenses.gpl2; + maintainers = with maintainers; [ ddelabru ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 9724e68a04dfb..6016cc779f193 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -39,7 +39,7 @@ let plugins = { "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz" "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz" ]; - sha256 = "16iq5gmfcgkvcx5hixggxgb8lwin5gjdhnq0zabgpfqg11n2w21q"; + sha256 = "056c04pfsf98nnknphg28l489isqb6y4l2c8g7wqhclwgj7m338i"; }; nativeBuildInputs = [ autoPatchelfHook rpm ]; @@ -69,7 +69,7 @@ let plugins = { "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz" "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz" ]; - sha256 = "1cz4z3wz216s77z185m665jcgdslil5gn4dsi118nv1fm17z3jik"; + sha256 = "1chxdm6smv2d14pn2jl9xyd0vr42diy7vpskd3b9a61gf5h3gj03"; }; installPhase = '' cd plugins @@ -99,7 +99,7 @@ let plugins = { "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz" "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz" ]; - sha256 = "12rivh00n9mhagy5yjl1m0bv7ypbig6brqkxm0a12xy0mjq7yv8y"; + sha256 = "1xnbmb2rn610kqpg1x6k1cc13zlmx2f3l2xnj6809rnhg96qqn20"; }; installPhase = '' cd plugins @@ -129,7 +129,7 @@ let plugins = { "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz" "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz" ]; - sha256 = "1ran75zsxcdci00jakngkz6p9lj4q483hjapmf80p68rzhpmdr5y"; + sha256 = "00qfdgs03k7bbs67zjrk8hbxvlyinsmk890amp9cmpfjfzdxgg58"; }; installPhase = '' cd plugins @@ -162,7 +162,7 @@ let plugins = { "https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz" "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz" ]; - sha256 = "1ffddf488c5fc1eb39452499951bd13a2dc1971980c0551176076c81af363038"; + sha256 = "0fn4lz4g0a8l301v6yv7fwl37wgwhz5y90nf681f655xxc91hqh7"; }; nativeBuildInputs = [ autoPatchelfHook rpm ]; @@ -199,7 +199,7 @@ let plugins = { "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz" "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz" ]; - sha256 = "1l0y4dy88y91jdq66pxrxqmiwsxwy0rd7x4bh0cw08r4iyhjqprz"; + sha256 = "0jssigsgkxb9i7qa7db291a1gbvwl795i4ahvb7bnqp33czkj85k"; }; installPhase = '' cd plugins diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 1dd09852d27c6..71108c9c68996 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2 -, libxml2, libglade, intltool, xorg, makeWrapper, gle +, libxml2, libglade, intltool, xorg, makeWrapper, gle, gdk-pixbuf, gdk-pixbuf-xlib , forceInstallAllHacks ? false }: @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender - libXxf86misc intltool xorg.appres makeWrapper gle + libXxf86misc intltool xorg.appres makeWrapper gle gdk-pixbuf + gdk-pixbuf-xlib ]; preConfigure = diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ec6f38d736ba2..5d08a807247d4 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-07-30"; + version = "2020-08-01"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "e03e24c091c601a821379d259191583b39bcf23e"; - sha256 = "1pwshkvwwidnqkxirrixhkldx0pry1rrhplc9nl73h7qy2qmllq4"; + rev = "316c7c7372ad6f34e439944713655ccff2123f40"; + sha256 = "1qrj9zyb9y03ki0ivj4agjg2wn5jbymy39icxg33xp8bjf2wra5m"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -269,12 +269,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-07-20"; + version = "2020-08-03"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "0f4a877a901cc04c226cdf1aad98948fb6ee47b8"; - sha256 = "06kjsmjk8vg7gamg1647injw7a5m12571hjwvvfsamjvdbfhr3nm"; + rev = "bc736aa8c7aa0cc8a66c1294695f73a3fd9d6931"; + sha256 = "0zb6f0xsrdxjg7fn3iz76gs5md0qnz359zq8l6zkgf3sqjy1gcag"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -401,12 +401,12 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-07-30"; + version = "2020-08-03"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "7657fba23cacc7e05168e70e8e6ccfafd437fdce"; - sha256 = "1zzmhc70yf8nc7jkq5414rs5sd9cafxcgpqw9xbpkbhawjx4hknj"; + rev = "ca077f82959f34cb2859c6202736f00b747cd210"; + sha256 = "0alq3sr00j50zha2cf3dak5vx92dhspx5cb61x48ql8y83cqpfb3"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -605,12 +605,12 @@ let coc-rust-analyzer = buildVimPluginFrom2Nix { pname = "coc-rust-analyzer"; - version = "2020-07-29"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "23d5b46ff6e459d246d6f194ab3df97f5db2f41d"; - sha256 = "1gvm61jfnyk8mmsncknmnb9mhkz52fl8gnisj856x9phn8fq5cf9"; + rev = "96a5021780df3fe03ecec32aa412df81ba5fb1ec"; + sha256 = "0rkh5dj4hjh1kq1z651m5vf16mcil1d3hv5nqnyyrrj6x9m6y0zz"; }; meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; }; @@ -653,12 +653,12 @@ let coc-spell-checker = buildVimPluginFrom2Nix { pname = "coc-spell-checker"; - version = "2020-05-15"; + version = "2020-08-01"; src = fetchFromGitHub { owner = "iamcco"; repo = "coc-spell-checker"; - rev = "bc9802c667aac992fab2f47b0da096c28dca0dfd"; - sha256 = "1fsjf07w0z9l2zra46krpg1d6qxg51niz9zmxas66si90qb2j3d7"; + rev = "c1fe3de47f6ba93d4c44b514e530517c19a75880"; + sha256 = "1yvcbfrd5lxgmxbvphpbzcw8ni6zjqmg2flkrvnz59b9rmafn8dg"; }; meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; @@ -846,12 +846,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-07-29"; + version = "2020-08-02"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "b3d8cd0ce39bc646d8edb2d0d16dafc60de659dd"; - sha256 = "0l1vpiy4lanwfq9jjxw2j1j2z9cj7rzdpks098y0w09ri28vkldx"; + rev = "b354c7fcfadac3170db696d47d8e7edb478ba4f0"; + sha256 = "0fhn6r6w7slvd24akm27ylf9fmdi0rgcv86c0zl53kzc1pkz4a01"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -882,12 +882,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2020-07-23"; + version = "2020-08-02"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "7a657308f3e985ddc47d3f3ab383b4eaa4c24e16"; - sha256 = "1z2z13vkp881q561cdggycng0m89m13f658z0qrn0cbxlyid7aai"; + rev = "d9d514db3ef7fcf36bacc402aba511663a73bfbc"; + sha256 = "0pb4ysv1nhgccb5plgidv0mj9vrxl95vzsvy5771bmaqiw3srnxf"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -918,12 +918,12 @@ let cpsm = buildVimPluginFrom2Nix { pname = "cpsm"; - version = "2018-09-08"; + version = "2020-08-01"; src = fetchFromGitHub { owner = "nixprime"; repo = "cpsm"; - rev = "900023c56dfdd200841d5c2f2f7000f332d2614f"; - sha256 = "1p1ry11f39fcz32i3b3p0p8n99qrnvrx4d7p0123123dj7wbxk3p"; + rev = "42cfb0f83083b33640619c208341629bff67bd8a"; + sha256 = "0wcq442wj73ra0agflljjkhcwlma7r703l7l9hn7zd8wfb4iv48s"; }; meta.homepage = "https://github.com/nixprime/cpsm/"; }; @@ -1026,12 +1026,12 @@ let defx-icons = buildVimPluginFrom2Nix { pname = "defx-icons"; - version = "2020-07-25"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "defx-icons"; - rev = "e150053498e6583ec95513e44ceb122209a86831"; - sha256 = "1yw44ima60jq05p0m0mpxsybr53655w98kg2d6srsqswd8ivcapl"; + rev = "8a8feea660488c70defd5706229cacd69fb34642"; + sha256 = "175bi9aj8sg83r4yvfbvcd7kwjrb3b791ifi8zw4i7l9x2z0nnlm"; }; meta.homepage = "https://github.com/kristijanhusak/defx-icons/"; }; @@ -1086,12 +1086,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-07-29"; + version = "2020-08-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "ee43e5b08009072b46a17905d2ccfcb15f79224d"; - sha256 = "1vqzi9rxlb5flgy0yc4lh9q0fvhl3b1a4xi1dganz46wnwyv2r24"; + rev = "7df7851826a1e8417a9b242d4ce3bd09ae1c6298"; + sha256 = "1rf5qir9ybk1l7bb63xkprssa8jpsiap26yn6k3xy2drfvbrlika"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1655,12 +1655,12 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2020-07-30"; + version = "2020-08-03"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "dd9bef92c6e51ec1e26dfca46f81fe3b6b997a51"; - sha256 = "07whrk46v2f10pb4xjz9g5iz43vr8q8mibcnns52qxgp0wg7iid6"; + rev = "2069a081cb83aab8ed5e275a97aa178a30cf47a0"; + sha256 = "1xj95c2hhlalf2zjp2qh414dr50cp3gly8zk4bsk82v65rdwcqv1"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -1689,6 +1689,18 @@ let meta.homepage = "https://github.com/gregsexton/gitv/"; }; + golden-ratio = buildVimPluginFrom2Nix { + pname = "golden-ratio"; + version = "2020-04-03"; + src = fetchFromGitHub { + owner = "roman"; + repo = "golden-ratio"; + rev = "8313b6d6723c9e77ef1d3760af2cdd244e8db043"; + sha256 = "03nm1wr0qsrirg4z4171f4nygnqgb6w06ldr6rbbz4a1f7j8j654"; + }; + meta.homepage = "https://github.com/roman/golden-ratio/"; + }; + gotests-vim = buildVimPluginFrom2Nix { pname = "gotests-vim"; version = "2019-04-10"; @@ -2004,12 +2016,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-07-24"; + version = "2020-07-31"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "55de0682851c1065f67665a205b19d707d2e0d3b"; - sha256 = "1b2pib00nz21582lm1km1wqdl0dazv7bg3jdgqy17n3pd6bsi11l"; + rev = "ead61b0ff9e26365a977280298b22bad40c9fba5"; + sha256 = "05p5kxkdh4y1s8532d1d8zilq9hy098bwx3lyrsqpxj0n2kr2q0d"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2100,12 +2112,12 @@ let lexima-vim = buildVimPluginFrom2Nix { pname = "lexima-vim"; - version = "2020-07-28"; + version = "2020-07-31"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "a0c465054ab1965353c8c3946955b3c15592d098"; - sha256 = "1vyps74zx4iy3lalxpfhrlm8h56zwd7cdnsaqza00l6m1ayj0w3r"; + rev = "89bf4dc13539131a29cf938074b3f1ce9d000bfd"; + sha256 = "19b73r3v4i64kiijihzqlbj6bf6jd1w90qc7d3lg95iwlaczd8v0"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -2160,12 +2172,12 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-07-01"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "77eb9c67d3d7cc14f11d68e865e3540fcc56fdbe"; - sha256 = "1c1aznfs297846f0w6f67sx4fdk9pxxalayfz1dcwabbfq785g6p"; + rev = "deac5994a0bf6795b743d444dde11a407416ddc7"; + sha256 = "0y6cill4pwck6ajm55br2prhgj928yb94dq2wxxsrk6xw2mn0y79"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -2520,12 +2532,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-07-26"; + version = "2020-08-02"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "751baf4c8e16ffb800a179a229950036cf08ce61"; - sha256 = "1rljhh48bzx84n3411awsdjzw859li0gkrkmvbg72vwsyq73bpxk"; + rev = "2721992fa64b0c26031f514f7cce4f6b1399427f"; + sha256 = "0fp6r5zw3hn0wg6fhk1f90qcmamnxx18rwjx173d7rqap375pfgg"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2580,12 +2592,12 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-07-10"; + version = "2020-08-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "16cddad16ba27fb1205d601c97d499be7d408b68"; - sha256 = "0j459nxzdrx5mcgzyf9hai8zbn2mbdnilsn3vz4rg68ccngjlz68"; + rev = "b4c470b7e720fa061ac118a09420bc2da16610bd"; + sha256 = "1d27rhyd5db0vd72gi6dl34g4axsz66d0l0fgw5g6grawlpf8w6l"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -2688,12 +2700,12 @@ let neuron-vim = buildVimPluginFrom2Nix { pname = "neuron-vim"; - version = "2020-07-29"; + version = "2020-07-31"; src = fetchFromGitHub { owner = "ihsanturk"; repo = "neuron.vim"; - rev = "b7b208934c6a5d2949168a80d6ffcc67b53995a3"; - sha256 = "01favdpjba3d4fd9a1ypiv0vfv2dmb21z43baj5kl69nfpzva794"; + rev = "9a1077044a5421a50d59ef271613cde05c5dd98d"; + sha256 = "1wp0mj2ji6kxfbw1vk055rbyrmgrb0jglgi24rbj22ba24hgxv8y"; }; meta.homepage = "https://github.com/ihsanturk/neuron.vim/"; }; @@ -2808,12 +2820,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-07-29"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "5202b7b0986b2a4be8b14e02010fd7390575d775"; - sha256 = "1fya0fxpas21i38x93gjhr7p6jy78gzajsxs11xmc2r5xcj0n9q8"; + rev = "124ff3bf5680e746dc4d504f67a1b437fcb50365"; + sha256 = "1y41w6asd7hf0nx0h48556w8hchiqgfvskdp1z0fdcgjcimpp805"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3048,12 +3060,12 @@ let quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2020-06-18"; + version = "2020-07-31"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "03f047175fc3bd3ed9828ccec48b646bc53ab204"; - sha256 = "11wh5jy7b1ncqbgc0nmip38zhz9halglaa3bw9da4qk5fp6xr1a4"; + rev = "64a5e6f9791e75f4d87b176d5c11f31041aa4169"; + sha256 = "1b1s8jmfip40s9m466c78jczp22dq2brbsnmdaz7gc1fgxyb5858"; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; }; @@ -3322,6 +3334,18 @@ let meta.homepage = "https://github.com/tmhedberg/SimpylFold/"; }; + skim-vim = buildVimPluginFrom2Nix { + pname = "skim-vim"; + version = "2019-07-31"; + src = fetchFromGitHub { + owner = "lotabout"; + repo = "skim.vim"; + rev = "4e9d9a3deb2060e2e79fede1c213f13ac7866eb5"; + sha256 = "0vpfn2zivk8cf2l841jbd78zl1vzdw1wjf9p0dm6pgr84kj9pkx4"; + }; + meta.homepage = "https://github.com/lotabout/skim.vim/"; + }; + sky-color-clock-vim = buildVimPluginFrom2Nix { pname = "sky-color-clock-vim"; version = "2018-11-03"; @@ -3541,12 +3565,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-07-30"; + version = "2020-08-03"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "3fe9d8e13b7a9e82ae612c8a12b35a3c6653e9da"; - sha256 = "0s4s20x5a2nb35fcvs4mbr5vql8diwc8bmbi6qa7vq2clvkf6smg"; + rev = "a5090717dd8862be0a47a96731c6120ace544fe1"; + sha256 = "1iz26xj3mrshj0n6gpqa9xbk0i3lr0383bqdrq0yk0lp32ys5gh0"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -4070,12 +4094,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-07-28"; + version = "2020-08-03"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "2a027e992d44e47ea3f176692fe948d3145eab54"; - sha256 = "0k427xhwdjljy716w06kgdkkrfygv3hw7r0j8l8yvymasq1lz6hn"; + rev = "ffa44b832767674ab536a737668f3358fab4d5ea"; + sha256 = "081rl70ya1qrnqkq1za1zpvngpjhpr69vdbpj7r8qlma29wq2pf5"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4238,12 +4262,12 @@ let vim-bufkill = buildVimPluginFrom2Nix { pname = "vim-bufkill"; - version = "2020-04-29"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "qpkorr"; repo = "vim-bufkill"; - rev = "1bcdcb4a03a6ac1de06bc84b7f94ca08f4485f42"; - sha256 = "0j3r63j2vs0lm1vnfzwcwqbahncnqq46wmaf1rp8i9l8skqm20px"; + rev = "2bd6d7e791668ea52bb26be2639406fcf617271f"; + sha256 = "1cvma03bg9psil67kg1x90lny7a31ljz5shybcl1jrfpzsybcqvg"; }; meta.homepage = "https://github.com/qpkorr/vim-bufkill/"; }; @@ -4694,12 +4718,12 @@ let vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2020-01-16"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "33e875b31c8b811a0a47908884a5e2339106bbe8"; - sha256 = "1xadb22kd40swmww0qxmmkcpcq6viy8l167pjck5q32hfngll5d3"; + rev = "36c5974a74b202ade1eb40dabd134afb2fdfdbe0"; + sha256 = "123ck8c9icl70g19zkjm33vaip9ky09zc9z7c2np554q2kncjppm"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -4814,12 +4838,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-07-30"; + version = "2020-07-31"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "66d05edf291e9f9ce1003fad849c5d6a46c029ac"; - sha256 = "1dsfn41fhpjc1aznd0g4b70adkqmp1ww47107g1f9w6hbwgcy4cj"; + rev = "44fbe6dc6da4c6255b92d0a013f66261c7d9695b"; + sha256 = "1m3arkknpbb8c1ylcrnpjqlwym8am43qxhivkqymi7d93hcsrshc"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -4862,12 +4886,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-07-27"; + version = "2020-07-31"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "9b6a24b13166feee0cc83e2cc40e2ddb31bcc2a1"; - sha256 = "0rs1v863d5kxz2mn6xgkj06jsjdlrbfp0srp2z52qrc4pqlxkf81"; + rev = "260182c65cae653ac20e6a69ba8cc6124e7ba6c2"; + sha256 = "14dmar7d9qajjk2vy223mw7gwdcz548lcj5jg8pg7j4cyc6ffbyp"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5991,12 +6015,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-07-20"; + version = "2020-08-02"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "b2133cf2ec935c55de0c3a306a6b7dc3546226da"; - sha256 = "09xmrbbbchpfqliddi24yn4b63akxidscvjzwi01ilb0s9xnxz24"; + rev = "457bebcd30cbfca8b34b0d308f882b7b605714fc"; + sha256 = "18yj35qh3xqpjv1dd78m1wj7hkma3rv8qnfsnamhzafjwnf013sa"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -6075,12 +6099,12 @@ let vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-06-03"; + version = "2020-07-31"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "9d52746c3f879aa1aca4deb46edd63823d76d89d"; - sha256 = "1yx1rnpln0lxvf6pbdn8yyxiyhi7rfl8wl94kd8djk51h5lhq1n3"; + rev = "21d8d9a9db864f230a2d12d5076351daf20d7a44"; + sha256 = "0s6mi1mzlk40sfdqghdsv709fs89hf9d6iqaw3arzs9lmin2i4ka"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -6157,6 +6181,18 @@ let meta.homepage = "https://github.com/racer-rust/vim-racer/"; }; + vim-rails = buildVimPluginFrom2Nix { + pname = "vim-rails"; + version = "2020-06-19"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-rails"; + rev = "187742a3c18d93e6968f024d7db0f4fc5548408e"; + sha256 = "132rvyn5pwg5xkm6q64k33vm6q9hfpng0wq25387l8l8a7hvj3az"; + }; + meta.homepage = "https://github.com/tpope/vim-rails/"; + }; + vim-repeat = buildVimPluginFrom2Nix { pname = "vim-repeat"; version = "2019-11-13"; @@ -6207,12 +6243,12 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2020-07-25"; + version = "2020-08-03"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "3e4a8c5bfa3631516cc2b79672fe958455bfb098"; - sha256 = "0ai3yjfzb8jnc132q8543zn7w37lhbss3s21pmsfza7lx1vp088h"; + rev = "fe2e520c62dfe10b9bc192b6c2651ef0519b1070"; + sha256 = "1xh6h5wg242mzqshka5m3693r25www46p29cr92yi995a2izm2fw"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -6435,12 +6471,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-07-27"; + version = "2020-08-01"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "ab824142634fb0e9dc8a455356a15730f48361f0"; - sha256 = "1fvr03a46x3nq8cafxqb95a97c5x0cynvcz8hw8x0j8gml6x86bz"; + rev = "2a273f1914489b5f199b68607e5e37c0025a9c35"; + sha256 = "05yxh3hjya35pp4hgyq6i3nxnb2nl12lzv2mmzp046qzsg3b6yiq"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6591,12 +6627,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2020-07-27"; + version = "2020-08-02"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "5c489b57e8bc34f2a4bf58c28fadbb021dcc1a4f"; - sha256 = "0na5xbmggvrvs5wv9m5nfs1kkdvgm36zmbvmymmcf8kfqv5dxh5p"; + rev = "88cb2e44b60f4fa7d2e242c43ee90c5f6079e82c"; + sha256 = "1ny17d30pk8z96zr8qh9g04n57ix4pjm3sg0a80b2qq82anxkmvs"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -6652,12 +6688,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-07-25"; + version = "2020-08-03"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "260b4f0ccbca78aff50b9d0ba0945ce92e07e1d6"; - sha256 = "084ivslydffayz9f1vglb9fnds4yakj6anrnvbwcyj27kcg1s7c5"; + rev = "007972e224a995018f76f5f71c61d2c0b75e265e"; + sha256 = "0370wx3p96v0p4cngm28x12djwl9mwz2kxaanj9svzg3nph19c1x"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -6904,12 +6940,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-07-30"; + version = "2020-08-02"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "a1dca9d03a5f235363c0d0dea5818dc320b649d6"; - sha256 = "0wh00hv1hwvbzqqws1xr4hv5c9llxkqbq2fbkprvizix1s6jvm7q"; + rev = "cb994375fcbf032adfef6d31d8fcfa59bab381c8"; + sha256 = "0lm9wcbkwr91b85gdf5qa9f3svdyn97j6xpl7nqa7jzcvdhdfz5c"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6928,12 +6964,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-07-28"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "fa8586f6f9ccff07cbe68642b51c95740c25019e"; - sha256 = "02ki9jdjvan2vnbk2r6fdj3q80q7a8iw5ymm10348qjyhwf7m0q1"; + rev = "2762e090c540ab07dc00e57cfe578337f11ab0df"; + sha256 = "1ckfi2a6sp3n3b6hnk4qjvv411ij349qlj3cyx3b2l8vfg0qmwyw"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -7180,12 +7216,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-07-30"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "bcd722ccfaf736154b583b59852c3488d8eb22d5"; - sha256 = "0zvddfqyc2r14xbv77nxbx3lvhfcqb7ylbyjip86kz7i8aj984lx"; + rev = "4c9c05fdbda05ed242e58dd9c9582d8722146ed5"; + sha256 = "1my1vfffzn0pmba9ziyfwxs39pj4yrwsy3spxyhzi118drldkqnc"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7228,12 +7264,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-07-17"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "de344a69ee01eef8a905660cd793173698fa62dd"; - sha256 = "1ngh9nal0p0xgd9xzsalirdc59kqxssx8dax97jcasmxqrp8wf8h"; + rev = "7eabcd619528be9d26f20a1400cecc8e94d7e556"; + sha256 = "01ikhpz0rw1zyg748cqj6sgil29gha2q157dsirfg0f7xjrqlz5q"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index e2dfa7b4a0c9a..7f1935f574a4c 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -462,6 +462,10 @@ self: super: { dependencies = [ self.fzfWrapper ]; }); + skim-vim = super.skim-vim.overrideAttrs(old: { + dependencies = [ self.skim ]; + }); + sved = let # we put the script in its own derivation to benefit the magic of wrapGAppsHook svedbackend = stdenv.mkDerivation { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index fe323e6f8f653..79c0d1428b1d9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -172,7 +172,7 @@ jeetsukumaran/vim-indentwise jeffkreeftmeijer/neovim-sensible jeffkreeftmeijer/vim-numbertoggle jelera/vim-javascript-syntax -jgdavey/tslime.vim +jgdavey/tslime.vim@main jhradilek/vim-docbk jhradilek/vim-snippets as vim-docbk-snippets jiangmiao/auto-pairs @@ -247,6 +247,7 @@ lilydjwg/colorizer liuchengxu/vim-which-key liuchengxu/vista.vim LnL7/vim-nix +lotabout/skim.vim LucHermitte/lh-brackets LucHermitte/lh-vim-lib ludovicchabant/vim-gutentags @@ -435,6 +436,7 @@ rhysd/vim-grammarous rhysd/vim-operator-surround rodjek/vim-puppet romainl/vim-cool +roman/golden-ratio ron89/thesaurus_query.vim roxma/nvim-cm-racer roxma/nvim-completion-manager @@ -526,6 +528,7 @@ tpope/vim-liquid tpope/vim-obsession tpope/vim-pathogen tpope/vim-projectionist +tpope/vim-rails tpope/vim-repeat tpope/vim-rhubarb tpope/vim-rsi diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index af9237d1d833f..0783fb7929691 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -93,11 +93,11 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "03yn96kxs53vxcbza17y99rdhbjlybv44gkc90vaj6301grxahnp"; + sha256 = "0hpqxwqbbqn440c2swpnc06z8dskisrli4ynsxrzzqyp0dan46xw"; }; # libfwupd goes to lib diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index a9d0cf4516880..cab11cc87ae2c 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -53,6 +53,11 @@ , ... }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + assert stdenv.isLinux; let diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 4481efef588b0..f6070e77d4c32 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -14,11 +14,6 @@ "sha256": "16h3iiqf6z8v6bbymxrp36w15qil5lfr6y48vwh99dx1yyrgdyzp", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.54.a/linux-hardened-5.4.54.a.patch" }, - "5.6": { - "name": "linux-hardened-5.6.19.a.patch", - "sha256": "0gxdbcig6hpjxj6qr4lrj773gb76s0xlkrk3hclxk4ms6p82y4mm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.19.a/linux-hardened-5.6.19.a.patch" - }, "5.7": { "name": "linux-hardened-5.7.11.a.patch", "sha256": "0vamaqrcs8nq8pjgq86lrxq0cdkr5kp4vydp8z2sr27q7ninnrla", diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index e623a9c56f821..0a35cc20680cf 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.190"; + version = "4.14.192"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0h9zxm8l8hn19x7n31z3185y2frh5ij8lidyffx1a2pgjcvml5vg"; + sha256 = "1lgrs3mx89v9n7d3d2k8gvln62mjfpqhz9bd2iqgqn8mkxrv1dfj"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 68733f185c47b..39249086b17b8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.135"; + version = "4.19.137"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "165g6agfvjxi5qi9gm5ilnfn6d01shjwypia3n4370i5lv5cxmrk"; + sha256 = "0nbc930k6vn715k8dcnnv8pp1mnk76iagakvy1ky5przx7gkdy0q"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 740e6e014f529..ba03af8696a4a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.231"; + version = "4.4.232"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1c6p5hv18isa328pvpa3qmmsg4qsssf2mwsx3hzn489rb8ycdxp7"; + sha256 = "0d7x30sy9c27n9bqf5f5mf64c6j5iljnw1gm7g8z00xgvrjqibjf"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 41347d33ee5aa..38353cc332304 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.231"; + version = "4.9.232"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1sz8xk767yy4lxqvy4229yrgkwnm43hdrbr54aa1flns5yh3p12g"; + sha256 = "0q2gpkazfw93r79aq21kv1y3hwxawl0swyvd3nd73p254gl75x2q"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 3bef7aac9ccda..90f199f4026d6 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.54"; + version = "5.4.56"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0xzlvd9h9vf9m9x088kacwd25whn1anq4bxpd3bg9s5c1r7a3qh3"; + sha256 = "1bbwqpcv8ha25kk1shfnsb2j8ydhcjkzq0w4xmimdv40hjwr10ri"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix deleted file mode 100644 index 478cdf71bf444..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "5.6.19"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1s0yc1138sglbm4vyizl4r7hnc1l7nykdjp4063ad67yayr2ylv2"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix index 43b05c8925d9b..1493a5e6b5d20 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.11"; + version = "5.7.13"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1wb0xm9srkrzrrs6zi7ydykyiwn0247r3z9axf79khqkm8r30ack"; + sha256 = "0qljqj5kv1yhyagkjw79xpgwpkwm1dgz0v22aw3nq3ar51lwl33j"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 76869bfde5b18..553b0b87f4142 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { pname = "keyutils"; version = "1.6.1"; diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index 84a0f4a10d5f1..79048064eccb4 100644 --- a/pkgs/os-specific/linux/linuxptp/default.nix +++ b/pkgs/os-specific/linux/linuxptp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "linuxptp"; - version = "2.0"; + version = "3.0"; src = fetchurl { url = "mirror://sourceforge/linuxptp/${pname}-${version}.tgz"; - sha256 = "0zcw8nllla06451r7bfsa31q4z8jj56j67i07l1azm473r0dj90a"; + sha256 = "11aps4bc0maihldlb2d0yh2fnj6x4vwjad337kszyny74akyqk6p"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index cda9c9c066a23..a76156a985ce0 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap , curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor -, audit, lz4, bzip2, libmicrohttpd, pcre2 +, audit, lz4, bzip2, pcre2 , linuxHeaders ? stdenv.cc.libc.linuxHeaders , iptables, gnu-efi, bashInteractive , gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 @@ -90,7 +90,7 @@ in stdenv.mkDerivation { buildInputs = [ linuxHeaders libcap curl.dev kmod xz pam acl /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2 - libmicrohttpd pcre2 ] ++ + pcre2 ] ++ stdenv.lib.optional withKexectools kexectools ++ stdenv.lib.optional withLibseccomp libseccomp ++ [ libffi audit lz4 bzip2 libapparmor @@ -120,6 +120,7 @@ in stdenv.mkDerivation { "-Dhostnamed=true" "-Dnetworkd=true" "-Dportabled=false" + "-Dremote=false" "-Dsysusers=false" "-Dtimedated=true" "-Dtimesyncd=true" diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index c23c37aa56d07..6a46db0dbac66 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -12,11 +12,11 @@ let # we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt in stdenv.mkDerivation rec { pname = "v4l-utils"; - version = "1.18.1"; + version = "1.20.0"; src = fetchurl { url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0hpkqm2bpg1ma2shjzcf6xsrpyjd8h5cakgh8a3iyh126wjl5z15"; + sha256 = "1xr66y6w422hil6s7n8d61a2vhwh4im8l267amf41jvw7xqihqcm"; }; outputs = [ "out" ] ++ lib.optional withUtils "lib" ++ [ "dev" ]; diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index 9845e1e5ebdfe..7a1c2d1cec96f 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "xpadneo"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "atar-axis"; @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { export sourceRoot=$(pwd)/source/hid-xpadneo/src ''; + postPatch = '' + # Set kernel module version + substituteInPlace hid-xpadneo.c \ + --subst-var-by DO_NOT_CHANGE ${version} + ''; + nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ bluez ]; diff --git a/pkgs/pkgs-lib/default.nix b/pkgs/pkgs-lib/default.nix new file mode 100644 index 0000000000000..113dcebf8c68b --- /dev/null +++ b/pkgs/pkgs-lib/default.nix @@ -0,0 +1,11 @@ +# pkgs-lib is for functions and values that can't be in lib because +# they depend on some packages. This notably is *not* for supporting package +# building, instead pkgs/build-support is the place for that. +{ lib, pkgs }: { + # setting format types and generators. These do not fit in lib/types.nix, + # because they depend on pkgs for rendering some formats + formats = import ./formats.nix { + inherit lib pkgs; + }; +} + diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix new file mode 100644 index 0000000000000..14589f8ecdc3a --- /dev/null +++ b/pkgs/pkgs-lib/formats.nix @@ -0,0 +1,109 @@ +{ lib, pkgs }: +rec { + + /* + + Every following entry represents a format for program configuration files + used for `settings`-style options (see https://github.com/NixOS/rfcs/pull/42). + Each entry should look as follows: + + <format> = <parameters>: { + # ^^ Parameters for controlling the format + + # The module system type most suitable for representing such a format + # The description needs to be overwritten for recursive types + type = ...; + + # generate :: Name -> Value -> Path + # A function for generating a file with a value of such a type + generate = ...; + + }); + */ + + + json = {}: { + + type = with lib.types; let + valueType = nullOr (oneOf [ + bool + int + float + str + (attrsOf valueType) + (listOf valueType) + ]) // { + description = "JSON value"; + }; + in valueType; + + generate = name: value: pkgs.runCommandNoCC name { + nativeBuildInputs = [ pkgs.jq ]; + value = builtins.toJSON value; + passAsFile = [ "value" ]; + } '' + jq . "$valuePath"> $out + ''; + + }; + + # YAML has been a strict superset of JSON since 1.2 + yaml = {}: + let jsonSet = json {}; + in jsonSet // { + type = jsonSet.type // { + description = "YAML value"; + }; + }; + + ini = { listsAsDuplicateKeys ? false, ... }@args: { + + type = with lib.types; let + + singleIniAtom = nullOr (oneOf [ + bool + int + float + str + ]) // { + description = "INI atom (null, bool, int, float or string)"; + }; + + iniAtom = + if listsAsDuplicateKeys then + coercedTo singleIniAtom lib.singleton (listOf singleIniAtom) // { + description = singleIniAtom.description + " or a list of them for duplicate keys"; + } + else + singleIniAtom; + + in attrsOf (attrsOf iniAtom); + + generate = name: value: pkgs.writeText name (lib.generators.toINI args value); + + }; + + toml = {}: json {} // { + type = with lib.types; let + valueType = oneOf [ + bool + int + float + str + (attrsOf valueType) + (listOf valueType) + ] // { + description = "TOML value"; + }; + in valueType; + + generate = name: value: pkgs.runCommandNoCC name { + nativeBuildInputs = [ pkgs.remarshal ]; + value = builtins.toJSON value; + passAsFile = [ "value" ]; + } '' + json2toml "$valuePath" "$out" + ''; + + }; +} diff --git a/pkgs/pkgs-lib/tests/default.nix b/pkgs/pkgs-lib/tests/default.nix new file mode 100644 index 0000000000000..f3549ea9b0f2c --- /dev/null +++ b/pkgs/pkgs-lib/tests/default.nix @@ -0,0 +1,7 @@ +# Call nix-build on this file to run all tests in this directory +{ pkgs ? import ../../.. {} }: +let + formats = import ./formats.nix { inherit pkgs; }; +in pkgs.linkFarm "nixpkgs-pkgs-lib-tests" [ + { name = "formats"; path = import ./formats.nix { inherit pkgs; }; } +] diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix new file mode 100644 index 0000000000000..bf6be8595e1ba --- /dev/null +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -0,0 +1,157 @@ +{ pkgs }: +let + inherit (pkgs) lib formats; +in +with lib; +let + + evalFormat = format: args: def: + let + formatSet = format args; + config = formatSet.type.merge [] (imap1 (n: def: { + value = def; + file = "def${toString n}"; + }) [ def ]); + in formatSet.generate "test-format-file" config; + + runBuildTest = name: { drv, expected }: pkgs.runCommandNoCC name {} '' + if diff ${drv} ${builtins.toFile "expected" expected}; then + touch $out + else + echo "Got: $(cat ${drv})" + echo "Should be: ${expected}" + exit 1 + fi + ''; + + runBuildTests = tests: pkgs.linkFarm "nixpkgs-pkgs-lib-format-tests" (mapAttrsToList (name: value: { inherit name; path = runBuildTest name value; }) (filterAttrs (name: value: value != null) tests)); + +in runBuildTests { + + testJsonAtoms = { + drv = evalFormat formats.json {} { + null = null; + false = false; + true = true; + int = 10; + float = 3.141; + str = "foo"; + attrs.foo = null; + list = [ null null ]; + }; + expected = '' + { + "attrs": { + "foo": null + }, + "false": false, + "float": 3.141, + "int": 10, + "list": [ + null, + null + ], + "null": null, + "str": "foo", + "true": true + } + ''; + }; + + testYamlAtoms = { + drv = evalFormat formats.yaml {} { + null = null; + false = false; + true = true; + float = 3.141; + str = "foo"; + attrs.foo = null; + list = [ null null ]; + }; + expected = '' + { + "attrs": { + "foo": null + }, + "false": false, + "float": 3.141, + "list": [ + null, + null + ], + "null": null, + "str": "foo", + "true": true + } + ''; + }; + + testIniAtoms = { + drv = evalFormat formats.ini {} { + foo = { + bool = true; + int = 10; + float = 3.141; + str = "string"; + }; + }; + expected = '' + [foo] + bool=true + float=3.141000 + int=10 + str=string + ''; + }; + + testIniDuplicateKeys = { + drv = evalFormat formats.ini { listsAsDuplicateKeys = true; } { + foo = { + bar = [ null true "test" 1.2 10 ]; + baz = false; + qux = "qux"; + }; + }; + expected = '' + [foo] + bar=null + bar=true + bar=test + bar=1.200000 + bar=10 + baz=false + qux=qux + ''; + }; + + testTomlAtoms = { + drv = evalFormat formats.toml {} { + false = false; + true = true; + int = 10; + float = 3.141; + str = "foo"; + attrs.foo = "foo"; + list = [ 1 2 ]; + level1.level2.level3.level4 = "deep"; + }; + expected = '' + false = false + float = 3.141 + int = 10 + list = [1, 2] + str = "foo" + true = true + + [attrs] + foo = "foo" + + [level1] + + [level1.level2] + + [level1.level2.level3] + level4 = "deep" + ''; + }; +} diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 0c236fe93155b..98947bd1873ca 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - sha256 = "1h0x5xd13j8xxrrinb7d55851m6n9w0r15wx9m3c50dk7qngldm3"; + sha256 = "0n3vy84kczvbwbzmr1d2c9lh3im77gz83wczj0im4zs91kpw81rc"; }; nativeBuildInputs = [ pkgconfig protobuf ]; diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index 84ecc01eb42fc..3fd126d567062 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gortr"; - version = "0.14.5"; + version = "0.14.6"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "08nbvw5pqd8wdd8vrsr4d50zfqwg175brh7m0pvv4165gnv8k5bf"; + sha256 = "1z1z4xl39qmd7df1zb2wsd2ycxr4aa9g23sfgp3ws4lhy5d6hyxw"; }; vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b1f5ddcbb8150..59fb12e7dd1fc 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.113.0"; + version = "0.113.3"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; @@ -93,7 +93,7 @@ "bond" = ps: with ps; [ ]; # missing inputs: bond-home "braviatv" = ps: with ps; [ bravia-tv]; "broadlink" = ps: with ps; [ broadlink]; - "brother" = ps: with ps; [ ]; # missing inputs: brother + "brother" = ps: with ps; [ brother]; "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan "browser" = ps: with ps; [ ]; "brunt" = ps: with ps; [ ]; # missing inputs: brunt @@ -173,7 +173,7 @@ "dlib_face_detect" = ps: with ps; [ face_recognition]; "dlib_face_identify" = ps: with ps; [ face_recognition]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 - "dlna_dmr" = ps: with ps; [ ]; # missing inputs: async-upnp-client + "dlna_dmr" = ps: with ps; [ async-upnp-client]; "dnsip" = ps: with ps; [ aiodns]; "dominos" = ps: with ps; [ aiohttp-cors]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow]; # missing inputs: pydoods @@ -212,7 +212,7 @@ "emoncms_history" = ps: with ps; [ ]; "emulated_hue" = ps: with ps; [ aiohttp-cors]; "emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku - "enigma2" = ps: with ps; [ ]; # missing inputs: openwebifpy + "enigma2" = ps: with ps; [ openwebifpy]; "enocean" = ps: with ps; [ ]; # missing inputs: enocean "enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient @@ -386,7 +386,7 @@ "iota" = ps: with ps; [ ]; # missing inputs: pyota "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ ]; # missing inputs: pyipma - "ipp" = ps: with ps; [ ]; # missing inputs: pyipp + "ipp" = ps: with ps; [ pyipp]; "iqvia" = ps: with ps; [ numpy]; # missing inputs: pyiqvia "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator @@ -664,7 +664,7 @@ "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ ]; # missing inputs: rokuecp "roomba" = ps: with ps; [ ]; # missing inputs: roombapy - "route53" = ps: with ps; [ boto3]; # missing inputs: ipify + "route53" = ps: with ps; [ boto3]; "rova" = ps: with ps; [ ]; # missing inputs: rova "rpi_camera" = ps: with ps; [ ]; "rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO @@ -824,7 +824,7 @@ "torque" = ps: with ps; [ aiohttp-cors]; "totalconnect" = ps: with ps; [ ]; # missing inputs: total_connect_client "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline - "tplink" = ps: with ps; [ ]; # missing inputs: pyHS100 + "tplink" = ps: with ps; [ pyhs100]; "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected "traccar" = ps: with ps; [ aiohttp-cors stringcase]; # missing inputs: pytraccar "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr @@ -855,7 +855,7 @@ "upc_connect" = ps: with ps; [ ]; # missing inputs: connect-box "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api "updater" = ps: with ps; [ distro]; - "upnp" = ps: with ps; [ ]; # missing inputs: async-upnp-client + "upnp" = ps: with ps; [ async-upnp-client]; "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8c2a394857671..957d61e8ad763 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -72,7 +72,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.113.0"; + hassVersion = "0.113.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -82,6 +82,7 @@ in with py.pkgs; buildPythonApplication rec { patches = [ ./relax-dependencies.patch + ./fix-flapping-chained-task-logging-test.patch ]; inherit availableComponents; @@ -91,7 +92,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1yb943wkiawh5p4mj5089qcsjfnwb91ga666qriz32bzpfgrzrna"; + sha256 = "1lrllhafjawrghdp81lz1ffdqcj2q0x9ndp11nhi8s9fd8bb4c8j"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/fix-flapping-chained-task-logging-test.patch b/pkgs/servers/home-assistant/fix-flapping-chained-task-logging-test.patch new file mode 100644 index 0000000000000..1549046fc4065 --- /dev/null +++ b/pkgs/servers/home-assistant/fix-flapping-chained-task-logging-test.patch @@ -0,0 +1,33 @@ +From 1d54dafad9968465d995d195f683d8032a5194d1 Mon Sep 17 00:00:00 2001 +From: "J. Nick Koston" <nick@koston.org> +Date: Sun, 2 Aug 2020 23:05:53 +0000 +Subject: [PATCH] Fix flapping chained task logging test + +Creating 20 tasks was taking less than 0.0001 seconds which caused +the tests to fail. Increase the number of test tasks by two orders +of magnitude. +--- + tests/test_core.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test_core.py b/tests/test_core.py +index 12ed00fde2c9..167eda3f6cb4 100644 +--- a/tests/test_core.py ++++ b/tests/test_core.py +@@ -1436,14 +1436,14 @@ async def test_chained_logging_hits_log_timeout(hass, caplog): + async def _task_chain_1(): + nonlocal created + created += 1 +- if created > 10: ++ if created > 1000: + return + hass.async_create_task(_task_chain_2()) + + async def _task_chain_2(): + nonlocal created + created += 1 +- if created > 10: ++ if created > 1000: + return + hass.async_create_task(_task_chain_1()) + diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index b731d4d0b3415..7def709a84082 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "hiawatha"; - version = "10.9"; + version = "10.11"; src = fetchFromGitLab { owner = "hsleisink"; repo = "hiawatha"; rev = "v${version}"; - sha256 = "0mcg36bidy3p57nyk9nliqjipfb3r2irziavlbr2d5g3smfv52z2"; + sha256 = "10a7dqj37zrbmgnhwsw0mqm5x25kasl8p95g01rzakviwxkdrkid"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix new file mode 100644 index 0000000000000..1f8adcf738f76 --- /dev/null +++ b/pkgs/servers/jicofo/default.nix @@ -0,0 +1,43 @@ +{ pkgs, stdenv, fetchurl, dpkg, jre_headless, nixosTests }: + +let + pname = "jicofo"; + version = "1.0-589"; + src = fetchurl { + url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; + sha256 = "0bsagnmw2rxf9s9kjl4y7gfqx408iv0qlwgy3mz0339g5503p5r9"; + }; +in +stdenv.mkDerivation { + inherit pname version src; + + dontBuild = true; + + unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents"; + + installPhase = '' + substituteInPlace usr/share/jicofo/jicofo.sh \ + --replace "exec java" "exec ${jre_headless}/bin/java" + + mkdir -p $out/{share,bin} + mv usr/share/jicofo $out/share/ + mv etc $out/ + cp ${./logging.properties-journal} $out/etc/jitsi/jicofo/logging.properties-journal + ln -s $out/share/jicofo/jicofo.sh $out/bin/jicofo + ''; + + passthru.tests = { + single-node-smoke-test = nixosTests.jitsi-meet; + }; + + meta = with stdenv.lib; { + description = "A server side focus component used in Jitsi Meet conferences"; + longDescription = '' + JItsi COnference FOcus is a server side focus component used in Jitsi Meet conferences. + ''; + homepage = "https://github.com/jitsi/jicofo"; + license = licenses.asl20; + maintainers = teams.jitsi.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/jicofo/logging.properties-journal b/pkgs/servers/jicofo/logging.properties-journal new file mode 100644 index 0000000000000..2d68dec1b0ba5 --- /dev/null +++ b/pkgs/servers/jicofo/logging.properties-journal @@ -0,0 +1,10 @@ +handlers = java.util.logging.ConsoleHandler +java.util.logging.ConsoleHandler.level = ALL +java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLogFormatter +.level = INFO +net.sf.level = SEVERE +net.java.sip.communicator.plugin.reconnectplugin.level = FINE +org.ice4j.level = SEVERE +org.jitsi.impl.neomedia.level = SEVERE +net.java.sip.communicator.service.resources.AbstractResourcesService.level = SEVERE +net.java.sip.communicator.util.ScLogFormatter.disableTimestamp = true diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix new file mode 100644 index 0000000000000..fc6923fc19386 --- /dev/null +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, dpkg, jre_headless, nixosTests }: + +let + pname = "jitsi-videobridge2"; + version = "2.1-202-g5f9377b9"; + src = fetchurl { + url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; + sha256 = "16xj4m6kz4di6y3vxrjkwajd7sfm92zzhrc6q9ljmrwiqnly5z0a"; + }; +in +stdenv.mkDerivation { + inherit pname version src; + + dontBuild = true; + + unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents"; + + installPhase = '' + substituteInPlace usr/share/jitsi-videobridge/jvb.sh \ + --replace "exec java" "exec ${jre_headless}/bin/java" + + mkdir -p $out/{bin,share/jitsi-videobridge,etc/jitsi/videobridge} + mv etc/jitsi/videobridge/logging.properties $out/etc/jitsi/videobridge/ + cp ${./logging.properties-journal} $out/etc/jitsi/videobridge/logging.properties-journal + mv usr/share/jitsi-videobridge/* $out/share/jitsi-videobridge/ + ln -s $out/share/jitsi-videobridge/jvb.sh $out/bin/jitsi-videobridge + ''; + + passthru.tests = { + single-host-smoke-test = nixosTests.jitsi-meet; + }; + + meta = with stdenv.lib; { + description = "A WebRTC compatible video router"; + longDescription = '' + Jitsi Videobridge is an XMPP server component that allows for multiuser video communication. + Unlike the expensive dedicated hardware videobridges, Jitsi Videobridge does not mix the video + channels into a composite video stream, but only relays the received video channels to all call + participants. Therefore, while it does need to run on a server with good network bandwidth, + CPU horsepower is not that critical for performance. + ''; + homepage = "https://github.com/jitsi/jitsi-videobridge"; + license = licenses.asl20; + maintainers = teams.jitsi.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/jitsi-videobridge/logging.properties-journal b/pkgs/servers/jitsi-videobridge/logging.properties-journal new file mode 100644 index 0000000000000..915e32929122f --- /dev/null +++ b/pkgs/servers/jitsi-videobridge/logging.properties-journal @@ -0,0 +1,7 @@ +handlers = java.util.logging.ConsoleHandler +java.util.logging.ConsoleHandler.level = ALL +java.util.logging.ConsoleHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter +.level = INFO +org.jitsi.videobridge.xmpp.ComponentImpl.level = FINE +org.jitsi.impl.neomedia.MediaStreamImpl.level = WARNING +org.jitsi.utils.logging2.JitsiLogFormatter.disableTimestamp = true diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index c895147875d21..ac5b9475028e2 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.5.4"; + version = "3.5.6"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "10b8g6xv90shhfx17cjw7p40gphwi02az1y2dd8a4sjm4z6b2bzw"; + sha256 = "0shyxk83adv4pbfilmskyrgjpb57vyhmvqbmfqawxbc22mksmh4f"; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index c07214ce3a50e..852c0e929fee7 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.24.0"; + version = "0.27.0"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "1lk9fl2h1rsqirqnz4qmapv9hl2axz7j32p9a011h0n90frabski"; + sha256 = "0givv23dx6hwzg0axwifrha17qafs19ag34vjz29xrj3smsl8zh3"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix new file mode 100644 index 0000000000000..adbcbb63759b8 --- /dev/null +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config +, krb5, xfsprogs, jemalloc, dbus, libcap +, ntirpc, liburcu, bison, flex, nfs-utils +} : + +stdenv.mkDerivation rec { + pname = "nfs-ganesha"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "nfs-ganesha"; + repo = "nfs-ganesha"; + rev = "V${version}"; + sha256 = "1w48rqrbqah0hnirvjdz8lyr9ah8b73j3cgsppb04gnrmpssgmb6"; + }; + + patches = [ ./sysstatedir.patch ]; + + preConfigure = "cd src"; + + cmakeFlags = [ "-DUSE_SYSTEM_NTIRPC=ON" ]; + + nativeBuildInputs = [ + cmake + pkg-config + bison + flex + ]; + + buildInputs = [ + krb5 + xfsprogs + jemalloc + dbus.lib + libcap + ntirpc + liburcu + nfs-utils + ]; + + meta = with stdenv.lib; { + description = "NFS server that runs in user space"; + homepage = "https://github.com/nfs-ganesha/nfs-ganesha/wiki"; + maintainers = [ maintainers.markuskowa ]; + platforms = platforms.linux; + license = licenses.lgpl3Plus; + }; +} diff --git a/pkgs/servers/nfs-ganesha/sysstatedir.patch b/pkgs/servers/nfs-ganesha/sysstatedir.patch new file mode 100644 index 0000000000000..534f71743e717 --- /dev/null +++ b/pkgs/servers/nfs-ganesha/sysstatedir.patch @@ -0,0 +1,15 @@ +diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake +index 51697310b..2b5f91075 100644 +--- a/src/include/config-h.in.cmake ++++ b/src/include/config-h.in.cmake +@@ -72,8 +72,8 @@ + #define NFS_GANESHA 1 + + #define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf" +-#define GANESHA_PIDFILE_PATH "@SYSSTATEDIR@/run/ganesha.pid" +-#define NFS_V4_RECOV_ROOT "@SYSSTATEDIR@/lib/nfs/ganesha" ++#define GANESHA_PIDFILE_PATH "/run/ganesha.pid" ++#define NFS_V4_RECOV_ROOT "/var/lib/nfs/ganesha" + /** + * @brief Default value for krb5_param.ccache_dir + */ diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index e9812e9884e90..7ed1a72de0e4f 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -42,11 +42,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.12.3"; + version = "4.12.5"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "09w7aap1cjc41ayhaksm1igc7p7gl40fad4a1l6q4ds9a2jbrb9z"; + sha256 = "05dqj5l3spa8ggw0agxa5rf8fwgiizbmbfjms46y5jla6z31rd2l"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index a1ccc2092e618..fa3c9e4dd4ecf 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.4"; + version = "10.0.5"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "1gf9vqjhq89f5xqn90pwdbz7amv38j78s3pzlxd1c2q3g24wklrj"; + sha256 = "04rjqmlhv55jmdc159q5ckrakq5iwp18wi72lzl6zy21yk5hxmp0"; }; buildInputs = with stdenv.lib; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.ericsagnes ]; platforms = platforms.unix; longDescription = '' - Groonga is an open-source fulltext search engine and column store. + Groonga is an open-source fulltext search engine and column store. It lets you write high-performance applications that requires fulltext search. ''; }; diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index bbfb0315d9efc..9f82a76c323eb 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.1.8"; + version = "4.2.0"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0xxxxlfi4wln2l86ybdsc42qcj37mnac2s2baj6s7mqri8alaa14"; + sha256 = "154sc7aa74c2vwfwan41qwqxckp36lw9wf3qydamsyvd9ampjf5x"; }; buildInputs = [ pkgconfig autoreconfHook gensio libyaml ]; diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix new file mode 100644 index 0000000000000..adefe085a0bb2 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/smlar.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, postgresql }: + +stdenv.mkDerivation rec { + pname = "smlar-unstable"; + version = "2020-04-08"; + + src = fetchgit { + url = "git://sigaev.ru/smlar.git"; + rev = "0c345af71969d9863bb76efa833391d00705669e"; + sha256 = "1pr3pbnjc9n209l52sgsn4xqzp92qk6wci55hcqjjrwf2gdxy0yr"; + }; + + buildInputs = [ postgresql ]; + + makeFlags = [ "USE_PGXS=1" ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; + + meta = with stdenv.lib; { + description = "Compute similary of any one-dimensional arrays"; + homepage = "http://sigaev.ru/git/gitweb.cgi?p=smlar.git"; + platforms = postgresql.meta.platforms; + license = licenses.bsd2; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index d4dafe7ddb14a..44d8ff9cbb889 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -41,6 +41,8 @@ self: super: { pipelinedb = super.callPackage ./ext/pipelinedb.nix { }; + smlar = super.callPackage ./ext/smlar.nix { }; + temporal_tables = super.callPackage ./ext/temporal_tables.nix { }; timescaledb = super.callPackage ./ext/timescaledb.nix { }; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 29804065c31b5..e585a4e97957e 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "traefik"; - version = "2.2.4"; + version = "2.2.8"; src = fetchFromGitHub { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "1zxifwbrhxaj2pl6kwyk1ivr4in0wd0q01x9ynxzbf6w2yx4xkw2"; + sha256 = "1p2qv8vrjxn5wg41ywxbpaghb8585xmkwr8ih5df4dbdjw2m3k1f"; }; vendorSha256 = "0kz7y64k07vlybzfjg6709fdy7krqlv1gkk01nvhs84sk8bnrcvn"; diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix new file mode 100644 index 0000000000000..f1449d81e9864 --- /dev/null +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -0,0 +1,34 @@ +{ pkgs, stdenv, fetchurl, nixosTests }: + +stdenv.mkDerivation rec { + pname = "jitsi-meet"; + version = "1.0.4127"; + + src = fetchurl { + url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; + sha256 = "1jrrsvgysihd73pjqfv605ax01pg2gn76znr64v7nhli55ddgzqx"; + }; + + dontBuild = true; + + installPhase = '' + mkdir $out + mv * $out/ + ''; + + passthru.tests = { + single-host-smoke-test = nixosTests.jitsi-meet; + }; + + meta = with stdenv.lib; { + description = "Secure, Simple and Scalable Video Conferences"; + longDescription = '' + Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses Jitsi Videobridge + to provide high quality, secure and scalable video conferences. + ''; + homepage = "https://github.com/jitsi/jitsi-meet"; + license = licenses.asl20; + maintainers = teams.jitsi.members; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c6fe55ad9f750..092764a3d9d89 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -105,7 +105,7 @@ self: super: rm -rf $out/share/doc ''; CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; - propagatedBuildInputs = [ self.xorgproto ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ]; }); libAppleWM = super.libAppleWM.overrideAttrs (attrs: { @@ -117,7 +117,7 @@ self: super: libXau = super.libXau.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ self.xorgproto ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ]; }); libXdmcp = super.libXdmcp.overrideAttrs (attrs: { @@ -126,7 +126,7 @@ self: super: libXfont = super.libXfont.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ freetype ]; # propagate link reqs. like bzip2 + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ freetype ]; # propagate link reqs. like bzip2 # prevents "misaligned_stack_error_entering_dyld_stub_binder" configureFlags = lib.optional isDarwin "CFLAGS=-O0"; }); @@ -136,6 +136,22 @@ self: super: configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; }); + libXxf86dga = super.libXxf86dga.overrideAttrs (attrs: { + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; + }); + libXxf86misc = super.libXxf86misc.overrideAttrs (attrs: { + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; + }); + libdmx = super.libdmx.overrideAttrs (attrs: { + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; + }); + xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: { + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; + }); # Propagate some build inputs because of header file dependencies. # Note: most of these are in Requires.private, so maybe builder.sh @@ -146,7 +162,7 @@ self: super: ''; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; - propagatedBuildInputs = [ self.libSM ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libSM ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; CPP = if stdenv.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -"; outputs = [ "out" "dev" "devdoc" ]; @@ -166,12 +182,12 @@ self: super: libXcomposite = super.libXcomposite.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ self.libXfixes ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXfixes ]; }); libXaw = super.libXaw.overrideAttrs (attrs: { outputs = [ "out" "dev" "devdoc" ]; - propagatedBuildInputs = [ self.libXmu ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXmu ]; }); libXcursor = super.libXcursor.overrideAttrs (attrs: { @@ -184,7 +200,7 @@ self: super: libXft = super.libXft.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ self.libXrender freetype fontconfig ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXrender freetype fontconfig ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; @@ -208,7 +224,7 @@ self: super: libXext = super.libXext.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" "doc" ]; - propagatedBuildInputs = [ self.xorgproto self.libXau ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto self.libXau ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; }); @@ -219,7 +235,7 @@ self: super: libXi = super.libXi.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" "doc" ]; - propagatedBuildInputs = [ self.libXfixes ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXfixes ]; configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "xorg_cv_malloc0_returns_null=no"; }); @@ -239,19 +255,19 @@ self: super: outputs = [ "out" "dev" ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; - propagatedBuildInputs = [self.libXrender]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXrender ]; }); libSM = super.libSM.overrideAttrs (attrs: { outputs = [ "out" "dev" "doc" ]; - propagatedBuildInputs = [ self.libICE ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libICE ]; }); libXrender = super.libXrender.overrideAttrs (attrs: { outputs = [ "out" "dev" "doc" ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; - propagatedBuildInputs = [ self.xorgproto ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ]; }); libXres = super.libXres.overrideAttrs (attrs: { @@ -319,7 +335,7 @@ self: super: }); utilmacros = super.utilmacros.overrideAttrs (attrs: { # not needed for releases, we propagate the needed tools - propagatedBuildInputs = [ automake autoconf libtool ]; + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ automake autoconf libtool ]; }); x11perf = super.x11perf.overrideAttrs (attrs: { @@ -558,6 +574,7 @@ self: super: xorgproto = super.xorgproto.overrideAttrs (attrs: { buildInputs = []; + propagatedBuildInputs = []; nativeBuildInputs = attrs.nativeBuildInputs ++ [ meson ninja ]; # adds support for printproto needed for libXp mesonFlags = [ "-Dlegacy=true" ]; @@ -626,7 +643,7 @@ self: super: then { outputs = [ "out" "dev" ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; - propagatedBuildInputs = [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' @@ -755,7 +772,7 @@ self: super: "--with-launchdaemons-dir=\${out}/LaunchDaemons" "--with-launchagents-dir=\${out}/LaunchAgents" ]; - propagatedBuildInputs = [ self.xauth ] + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xauth ] ++ lib.optionals isDarwin [ self.libX11 self.xorgproto ]; prePatch = '' sed -i 's|^defaultserverargs="|&-logfile \"$HOME/.xorg.log\"|p' startx.cpp diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 3e3c3f65443a7..ad351c89a668f 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -1,9 +1,9 @@ -{ pkgs, stdenv, system, dataDir ? "/opt/zigbee2mqtt/data" }: +{ pkgs, stdenv, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }: let package = (import ./node.nix { inherit pkgs system; }).package; in package.override rec { - version = "1.14.1"; + version = "1.14.2"; reconstructLock = true; postInstall = '' @@ -20,9 +20,11 @@ package.override rec { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "1g1j634474m6arr3qyvf2bzmjh4qs02rhnfh0dlm8qz8rh3xj2rk"; + sha256 = "0yv51rds28az5pqzgkprhrzwmky29l1mvqb73l7dbs8qlx8x1x52"; }; + passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; + meta = with pkgs.stdenv.lib; { description = "Zigbee to MQTT bridge using zigbee-shepherd"; license = licenses.gpl3; diff --git a/pkgs/servers/zigbee2mqtt/deps.sh b/pkgs/servers/zigbee2mqtt/deps.sh deleted file mode 100755 index c5c66a6a7a835..0000000000000 --- a/pkgs/servers/zigbee2mqtt/deps.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x -VERSION=1.14.1 -ZIGBEE2MQTT=https://raw.githubusercontent.com/Koenkk/zigbee2mqtt/$VERSION - -wget $ZIGBEE2MQTT/package.json -wget $ZIGBEE2MQTT/npm-shrinkwrap.json - -node2nix --nodejs-12 \ - -l npm-shrinkwrap.json \ - -c node.nix \ - --bypass-cache \ - --no-copy-node-env \ - --node-env ../../development/node-packages/node-env.nix -rm package.json npm-shrinkwrap.json diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index 01ee39f74d29d..df818634036a3 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -4,427 +4,418 @@ let sources = { - "@babel/cli-7.8.4" = { + "@babel/cli-7.10.4" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.8.4"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.8.4.tgz"; - sha512 = "XXLgAm6LBbaNxaGhMAznXXaxtCWfuv6PIDJ9Alsy9JYTOh+j2jJz+L/162kkfU1j/pTSxK1xGmlwI4pdIMkoag=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.10.4.tgz"; + sha512 = "xX99K4V1BzGJdQANK5cwK+EpF1vP9gvqhn+iWvG+TubCjecplW7RSQimJ2jcCvu6fnK5pY6mZMdu6EWTj32QVA=="; }; }; - "@babel/code-frame-7.8.3" = { + "@babel/code-frame-7.10.4" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz"; + sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/compat-data-7.9.0" = { + "@babel/compat-data-7.10.4" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz"; - sha512 = "zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.4.tgz"; + sha512 = "t+rjExOrSVvjQQXNp5zAIYDp00KjdvGl/TpDX5REPr0S9IAIPQMTilcfG6q8c0QFmj9lSTVySV2VTsyggvtNIw=="; }; }; - "@babel/core-7.9.0" = { + "@babel/core-7.10.4" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz"; - sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.10.4.tgz"; + sha512 = "3A0tS0HWpy4XujGc7QtOIHTeNwUgWaZc/WuS5YQrfhU67jnVmsD6OGPc1AKHH0LJHQICGncy3+YUjIhVlfDdcA=="; }; }; - "@babel/core-7.9.6" = { + "@babel/core-7.10.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.9.6"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz"; - sha512 = "nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.10.5.tgz"; + sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; }; }; - "@babel/generator-7.9.4" = { + "@babel/generator-7.10.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.9.4"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz"; - sha512 = "rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz"; + sha512 = "toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng=="; }; }; - "@babel/generator-7.9.6" = { + "@babel/generator-7.10.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.9.6"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz"; - sha512 = "+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.5.tgz"; + sha512 = "3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig=="; }; }; - "@babel/helper-annotate-as-pure-7.8.3" = { + "@babel/helper-annotate-as-pure-7.10.4" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz"; - sha512 = "6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; + sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz"; - sha512 = "5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; + sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg=="; }; }; - "@babel/helper-compilation-targets-7.8.7" = { + "@babel/helper-compilation-targets-7.10.4" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.8.7"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz"; - sha512 = "4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz"; + sha512 = "a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.8.6" = { + "@babel/helper-create-class-features-plugin-7.10.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.8.6"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz"; - sha512 = "klTBDdsr+VFFqaDHm5rR69OpEQtO2Qv8ECxHS1mNhJJvaHArR6a1xTf5K/eZW7eZpJbhCx3NW1Yt/sKsLXLblg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.4.tgz"; + sha512 = "9raUiOsXPxzzLjCXeosApJItoMnX3uyT4QdM2UldffuGApNrF8e938MwNpDCK9CPoyxrEoCgT+hObJc3mZa6lQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.8.8" = { + "@babel/helper-create-regexp-features-plugin-7.10.4" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.8.8"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz"; - sha512 = "LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz"; + sha512 = "2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g=="; }; }; - "@babel/helper-define-map-7.8.3" = { + "@babel/helper-define-map-7.10.4" = { name = "_at_babel_slash_helper-define-map"; packageName = "@babel/helper-define-map"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz"; - sha512 = "PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g=="; + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.4.tgz"; + sha512 = "nIij0oKErfCnLUCWaCaHW0Bmtl2RO9cN7+u2QT8yqTywgALKlyUVOvHDElh+b5DwVC6YB1FOYFOTWcN/+41EDA=="; }; }; - "@babel/helper-explode-assignable-expression-7.8.3" = { + "@babel/helper-explode-assignable-expression-7.10.4" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz"; - sha512 = "N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw=="; - }; - }; - "@babel/helper-function-name-7.8.3" = { - name = "_at_babel_slash_helper-function-name"; - packageName = "@babel/helper-function-name"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz"; - sha512 = "BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz"; + sha512 = "4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A=="; }; }; - "@babel/helper-function-name-7.9.5" = { + "@babel/helper-function-name-7.10.4" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.9.5"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz"; - sha512 = "JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; + sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ=="; }; }; - "@babel/helper-get-function-arity-7.8.3" = { + "@babel/helper-get-function-arity-7.10.4" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; - sha512 = "FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; + sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A=="; }; }; - "@babel/helper-hoist-variables-7.8.3" = { + "@babel/helper-hoist-variables-7.10.4" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz"; - sha512 = "ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; + sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; }; }; - "@babel/helper-member-expression-to-functions-7.8.3" = { + "@babel/helper-member-expression-to-functions-7.10.4" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.8.3"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.4.tgz"; + sha512 = "m5j85pK/KZhuSdM/8cHUABQTAslV47OjfIB9Cc7P+PvlAoBzdb79BGNfw8RhT5Mq3p+xGd0ZfAKixbrUZx0C7A=="; + }; + }; + "@babel/helper-member-expression-to-functions-7.10.5" = { + name = "_at_babel_slash_helper-member-expression-to-functions"; + packageName = "@babel/helper-member-expression-to-functions"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz"; - sha512 = "fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz"; + sha512 = "HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA=="; }; }; - "@babel/helper-module-imports-7.8.3" = { + "@babel/helper-module-imports-7.10.4" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; - sha512 = "R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; + sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw=="; }; }; - "@babel/helper-module-transforms-7.9.0" = { + "@babel/helper-module-transforms-7.10.4" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; - sha512 = "0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.4.tgz"; + sha512 = "Er2FQX0oa3nV7eM1o0tNCTx7izmQtwAQsIiaLRWtavAAEcskb0XJ5OjJbVrYXWOTr8om921Scabn4/tzlx7j1Q=="; }; }; - "@babel/helper-optimise-call-expression-7.8.3" = { + "@babel/helper-module-transforms-7.10.5" = { + name = "_at_babel_slash_helper-module-transforms"; + packageName = "@babel/helper-module-transforms"; + version = "7.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz"; + sha512 = "4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA=="; + }; + }; + "@babel/helper-optimise-call-expression-7.10.4" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz"; - sha512 = "Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; + sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg=="; }; }; - "@babel/helper-plugin-utils-7.8.3" = { + "@babel/helper-plugin-utils-7.10.4" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz"; - sha512 = "j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; + sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; }; }; - "@babel/helper-regex-7.8.3" = { + "@babel/helper-regex-7.10.4" = { name = "_at_babel_slash_helper-regex"; packageName = "@babel/helper-regex"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz"; - sha512 = "BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ=="; + url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.4.tgz"; + sha512 = "inWpnHGgtg5NOF0eyHlC0/74/VkdRITY9dtTpB2PrxKKn+AkVMRiZz/Adrx+Ssg+MLDesi2zohBW6MVq6b4pOQ=="; }; }; - "@babel/helper-remap-async-to-generator-7.8.3" = { + "@babel/helper-remap-async-to-generator-7.10.4" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz"; - sha512 = "kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz"; + sha512 = "86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg=="; }; }; - "@babel/helper-replace-supers-7.8.6" = { + "@babel/helper-replace-supers-7.10.4" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.8.6"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz"; - sha512 = "PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; + sha512 = "sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A=="; }; }; - "@babel/helper-replace-supers-7.9.6" = { - name = "_at_babel_slash_helper-replace-supers"; - packageName = "@babel/helper-replace-supers"; - version = "7.9.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz"; - sha512 = "qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA=="; - }; - }; - "@babel/helper-simple-access-7.8.3" = { + "@babel/helper-simple-access-7.10.4" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz"; - sha512 = "VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; + sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="; }; }; - "@babel/helper-split-export-declaration-7.8.3" = { + "@babel/helper-split-export-declaration-7.10.4" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; - sha512 = "3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz"; + sha512 = "pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg=="; }; }; - "@babel/helper-validator-identifier-7.9.0" = { + "@babel/helper-validator-identifier-7.10.4" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz"; - sha512 = "6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; + sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="; }; }; - "@babel/helper-validator-identifier-7.9.5" = { - name = "_at_babel_slash_helper-validator-identifier"; - packageName = "@babel/helper-validator-identifier"; - version = "7.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; - sha512 = "/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g=="; - }; - }; - "@babel/helper-wrap-function-7.8.3" = { + "@babel/helper-wrap-function-7.10.4" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz"; - sha512 = "LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ=="; - }; - }; - "@babel/helpers-7.9.2" = { - name = "_at_babel_slash_helpers"; - packageName = "@babel/helpers"; - version = "7.9.2"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz"; - sha512 = "JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"; + sha512 = "6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug=="; }; }; - "@babel/helpers-7.9.6" = { + "@babel/helpers-7.10.4" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.9.6"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz"; - sha512 = "tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz"; + sha512 = "L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA=="; }; }; - "@babel/highlight-7.9.0" = { + "@babel/highlight-7.10.4" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; - sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"; + sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.9.4" = { + "@babel/parser-7.10.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.9.4"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz"; - sha512 = "bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz"; + sha512 = "8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA=="; }; }; - "@babel/parser-7.9.6" = { + "@babel/parser-7.10.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.9.6"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz"; - sha512 = "AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz"; + sha512 = "wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.8.3" = { + "@babel/plugin-proposal-async-generator-functions-7.10.4" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz"; - sha512 = "NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz"; + sha512 = "MJbxGSmejEFVOANAezdO39SObkURO5o/8b6fSH6D1pi9RZQt+ldppKPXfqgUWpSQ9asM6xaSaSJIaeWMDRP0Zg=="; }; }; - "@babel/plugin-proposal-class-properties-7.8.3" = { + "@babel/plugin-proposal-class-properties-7.10.4" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz"; - sha512 = "EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz"; + sha512 = "vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.8.3" = { + "@babel/plugin-proposal-dynamic-import-7.10.4" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz"; - sha512 = "NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz"; + sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ=="; }; }; - "@babel/plugin-proposal-json-strings-7.8.3" = { + "@babel/plugin-proposal-json-strings-7.10.4" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz"; - sha512 = "KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz"; + sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz"; - sha512 = "TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz"; + sha512 = "wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.8.3" = { + "@babel/plugin-proposal-numeric-separator-7.10.4" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz"; - sha512 = "jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz"; + sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.9.0" = { + "@babel/plugin-proposal-object-rest-spread-7.10.4" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz"; - sha512 = "UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz"; + sha512 = "6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.8.3" = { + "@babel/plugin-proposal-optional-catch-binding-7.10.4" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz"; - sha512 = "0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz"; + sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.9.0" = { + "@babel/plugin-proposal-optional-chaining-7.10.4" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz"; - sha512 = "NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz"; + sha512 = "ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.8.8" = { + "@babel/plugin-proposal-private-methods-7.10.4" = { + name = "_at_babel_slash_plugin-proposal-private-methods"; + packageName = "@babel/plugin-proposal-private-methods"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz"; + sha512 = "wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw=="; + }; + }; + "@babel/plugin-proposal-unicode-property-regex-7.10.4" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.8.8"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz"; - sha512 = "EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz"; + sha512 = "H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -445,13 +436,13 @@ let sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; }; }; - "@babel/plugin-syntax-class-properties-7.8.3" = { + "@babel/plugin-syntax-class-properties-7.10.4" = { name = "_at_babel_slash_plugin-syntax-class-properties"; packageName = "@babel/plugin-syntax-class-properties"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz"; - sha512 = "UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz"; + sha512 = "GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -463,6 +454,15 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; + "@babel/plugin-syntax-import-meta-7.10.4" = { + name = "_at_babel_slash_plugin-syntax-import-meta"; + packageName = "@babel/plugin-syntax-import-meta"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"; + sha512 = "Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g=="; + }; + }; "@babel/plugin-syntax-json-strings-7.8.3" = { name = "_at_babel_slash_plugin-syntax-json-strings"; packageName = "@babel/plugin-syntax-json-strings"; @@ -472,13 +472,13 @@ let sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; }; - "@babel/plugin-syntax-logical-assignment-operators-7.8.3" = { + "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { name = "_at_babel_slash_plugin-syntax-logical-assignment-operators"; packageName = "@babel/plugin-syntax-logical-assignment-operators"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz"; - sha512 = "Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; }; }; "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { @@ -490,13 +490,13 @@ let sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; }; }; - "@babel/plugin-syntax-numeric-separator-7.8.3" = { + "@babel/plugin-syntax-numeric-separator-7.10.4" = { name = "_at_babel_slash_plugin-syntax-numeric-separator"; packageName = "@babel/plugin-syntax-numeric-separator"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz"; - sha512 = "H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; }; }; "@babel/plugin-syntax-object-rest-spread-7.8.3" = { @@ -526,319 +526,328 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.8.3" = { + "@babel/plugin-syntax-top-level-await-7.10.4" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz"; - sha512 = "kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz"; + sha512 = "ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ=="; }; }; - "@babel/plugin-syntax-typescript-7.8.3" = { + "@babel/plugin-syntax-typescript-7.10.4" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz"; - sha512 = "GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz"; + sha512 = "oSAEz1YkBCAKr5Yiq8/BNtvSAPwkp/IyUnwZogd8p+F0RuYQQrLeRUzIQhueQTTBy/F+a40uS7OFKxnkRvmvFQ=="; }; }; - "@babel/plugin-transform-arrow-functions-7.8.3" = { + "@babel/plugin-transform-arrow-functions-7.10.4" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz"; - sha512 = "0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz"; + sha512 = "9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA=="; }; }; - "@babel/plugin-transform-async-to-generator-7.8.3" = { + "@babel/plugin-transform-async-to-generator-7.10.4" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz"; - sha512 = "imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz"; + sha512 = "F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.8.3" = { + "@babel/plugin-transform-block-scoped-functions-7.10.4" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz"; - sha512 = "vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz"; + sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA=="; }; }; - "@babel/plugin-transform-block-scoping-7.8.3" = { + "@babel/plugin-transform-block-scoping-7.10.4" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz"; - sha512 = "pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.4.tgz"; + sha512 = "J3b5CluMg3hPUii2onJDRiaVbPtKFPLEaV5dOPY5OeAbDi1iU/UbbFFTgwb7WnanaDy7bjU35kc26W3eM5Qa0A=="; }; }; - "@babel/plugin-transform-classes-7.9.2" = { + "@babel/plugin-transform-classes-7.10.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.9.2"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz"; - sha512 = "TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz"; + sha512 = "2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA=="; }; }; - "@babel/plugin-transform-computed-properties-7.8.3" = { + "@babel/plugin-transform-computed-properties-7.10.4" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz"; - sha512 = "O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz"; + sha512 = "JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw=="; }; }; - "@babel/plugin-transform-destructuring-7.8.8" = { + "@babel/plugin-transform-destructuring-7.10.4" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.8.8"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz"; - sha512 = "eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz"; + sha512 = "+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA=="; }; }; - "@babel/plugin-transform-dotall-regex-7.8.3" = { + "@babel/plugin-transform-dotall-regex-7.10.4" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz"; - sha512 = "kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz"; + sha512 = "ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.8.3" = { + "@babel/plugin-transform-duplicate-keys-7.10.4" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz"; - sha512 = "s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz"; + sha512 = "GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.8.3" = { + "@babel/plugin-transform-exponentiation-operator-7.10.4" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz"; - sha512 = "zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz"; + sha512 = "S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw=="; }; }; - "@babel/plugin-transform-for-of-7.9.0" = { + "@babel/plugin-transform-for-of-7.10.4" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; - sha512 = "lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz"; + sha512 = "ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ=="; }; }; - "@babel/plugin-transform-function-name-7.8.3" = { + "@babel/plugin-transform-function-name-7.10.4" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz"; - sha512 = "rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz"; + sha512 = "OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg=="; }; }; - "@babel/plugin-transform-literals-7.8.3" = { + "@babel/plugin-transform-literals-7.10.4" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz"; - sha512 = "3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz"; + sha512 = "Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.8.3" = { + "@babel/plugin-transform-member-expression-literals-7.10.4" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz"; - sha512 = "3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz"; + sha512 = "0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw=="; }; }; - "@babel/plugin-transform-modules-amd-7.9.0" = { + "@babel/plugin-transform-modules-amd-7.10.4" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz"; - sha512 = "vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.4.tgz"; + sha512 = "3Fw+H3WLUrTlzi3zMiZWp3AR4xadAEMv6XRCYnd5jAlLM61Rn+CRJaZMaNvIpcJpQ3vs1kyifYvEVPFfoSkKOA=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.9.0" = { + "@babel/plugin-transform-modules-commonjs-7.10.4" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz"; - sha512 = "qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz"; + sha512 = "Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.9.0" = { + "@babel/plugin-transform-modules-systemjs-7.10.4" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz"; - sha512 = "FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.4.tgz"; + sha512 = "Tb28LlfxrTiOTGtZFsvkjpyjCl9IoaRI52AEU/VIwOwvDQWtbNJsAqTXzh+5R7i74e/OZHH2c2w2fsOqAfnQYQ=="; }; }; - "@babel/plugin-transform-modules-umd-7.9.0" = { + "@babel/plugin-transform-modules-umd-7.10.4" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; - sha512 = "uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz"; + sha512 = "mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.8.3" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.10.4" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz"; - sha512 = "f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz"; + sha512 = "V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA=="; }; }; - "@babel/plugin-transform-new-target-7.8.3" = { + "@babel/plugin-transform-new-target-7.10.4" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz"; - sha512 = "QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz"; + sha512 = "YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw=="; }; }; - "@babel/plugin-transform-object-super-7.8.3" = { + "@babel/plugin-transform-object-super-7.10.4" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz"; - sha512 = "57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz"; + sha512 = "5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ=="; }; }; - "@babel/plugin-transform-parameters-7.9.3" = { + "@babel/plugin-transform-parameters-7.10.4" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.9.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz"; - sha512 = "fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.4.tgz"; + sha512 = "RurVtZ/D5nYfEg0iVERXYKEgDFeesHrHfx8RT05Sq57ucj2eOYAP6eu5fynL4Adju4I/mP/I6SO0DqNWAXjfLQ=="; }; }; - "@babel/plugin-transform-property-literals-7.8.3" = { + "@babel/plugin-transform-property-literals-7.10.4" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz"; - sha512 = "uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz"; + sha512 = "ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g=="; }; }; - "@babel/plugin-transform-regenerator-7.8.7" = { + "@babel/plugin-transform-regenerator-7.10.4" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.8.7"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz"; - sha512 = "TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz"; + sha512 = "3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw=="; }; }; - "@babel/plugin-transform-reserved-words-7.8.3" = { + "@babel/plugin-transform-reserved-words-7.10.4" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz"; - sha512 = "mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz"; + sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.8.3" = { + "@babel/plugin-transform-shorthand-properties-7.10.4" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz"; - sha512 = "I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz"; + sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q=="; }; }; - "@babel/plugin-transform-spread-7.8.3" = { + "@babel/plugin-transform-spread-7.10.4" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz"; - sha512 = "CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz"; + sha512 = "1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ=="; }; }; - "@babel/plugin-transform-sticky-regex-7.8.3" = { + "@babel/plugin-transform-sticky-regex-7.10.4" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz"; - sha512 = "9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz"; + sha512 = "Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ=="; }; }; - "@babel/plugin-transform-template-literals-7.8.3" = { + "@babel/plugin-transform-template-literals-7.10.4" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz"; - sha512 = "820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.4.tgz"; + sha512 = "4NErciJkAYe+xI5cqfS8pV/0ntlY5N5Ske/4ImxAVX7mk9Rxt2bwDTGv1Msc2BRJvWQcmYEC+yoMLdX22aE4VQ=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.8.4" = { + "@babel/plugin-transform-typeof-symbol-7.10.4" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.8.4"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz"; - sha512 = "2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz"; + sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA=="; }; }; - "@babel/plugin-transform-typescript-7.9.4" = { + "@babel/plugin-transform-typescript-7.10.4" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.9.4"; + version = "7.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.4.tgz"; + sha512 = "3WpXIKDJl/MHoAN0fNkSr7iHdUMHZoppXjf2HJ9/ed5Xht5wNIsXllJXdityKOxeA3Z8heYRb1D3p2H5rfCdPw=="; + }; + }; + "@babel/plugin-transform-unicode-escapes-7.10.4" = { + name = "_at_babel_slash_plugin-transform-unicode-escapes"; + packageName = "@babel/plugin-transform-unicode-escapes"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz"; - sha512 = "yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz"; + sha512 = "y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg=="; }; }; - "@babel/plugin-transform-unicode-regex-7.8.3" = { + "@babel/plugin-transform-unicode-regex-7.10.4" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.8.3"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz"; - sha512 = "+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz"; + sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; }; }; - "@babel/preset-env-7.9.0" = { + "@babel/preset-env-7.10.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.0.tgz"; - sha512 = "712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.4.tgz"; + sha512 = "tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw=="; }; }; "@babel/preset-modules-0.1.3" = { @@ -850,67 +859,67 @@ let sha512 = "Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg=="; }; }; - "@babel/preset-typescript-7.9.0" = { + "@babel/preset-typescript-7.10.4" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz"; - sha512 = "S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.10.4.tgz"; + sha512 = "SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ=="; }; }; - "@babel/runtime-7.9.2" = { + "@babel/runtime-7.10.4" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.9.2"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz"; - sha512 = "NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.4.tgz"; + sha512 = "UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw=="; }; }; - "@babel/template-7.8.6" = { + "@babel/template-7.10.4" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.8.6"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz"; - sha512 = "zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz"; + sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.9.0" = { + "@babel/traverse-7.10.4" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz"; - sha512 = "jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.4.tgz"; + sha512 = "aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q=="; }; }; - "@babel/traverse-7.9.6" = { + "@babel/traverse-7.10.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.9.6"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz"; - sha512 = "b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz"; + sha512 = "yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ=="; }; }; - "@babel/types-7.9.0" = { + "@babel/types-7.10.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.9.0"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz"; - sha512 = "BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz"; + sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.9.6" = { + "@babel/types-7.10.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.9.6"; + version = "7.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz"; - sha512 = "qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz"; + sha512 = "ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -940,15 +949,6 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; - "@istanbuljs/load-nyc-config-1.0.0" = { - name = "_at_istanbuljs_slash_load-nyc-config"; - packageName = "@istanbuljs/load-nyc-config"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz"; - sha512 = "ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg=="; - }; - }; "@istanbuljs/load-nyc-config-1.1.0" = { name = "_at_istanbuljs_slash_load-nyc-config"; packageName = "@istanbuljs/load-nyc-config"; @@ -967,301 +967,220 @@ let sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; }; }; - "@jest/console-25.2.6" = { - name = "_at_jest_slash_console"; - packageName = "@jest/console"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-25.2.6.tgz"; - sha512 = "bGp+0PicZVCEhb+ifnW9wpKWONNdkhtJsRE7ap729hiAfTvCN6VhGx0s/l/V/skA2pnyqq+N/7xl9ZWfykDpsg=="; - }; - }; - "@jest/console-26.0.1" = { + "@jest/console-26.1.0" = { name = "_at_jest_slash_console"; packageName = "@jest/console"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-26.0.1.tgz"; - sha512 = "9t1KUe/93coV1rBSxMmBAOIK3/HVpwxArCA1CxskKyRiv6o8J70V8C/V3OJminVCTa2M0hQI9AWRd5wxu2dAHw=="; - }; - }; - "@jest/core-25.2.7" = { - name = "_at_jest_slash_core"; - packageName = "@jest/core"; - version = "25.2.7"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/core/-/core-25.2.7.tgz"; - sha512 = "Nd6ELJyR+j0zlwhzkfzY70m04hAur0VnMwJXVe4VmmD/SaQ6DEyal++ERQ1sgyKIKKEqRuui6k/R0wHLez4P+g=="; + url = "https://registry.npmjs.org/@jest/console/-/console-26.1.0.tgz"; + sha512 = "+0lpTHMd/8pJp+Nd4lyip+/Iyf2dZJvcCqrlkeZQoQid+JlThA4M9vxHtheyrQ99jJTMQam+es4BcvZ5W5cC3A=="; }; }; - "@jest/core-26.0.1" = { + "@jest/core-26.1.0" = { name = "_at_jest_slash_core"; packageName = "@jest/core"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/core/-/core-26.0.1.tgz"; - sha512 = "Xq3eqYnxsG9SjDC+WLeIgf7/8KU6rddBxH+SCt18gEpOhAGYC/Mq+YbtlNcIdwjnnT+wDseXSbU0e5X84Y4jTQ=="; + url = "https://registry.npmjs.org/@jest/core/-/core-26.1.0.tgz"; + sha512 = "zyizYmDJOOVke4OO/De//aiv8b07OwZzL2cfsvWF3q9YssfpcKfcnZAwDY8f+A76xXSMMYe8i/f/LPocLlByfw=="; }; }; - "@jest/environment-25.2.6" = { + "@jest/environment-26.1.0" = { name = "_at_jest_slash_environment"; packageName = "@jest/environment"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/environment/-/environment-25.2.6.tgz"; - sha512 = "17WIw+wCb9drRNFw1hi8CHah38dXVdOk7ga9exThhGtXlZ9mK8xH4DjSB9uGDGXIWYSHmrxoyS6KJ7ywGr7bzg=="; - }; - }; - "@jest/environment-26.0.1" = { - name = "_at_jest_slash_environment"; - packageName = "@jest/environment"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/environment/-/environment-26.0.1.tgz"; - sha512 = "xBDxPe8/nx251u0VJ2dFAFz2H23Y98qdIaNwnMK6dFQr05jc+Ne/2np73lOAx+5mSBO/yuQldRrQOf6hP1h92g=="; - }; - }; - "@jest/fake-timers-25.2.6" = { - name = "_at_jest_slash_fake-timers"; - packageName = "@jest/fake-timers"; - version = "25.2.6"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.2.6.tgz"; - sha512 = "A6qtDIA2zg/hVgUJJYzQSHFBIp25vHdSxW/s4XmTJAYxER6eL0NQdQhe4+232uUSviKitubHGXXirt5M7blPiA=="; + url = "https://registry.npmjs.org/@jest/environment/-/environment-26.1.0.tgz"; + sha512 = "86+DNcGongbX7ai/KE/S3/NcUVZfrwvFzOOWX/W+OOTvTds7j07LtC+MgGydH5c8Ri3uIrvdmVgd1xFD5zt/xA=="; }; }; - "@jest/fake-timers-26.0.1" = { + "@jest/fake-timers-26.1.0" = { name = "_at_jest_slash_fake-timers"; packageName = "@jest/fake-timers"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.0.1.tgz"; - sha512 = "Oj/kCBnTKhm7CR+OJSjZty6N1bRDr9pgiYQr4wY221azLz5PHi08x/U+9+QpceAYOWheauLP8MhtSVFrqXQfhg=="; + url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.1.0.tgz"; + sha512 = "Y5F3kBVWxhau3TJ825iuWy++BAuQzK/xEa+wD9vDH3RytW9f2DbMVodfUQC54rZDX3POqdxCgcKdgcOL0rYUpA=="; }; }; - "@jest/globals-26.0.1" = { + "@jest/globals-26.1.0" = { name = "_at_jest_slash_globals"; packageName = "@jest/globals"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/globals/-/globals-26.0.1.tgz"; - sha512 = "iuucxOYB7BRCvT+TYBzUqUNuxFX1hqaR6G6IcGgEqkJ5x4htNKo1r7jk1ji9Zj8ZMiMw0oB5NaA7k5Tx6MVssA=="; - }; - }; - "@jest/reporters-25.2.6" = { - name = "_at_jest_slash_reporters"; - packageName = "@jest/reporters"; - version = "25.2.6"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/reporters/-/reporters-25.2.6.tgz"; - sha512 = "DRMyjaxcd6ZKctiXNcuVObnPwB1eUs7xrUVu0J2V0p5/aZJei5UM9GL3s/bmN4hRV8Mt3zXh+/9X2o0Q4ClZIA=="; + url = "https://registry.npmjs.org/@jest/globals/-/globals-26.1.0.tgz"; + sha512 = "MKiHPNaT+ZoG85oMaYUmGHEqu98y3WO2yeIDJrs2sJqHhYOy3Z6F7F/luzFomRQ8SQ1wEkmahFAz2291Iv8EAw=="; }; }; - "@jest/reporters-26.0.1" = { + "@jest/reporters-26.1.0" = { name = "_at_jest_slash_reporters"; packageName = "@jest/reporters"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.0.1.tgz"; - sha512 = "NWWy9KwRtE1iyG/m7huiFVF9YsYv/e+mbflKRV84WDoJfBqUrNRyDbL/vFxQcYLl8IRqI4P3MgPn386x76Gf2g=="; + url = "https://registry.npmjs.org/@jest/reporters/-/reporters-26.1.0.tgz"; + sha512 = "SVAysur9FOIojJbF4wLP0TybmqwDkdnFxHSPzHMMIYyBtldCW9gG+Q5xWjpMFyErDiwlRuPyMSJSU64A67Pazg=="; }; }; - "@jest/source-map-25.2.6" = { + "@jest/source-map-26.1.0" = { name = "_at_jest_slash_source-map"; packageName = "@jest/source-map"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/source-map/-/source-map-25.2.6.tgz"; - sha512 = "VuIRZF8M2zxYFGTEhkNSvQkUKafQro4y+mwUxy5ewRqs5N/ynSFUODYp3fy1zCnbCMy1pz3k+u57uCqx8QRSQQ=="; - }; - }; - "@jest/source-map-26.0.0" = { - name = "_at_jest_slash_source-map"; - packageName = "@jest/source-map"; - version = "26.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/source-map/-/source-map-26.0.0.tgz"; - sha512 = "S2Z+Aj/7KOSU2TfW0dyzBze7xr95bkm5YXNUqqCek+HE0VbNNSNzrRwfIi5lf7wvzDTSS0/ib8XQ1krFNyYgbQ=="; - }; - }; - "@jest/test-result-25.2.6" = { - name = "_at_jest_slash_test-result"; - packageName = "@jest/test-result"; - version = "25.2.6"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-25.2.6.tgz"; - sha512 = "gmGgcF4qz/pkBzyfJuVHo2DA24kIgVQ5Pf/VpW4QbyMLSegi8z+9foSZABfIt5se6k0fFj/3p/vrQXdaOgit0w=="; + url = "https://registry.npmjs.org/@jest/source-map/-/source-map-26.1.0.tgz"; + sha512 = "XYRPYx4eEVX15cMT9mstnO7hkHP3krNtKfxUYd8L7gbtia8JvZZ6bMzSwa6IQJENbudTwKMw5R1BePRD+bkEmA=="; }; }; - "@jest/test-result-26.0.1" = { + "@jest/test-result-26.1.0" = { name = "_at_jest_slash_test-result"; packageName = "@jest/test-result"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.0.1.tgz"; - sha512 = "oKwHvOI73ICSYRPe8WwyYPTtiuOAkLSbY8/MfWF3qDEd/sa8EDyZzin3BaXTqufir/O/Gzea4E8Zl14XU4Mlyg=="; - }; - }; - "@jest/test-sequencer-25.2.7" = { - name = "_at_jest_slash_test-sequencer"; - packageName = "@jest/test-sequencer"; - version = "25.2.7"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.2.7.tgz"; - sha512 = "s2uYGOXONDSTJQcZJ9A3Zkg3hwe53RlX1HjUNqjUy3HIqwgwCKJbnAKYsORPbhxXi3ARMKA7JNBi9arsTxXoYw=="; + url = "https://registry.npmjs.org/@jest/test-result/-/test-result-26.1.0.tgz"; + sha512 = "Xz44mhXph93EYMA8aYDz+75mFbarTV/d/x0yMdI3tfSRs/vh4CqSxgzVmCps1fPkHDCtn0tU8IH9iCKgGeGpfw=="; }; }; - "@jest/test-sequencer-26.0.1" = { + "@jest/test-sequencer-26.1.0" = { name = "_at_jest_slash_test-sequencer"; packageName = "@jest/test-sequencer"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.0.1.tgz"; - sha512 = "ssga8XlwfP8YjbDcmVhwNlrmblddMfgUeAkWIXts1V22equp2GMIHxm7cyeD5Q/B0ZgKPK/tngt45sH99yLLGg=="; + url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.1.0.tgz"; + sha512 = "Z/hcK+rTq56E6sBwMoQhSRDVjqrGtj1y14e2bIgcowARaIE1SgOanwx6gvY4Q9gTKMoZQXbXvptji+q5GYxa6Q=="; }; }; - "@jest/transform-25.2.6" = { + "@jest/transform-26.1.0" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "25.2.6"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-25.2.6.tgz"; - sha512 = "rZnjCjZf9avPOf9q/w9RUZ9Uc29JmB53uIXNJmNz04QbDMD5cR/VjfikiMKajBsXe2vnFl5sJ4RTt+9HPicauQ=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-26.1.0.tgz"; + sha512 = "ICPm6sUXmZJieq45ix28k0s+d/z2E8CHDsq+WwtWI6kW8m7I8kPqarSEcUN86entHQ570ZBRci5OWaKL0wlAWw=="; }; }; - "@jest/transform-26.0.1" = { - name = "_at_jest_slash_transform"; - packageName = "@jest/transform"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-26.0.1.tgz"; - sha512 = "pPRkVkAQ91drKGbzCfDOoHN838+FSbYaEAvBXvKuWeeRRUD8FjwXkqfUNUZL6Ke48aA/1cqq/Ni7kVMCoqagWA=="; - }; - }; - "@jest/types-25.2.6" = { + "@jest/types-25.5.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "25.2.6"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-25.2.6.tgz"; - sha512 = "myJTTV37bxK7+3NgKc4Y/DlQ5q92/NOwZsZ+Uch7OXdElxOg61QYc72fPYNAjlvbnJ2YvbXLamIsa9tj48BmyQ=="; + url = "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz"; + sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; }; - "@jest/types-26.0.1" = { + "@jest/types-26.1.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz"; - sha512 = "IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA=="; + url = "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz"; + sha512 = "GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ=="; }; }; - "@serialport/binding-abstract-8.0.6" = { + "@serialport/binding-abstract-9.0.0" = { name = "_at_serialport_slash_binding-abstract"; packageName = "@serialport/binding-abstract"; - version = "8.0.6"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-8.0.6.tgz"; - sha512 = "1swwUVoRyQ9ubxrkJ8JPppykohUpTAP4jkGr36e9NjbVocSPfqeX6tFZFwl/IdUlwJwxGdbKDqq7FvXniCQUMw=="; + url = "https://registry.npmjs.org/@serialport/binding-abstract/-/binding-abstract-9.0.0.tgz"; + sha512 = "ZU+6ZypP33Rzda1cDnpN0+CNfnODwbRU66GBawNtj2+xE+OMI7a0hbuZAYvQ+BThyDfdX/vn55P1YYeVWI8qpQ=="; }; }; - "@serialport/binding-mock-8.0.6" = { + "@serialport/binding-mock-9.0.0" = { name = "_at_serialport_slash_binding-mock"; packageName = "@serialport/binding-mock"; - version = "8.0.6"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-8.0.6.tgz"; - sha512 = "BIbY5/PsDDo0QWDNCCxDgpowAdks+aZR8BOsEtK2GoASTTcJCy1fBwPIfH870o7rnbH901wY3C+yuTfdOvSO9A=="; + url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-9.0.0.tgz"; + sha512 = "E65ZbykGwZSoHpQvjuJkTbwEM0uZku+SROtO+VMs/mShMalBnOSoRDU2IedkFKvz6IqowZZOVyaBUbnKYoAUuQ=="; }; }; - "@serialport/bindings-8.0.7" = { + "@serialport/bindings-9.0.0" = { name = "_at_serialport_slash_bindings"; packageName = "@serialport/bindings"; - version = "8.0.7"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-8.0.7.tgz"; - sha512 = "IqudDL8ne2Y2S0W5fKA6wdgHCIA2e2OIaPVYhGy6duE6legNHFY+05CLicHAyAeTocXmHU7rVNxzVQrOG5tM4g=="; + url = "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.0.tgz"; + sha512 = "2LoYX80h5U8uIgpPaBXpIhs9uXIPhn6k+9u0FH3mFPHHeJ/tyVliwbj7uxdQ6xAUe5Zf3T2cH9JC/LnxewWyuw=="; }; }; - "@serialport/parser-byte-length-8.0.6" = { + "@serialport/parser-byte-length-9.0.0" = { name = "_at_serialport_slash_parser-byte-length"; packageName = "@serialport/parser-byte-length"; - version = "8.0.6"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-8.0.6.tgz"; - sha512 = "92mrFxFEvq3gRvSM7ANK/jfbmHslz91a5oYJy/nbSn4H/MCRXjxR2YOkQgVXuN+zLt+iyDoW3pcOP4Sc1nWdqQ=="; + url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-9.0.0.tgz"; + sha512 = "MaXWTqxz9SeWaN488uFhDMA3cy2sQFoGHDQqDpy6q9wBGlPBe+UpRAznzOoNPkAehqyPo1Vc7gxYsBfgjZtWaw=="; }; }; - "@serialport/parser-cctalk-8.0.6" = { + "@serialport/parser-cctalk-9.0.0" = { name = "_at_serialport_slash_parser-cctalk"; packageName = "@serialport/parser-cctalk"; - version = "8.0.6"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-8.0.6.tgz"; - sha512 = "pqtCYQPgxnxHygiXUPCfgX7sEx+fdR/ObjpscidynEULUq2fFrC5kBkrxRbTfHRtTaU2ii9DyjFq0JVRCbhI0Q=="; + url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-9.0.0.tgz"; + sha512 = "tFJRF+uceEMYQeOLi92CYr1SScnI+2QLkawNHaVwwcmLV0ezwmsm1hvwBCWHkWDsY6U1SiElNJ5HpF89kS28zQ=="; }; }; - "@serialport/parser-delimiter-8.0.6" = { + "@serialport/parser-delimiter-9.0.0" = { name = "_at_serialport_slash_parser-delimiter"; packageName = "@serialport/parser-delimiter"; - version = "8.0.6"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-8.0.6.tgz"; - sha512 = "ogKOcPisPMlVtirkuDu3SFTF0+xT0ijxoH7XjpZiYL41EVi367MwuCnEmXG+dEKKnF0j9EPqOyD2LGSJxaFmhQ=="; + url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.0.0.tgz"; + sha512 = "OesbvlJf1BjFC1zde6cnW1RttxZ8BoXGCOiNvM9mLKdvJ06l9o/4HyVCg2bymj6ziy/gz4407pwyPfvVYApE3A=="; }; }; - "@serialport/parser-readline-8.0.6" = { + "@serialport/parser-readline-9.0.0" = { name = "_at_serialport_slash_parser-readline"; packageName = "@serialport/parser-readline"; - version = "8.0.6"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-8.0.6.tgz"; - sha512 = "OYBT2mpczh9QUI3MTw8j0A0tIlPVjpVipvuVnjRkYwxrxPeq04RaLFhaDpuRzua5rTKMt89c1y3btYeoDXMjAA=="; + url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.0.0.tgz"; + sha512 = "JMCqfn6A+BzcCc/4upYeLB48zijBJmOO/YGcyilXgCW0Mfedqsewgtatmk2tqFhQoJfjyOu3dRE3Lz9xHlRGZQ=="; }; }; - "@serialport/parser-ready-8.0.6" = { + "@serialport/parser-ready-9.0.0" = { name = "_at_serialport_slash_parser-ready"; packageName = "@serialport/parser-ready"; - version = "8.0.6"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-8.0.6.tgz"; - sha512 = "xcEqv4rc119WR5JzAuu8UeJOlAwET2PTdNb6aIrrLlmTxhvuBbuRFcsnF3BpH9jUL30Kh7a6QiNXIwVG+WR/1Q=="; + url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-9.0.0.tgz"; + sha512 = "oSQR7773Jdc6SjXMA1mWgfFlyBLcIRlZtt1BJMfO07k3ynBmanJ4VysVDTDvxtsREHLgcjoLRKQC/6wl2wvXOQ=="; }; }; - "@serialport/parser-regex-8.0.6" = { + "@serialport/parser-regex-9.0.0" = { name = "_at_serialport_slash_parser-regex"; packageName = "@serialport/parser-regex"; - version = "8.0.6"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-8.0.6.tgz"; - sha512 = "J8KY75Azz5ZyExmyM5YfUxbXOWBkZCytKgCCmZ966ttwZS0bUZOuoCaZj2Zp4VILJAiLuxHoqc0foi67Fri5+g=="; + url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-9.0.0.tgz"; + sha512 = "Q4LDXbWnun5r1ML6ZLS5Wb2BurnkJjtP1geHtZbshLUmpfms++Q28li8OPzv/KQ6praC1HDRG37D0AY6xoObSw=="; }; }; - "@serialport/stream-8.0.6" = { + "@serialport/stream-9.0.0" = { name = "_at_serialport_slash_stream"; packageName = "@serialport/stream"; - version = "8.0.6"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/stream/-/stream-8.0.6.tgz"; - sha512 = "ym1PwM0rwLrj90vRBB66I1hwMXbuMw9wGTxqns75U3N/tuNFOH85mxXaYVF2TpI66aM849NoI1jMm50fl9equg=="; + url = "https://registry.npmjs.org/@serialport/stream/-/stream-9.0.0.tgz"; + sha512 = "JK952xKP+7PX3tXj9DgKafQaAru0sdbkTIY1OpjUNGp0xYWTVUbZRnLK//MLkH6FpoDTJc9ghN2ILK0YRtpLLA=="; }; }; - "@sinonjs/commons-1.7.1" = { + "@sinonjs/commons-1.8.0" = { name = "_at_sinonjs_slash_commons"; packageName = "@sinonjs/commons"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.1.tgz"; - sha512 = "Debi3Baff1Qu1Unc3mjJ96MgpbwTn43S1+9yJ0llWygPwDNu2aaWBD6yc9y/Z8XDRNhx7U+u2UDg2OGQXkclUQ=="; + url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.0.tgz"; + sha512 = "wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q=="; }; }; - "@sinonjs/commons-1.8.0" = { + "@sinonjs/commons-1.8.1" = { name = "_at_sinonjs_slash_commons"; packageName = "@sinonjs/commons"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.0.tgz"; - sha512 = "wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q=="; + url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz"; + sha512 = "892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw=="; }; }; "@sinonjs/fake-timers-6.0.1" = { @@ -1273,13 +1192,13 @@ let sha512 = "MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA=="; }; }; - "@types/babel__core-7.1.7" = { + "@types/babel__core-7.1.9" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.7"; + version = "7.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.7.tgz"; - sha512 = "RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz"; + sha512 = "sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw=="; }; }; "@types/babel__generator-7.6.1" = { @@ -1300,22 +1219,13 @@ let sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; }; }; - "@types/babel__traverse-7.0.11" = { - name = "_at_types_slash_babel__traverse"; - packageName = "@types/babel__traverse"; - version = "7.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.11.tgz"; - sha512 = "ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q=="; - }; - }; - "@types/babel__traverse-7.0.9" = { + "@types/babel__traverse-7.0.13" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.0.9"; + version = "7.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz"; - sha512 = "jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.13.tgz"; + sha512 = "i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ=="; }; }; "@types/color-name-1.1.1" = { @@ -1354,22 +1264,13 @@ let sha512 = "AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ=="; }; }; - "@types/istanbul-lib-coverage-2.0.1" = { + "@types/istanbul-lib-coverage-2.0.3" = { name = "_at_types_slash_istanbul-lib-coverage"; packageName = "@types/istanbul-lib-coverage"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz"; - sha512 = "hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg=="; - }; - }; - "@types/istanbul-lib-coverage-2.0.2" = { - name = "_at_types_slash_istanbul-lib-coverage"; - packageName = "@types/istanbul-lib-coverage"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz"; - sha512 = "rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w=="; + url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; + sha512 = "sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="; }; }; "@types/istanbul-lib-report-3.0.0" = { @@ -1381,15 +1282,6 @@ let sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg=="; }; }; - "@types/istanbul-reports-1.1.1" = { - name = "_at_types_slash_istanbul-reports"; - packageName = "@types/istanbul-reports"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz"; - sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA=="; - }; - }; "@types/istanbul-reports-1.1.2" = { name = "_at_types_slash_istanbul-reports"; packageName = "@types/istanbul-reports"; @@ -1399,49 +1291,49 @@ let sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; }; }; - "@types/jest-25.2.1" = { + "@types/jest-26.0.4" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "25.2.1"; + version = "26.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-25.2.1.tgz"; - sha512 = "msra1bCaAeEdkSyA0CZ6gW1ukMIvZ5YoJkdXw/qhQdsuuDlFTcEUrUw8CLCPt2rVRUfXlClVvK2gvPs9IokZaA=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.4.tgz"; + sha512 = "4fQNItvelbNA9+sFgU+fhJo8ZFF+AS4Egk3GWwCW2jFtViukXbnztccafAdLhzE/0EiCogljtQQXP8aQ9J7sFg=="; }; }; - "@types/json-schema-7.0.4" = { + "@types/json-schema-7.0.5" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.4"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz"; - sha512 = "8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz"; + sha512 = "7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="; }; }; - "@types/nedb-1.8.9" = { + "@types/nedb-1.8.10" = { name = "_at_types_slash_nedb"; packageName = "@types/nedb"; - version = "1.8.9"; + version = "1.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.9.tgz"; - sha512 = "w9Tl3DQCkdT0Ghes+PKhe+3/pZppBXuFFpSCjPJbb2KE3DjYmUpEyCYzjrAYlT9Y1TndnbbnChzkax2h/JorVQ=="; + url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.10.tgz"; + sha512 = "M0ISm1qsNvkdXNZml1r/1bEVqt5SJHF/LFcCtH5dHfsSIG0LEj5FhwK0f4fZy9WPCsXjmrKfpzgEW/bdQuKqmQ=="; }; }; - "@types/node-13.11.0" = { + "@types/node-14.0.22" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.11.0"; + version = "14.0.22"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.11.0.tgz"; - sha512 = "uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.0.22.tgz"; + sha512 = "emeGcJvdiZ4Z3ohbmw93E/64jRzUHAItSHt8nF7M4TGgQTiWqFVGB8KNpLGFmUHmHLvjvBgFwVlqNcq+VuGv9g=="; }; }; - "@types/node-14.0.5" = { + "@types/node-14.0.23" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.5"; + version = "14.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.5.tgz"; - sha512 = "90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.0.23.tgz"; + sha512 = "Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw=="; }; }; "@types/normalize-package-data-2.4.0" = { @@ -1453,31 +1345,22 @@ let sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; }; }; - "@types/prettier-1.19.1" = { - name = "_at_types_slash_prettier"; - packageName = "@types/prettier"; - version = "1.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.1.tgz"; - sha512 = "5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ=="; - }; - }; - "@types/prettier-2.0.1" = { + "@types/prettier-2.0.2" = { name = "_at_types_slash_prettier"; packageName = "@types/prettier"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.0.1.tgz"; - sha512 = "boy4xPNEtiw6N3abRhBi/e7hNvy3Tt8E9ZRAQrwAGzoCGZS/1wjo9KY7JHhnfnEsG5wSjDbymCozUM9a3ea7OQ=="; + url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.0.2.tgz"; + sha512 = "IkVfat549ggtkZUthUzEX49562eGikhSYeVGX97SkMFn+sTZrgRewXjQ4tPKFPCykZHkX1Zfd9OoELGqKU2jJA=="; }; }; - "@types/serialport-8.0.0" = { + "@types/serialport-8.0.1" = { name = "_at_types_slash_serialport"; packageName = "@types/serialport"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serialport/-/serialport-8.0.0.tgz"; - sha512 = "Hz57S0cH1Be94u1UO4kwp+1XwAk0GA5RrL16Gx0wZDLyP8gr+h5qQXFS4OygxjNZcE26cTMnT7s31AlezY+jbw=="; + url = "https://registry.npmjs.org/@types/serialport/-/serialport-8.0.1.tgz"; + sha512 = "IcKHq6b/ynKSF/x4al/Ce8+a0hpbYIEaIcK9Z3l4koLvQqAPSODZ37/hgemQx8dTu7fPZDMHN4bKmu89B3UaGA=="; }; }; "@types/stack-utils-1.0.1" = { @@ -1489,15 +1372,6 @@ let sha512 = "l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw=="; }; }; - "@types/yargs-15.0.4" = { - name = "_at_types_slash_yargs"; - packageName = "@types/yargs"; - version = "15.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz"; - sha512 = "9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg=="; - }; - }; "@types/yargs-15.0.5" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -1516,49 +1390,49 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; - "@typescript-eslint/eslint-plugin-2.26.0" = { + "@typescript-eslint/eslint-plugin-3.6.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "2.26.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.26.0.tgz"; - sha512 = "4yUnLv40bzfzsXcTAtZyTjbiGUXMrcIJcIMioI22tSOyAxpdXiZ4r7YQUU8Jj6XXrLz9d5aMHPQf5JFR7h27Nw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.6.0.tgz"; + sha512 = "ubHlHVt1lsPQB/CZdEov9XuOFhNG9YRC//kuiS1cMQI6Bs1SsqKrEmZnpgRwthGR09/kEDtr9MywlqXyyYd8GA=="; }; }; - "@typescript-eslint/experimental-utils-2.26.0" = { + "@typescript-eslint/experimental-utils-2.34.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "2.26.0"; + version = "2.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.26.0.tgz"; - sha512 = "RELVoH5EYd+JlGprEyojUv9HeKcZqF7nZUGSblyAw1FwOGNnmQIU8kxJ69fttQvEwCsX5D6ECJT8GTozxrDKVQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz"; + sha512 = "eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA=="; }; }; - "@typescript-eslint/experimental-utils-2.34.0" = { + "@typescript-eslint/experimental-utils-3.6.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "2.34.0"; + version = "3.6.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-3.6.0.tgz"; + sha512 = "4Vdf2hvYMUnTdkCNZu+yYlFtL2v+N2R7JOynIOkFbPjf9o9wQvRwRkzUdWlFd2YiiUwJLbuuLnl5civNg5ykOQ=="; }; }; - "@typescript-eslint/parser-2.26.0" = { + "@typescript-eslint/parser-3.6.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "2.26.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.26.0.tgz"; - sha512 = "+Xj5fucDtdKEVGSh9353wcnseMRkPpEAOY96EEenN7kJVrLqy/EVwtIh3mxcUz8lsFXW1mT5nN5vvEam/a5HiQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.6.0.tgz"; + sha512 = "taghDxuLhbDAD1U5Fk8vF+MnR0yiFE9Z3v2/bYScFb0N1I9SK8eKHkdJl1DAD48OGFDMFTeOTX0z7g0W6SYUXw=="; }; }; - "@typescript-eslint/typescript-estree-2.26.0" = { - name = "_at_typescript-eslint_slash_typescript-estree"; - packageName = "@typescript-eslint/typescript-estree"; - version = "2.26.0"; + "@typescript-eslint/types-3.6.0" = { + name = "_at_typescript-eslint_slash_types"; + packageName = "@typescript-eslint/types"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.26.0.tgz"; - sha512 = "3x4SyZCLB4zsKsjuhxDLeVJN6W29VwBnYpCsZ7vIdPel9ZqLfIZJgJXO47MNUkurGpQuIBALdPQKtsSnWpE1Yg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.6.0.tgz"; + sha512 = "JwVj74ohUSt0ZPG+LZ7hb95fW8DFOqBuR6gE7qzq55KDI3BepqsCtHfBIoa0+Xi1AI7fq5nCu2VQL8z4eYftqg=="; }; }; "@typescript-eslint/typescript-estree-2.34.0" = { @@ -1570,49 +1444,40 @@ let sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; }; }; - "abab-2.0.3" = { - name = "abab"; - packageName = "abab"; - version = "2.0.3"; + "@typescript-eslint/typescript-estree-3.6.0" = { + name = "_at_typescript-eslint_slash_typescript-estree"; + packageName = "@typescript-eslint/typescript-estree"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz"; - sha512 = "tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.6.0.tgz"; + sha512 = "G57NDSABHjvob7zVV09ehWyD1K6/YUKjz5+AufObFyjNO4DVmKejj47MHjVHHlZZKgmpJD2yyH9lfCXHrPITFg=="; }; }; - "acorn-6.4.1" = { - name = "acorn"; - packageName = "acorn"; - version = "6.4.1"; + "@typescript-eslint/visitor-keys-3.6.0" = { + name = "_at_typescript-eslint_slash_visitor-keys"; + packageName = "@typescript-eslint/visitor-keys"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz"; - sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.6.0.tgz"; + sha512 = "p1izllL2Ubwunite0ITjubuMQRBGgjdVYwyG7lXPX8GbrA6qF0uwSRz9MnXZaHMxID4948gX0Ez8v9tUDi/KfQ=="; }; }; - "acorn-7.1.1" = { - name = "acorn"; - packageName = "acorn"; - version = "7.1.1"; + "abab-2.0.3" = { + name = "abab"; + packageName = "abab"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz"; - sha512 = "add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg=="; + url = "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz"; + sha512 = "tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="; }; }; - "acorn-7.2.0" = { + "acorn-7.3.1" = { name = "acorn"; packageName = "acorn"; - version = "7.2.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz"; - sha512 = "apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ=="; - }; - }; - "acorn-globals-4.3.4" = { - name = "acorn-globals"; - packageName = "acorn-globals"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz"; - sha512 = "clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A=="; + url = "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz"; + sha512 = "tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="; }; }; "acorn-globals-6.0.0" = { @@ -1633,49 +1498,40 @@ let sha512 = "HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ=="; }; }; - "acorn-walk-6.2.0" = { - name = "acorn-walk"; - packageName = "acorn-walk"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz"; - sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="; - }; - }; - "acorn-walk-7.1.1" = { + "acorn-walk-7.2.0" = { name = "acorn-walk"; packageName = "acorn-walk"; - version = "7.1.1"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz"; - sha512 = "wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ=="; + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; }; }; - "agent-base-6.0.0" = { + "agent-base-6.0.1" = { name = "agent-base"; packageName = "agent-base"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz"; - sha512 = "j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw=="; + url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz"; + sha512 = "01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg=="; }; }; - "ajv-6.12.0" = { + "ajv-6.12.3" = { name = "ajv"; packageName = "ajv"; - version = "6.12.0"; + version = "6.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz"; + sha512 = "4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA=="; }; }; - "ajv-6.12.2" = { - name = "ajv"; - packageName = "ajv"; - version = "6.12.2"; + "ansi-colors-4.1.1" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; - sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; "ansi-escapes-4.3.1" = { @@ -1804,15 +1660,6 @@ let sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; }; }; - "array-equal-1.0.0" = { - name = "array-equal"; - packageName = "array-equal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz"; - sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93"; - }; - }; "array-unique-0.3.2" = { name = "array-unique"; packageName = "array-unique"; @@ -1894,6 +1741,15 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "at-least-node-1.0.0" = { + name = "at-least-node"; + packageName = "at-least-node"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; + }; + }; "atob-2.1.2" = { name = "atob"; packageName = "atob"; @@ -1921,15 +1777,6 @@ let sha512 = "3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="; }; }; - "aws4-1.9.1" = { - name = "aws4"; - packageName = "aws4"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz"; - sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; - }; - }; "axios-0.19.2" = { name = "axios"; packageName = "axios"; @@ -1939,31 +1786,22 @@ let sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; }; }; - "babel-jest-25.2.6" = { - name = "babel-jest"; - packageName = "babel-jest"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.2.6.tgz"; - sha512 = "MDJOAlwtIeIQiGshyX0d2PxTbV73xZMpNji40ivVTPQOm59OdRR9nYCkffqI7ugtsK4JR98HgNKbDbuVf4k5QQ=="; - }; - }; - "babel-jest-26.0.1" = { + "babel-jest-26.1.0" = { name = "babel-jest"; packageName = "babel-jest"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.0.1.tgz"; - sha512 = "Z4GGmSNQ8pX3WS1O+6v3fo41YItJJZsVxG5gIQ+HuB/iuAQBJxMTHTwz292vuYws1LnHfwSRgoqI+nxdy/pcvw=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-26.1.0.tgz"; + sha512 = "Nkqgtfe7j6PxLO6TnCQQlkMm8wdTdnIF8xrdpooHCuD5hXRzVEPbPneTJKknH5Dsv3L8ip9unHDAp48YQ54Dkg=="; }; }; - "babel-plugin-dynamic-import-node-2.3.0" = { + "babel-plugin-dynamic-import-node-2.3.3" = { name = "babel-plugin-dynamic-import-node"; packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; - sha512 = "o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ=="; + url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; }; }; "babel-plugin-istanbul-6.0.0" = { @@ -1975,49 +1813,31 @@ let sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; }; - "babel-plugin-jest-hoist-25.2.6" = { - name = "babel-plugin-jest-hoist"; - packageName = "babel-plugin-jest-hoist"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.2.6.tgz"; - sha512 = "qE2xjMathybYxjiGFJg0mLFrz0qNp83aNZycWDY/SuHiZNq+vQfRQtuINqyXyue1ELd8Rd+1OhFSLjms8msMbw=="; - }; - }; - "babel-plugin-jest-hoist-26.0.0" = { + "babel-plugin-jest-hoist-26.1.0" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "26.0.0"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.0.0.tgz"; - sha512 = "+AuoehOrjt9irZL7DOt2+4ZaTM6dlu1s5TTS46JBa0/qem4dy7VNW3tMb96qeEqcIh20LD73TVNtmVEeymTG7w=="; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.1.0.tgz"; + sha512 = "qhqLVkkSlqmC83bdMhM8WW4Z9tB+JkjqAqlbbohS9sJLT5Ha2vfzuKqg5yenXrAjOPG2YC0WiXdH3a9PvB+YYw=="; }; }; - "babel-preset-current-node-syntax-0.1.2" = { + "babel-preset-current-node-syntax-0.1.3" = { name = "babel-preset-current-node-syntax"; packageName = "babel-preset-current-node-syntax"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz"; - sha512 = "u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw=="; - }; - }; - "babel-preset-jest-25.2.6" = { - name = "babel-preset-jest"; - packageName = "babel-preset-jest"; - version = "25.2.6"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.2.6.tgz"; - sha512 = "Xh2eEAwaLY9+SyMt/xmGZDnXTW/7pSaBPG0EMo7EuhvosFKVWYB6CqwYD31DaEQuoTL090oDZ0FEqygffGRaSQ=="; + url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz"; + sha512 = "uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ=="; }; }; - "babel-preset-jest-26.0.0" = { + "babel-preset-jest-26.1.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "26.0.0"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.0.0.tgz"; - sha512 = "9ce+DatAa31DpR4Uir8g4Ahxs5K4W4L8refzt+qHWQANb6LhGcAEfIFgLUwk67oya2cCUd6t4eUMtO/z64ocNw=="; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.1.0.tgz"; + sha512 = "na9qCqFksknlEj5iSdw1ehMVR06LCCTkZLGKeEtxDDdhg8xpUF09m29Kvh1pRbZ07h7AQ5ttLYUwpXL4tO6w7w=="; }; }; "balanced-match-1.0.0" = { @@ -2128,22 +1948,13 @@ let sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; }; }; - "browser-resolve-1.11.3" = { - name = "browser-resolve"; - packageName = "browser-resolve"; - version = "1.11.3"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz"; - sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ=="; - }; - }; - "browserslist-4.11.1" = { + "browserslist-4.13.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.11.1"; + version = "4.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz"; - sha512 = "DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz"; + sha512 = "MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ=="; }; }; "bser-2.1.1" = { @@ -2155,15 +1966,6 @@ let sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; }; }; - "buffer-5.5.0" = { - name = "buffer"; - packageName = "buffer"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz"; - sha512 = "9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww=="; - }; - }; "buffer-5.6.0" = { name = "buffer"; packageName = "buffer"; @@ -2227,13 +2029,13 @@ let sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w=="; }; }; - "caniuse-lite-1.0.30001039" = { + "caniuse-lite-1.0.30001099" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001039"; + version = "1.0.30001099"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz"; - sha512 = "SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001099.tgz"; + sha512 = "sdS9A+sQTk7wKoeuZBN/YMAHVztUfVnjDi4/UV3sDE8xoh7YR12hKW+pIdB3oqKGwr9XaFL2ovfzt9w8eUI5CA=="; }; }; "capture-exit-2.0.0" = { @@ -2272,13 +2074,13 @@ let sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; }; }; - "chalk-4.0.0" = { + "chalk-4.1.0" = { name = "chalk"; packageName = "chalk"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz"; - sha512 = "N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A=="; + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; + sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; }; }; "char-regex-1.0.2" = { @@ -2290,15 +2092,6 @@ let sha512 = "kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="; }; }; - "chardet-0.7.0" = { - name = "chardet"; - packageName = "chardet"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; - sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; - }; - }; "chokidar-2.1.8" = { name = "chokidar"; packageName = "chokidar"; @@ -2335,33 +2128,6 @@ let sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; - "cli-cursor-3.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; - }; - }; - "cli-width-2.2.0" = { - name = "cli-width"; - packageName = "cli-width"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; - }; - }; - "cli-width-2.2.1" = { - name = "cli-width"; - packageName = "cli-width"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz"; - sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; - }; - }; "cliui-6.0.0" = { name = "cliui"; packageName = "cliui"; @@ -2488,15 +2254,6 @@ let sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; - "commander-2.20.3" = { - name = "commander"; - packageName = "commander"; - version = "2.20.3"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; - }; - }; "commander-4.1.1" = { name = "commander"; packageName = "commander"; @@ -2569,13 +2326,13 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; - "core-js-compat-3.6.4" = { + "core-js-compat-3.6.5" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.6.4"; + version = "3.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz"; - sha512 = "zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz"; + sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng=="; }; }; "core-util-is-1.0.2" = { @@ -2596,13 +2353,13 @@ let sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; - "cross-spawn-7.0.2" = { + "cross-spawn-7.0.3" = { name = "cross-spawn"; packageName = "cross-spawn"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz"; - sha512 = "PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw=="; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; }; "cssom-0.3.8" = { @@ -2623,15 +2380,6 @@ let sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="; }; }; - "cssstyle-2.2.0" = { - name = "cssstyle"; - packageName = "cssstyle"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz"; - sha512 = "sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA=="; - }; - }; "cssstyle-2.3.0" = { name = "cssstyle"; packageName = "cssstyle"; @@ -2659,15 +2407,6 @@ let sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; - "data-urls-1.1.0" = { - name = "data-urls"; - packageName = "data-urls"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz"; - sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ=="; - }; - }; "data-urls-2.0.0" = { name = "data-urls"; packageName = "data-urls"; @@ -2875,15 +2614,6 @@ let sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; }; - "domexception-1.0.1" = { - name = "domexception"; - packageName = "domexception"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz"; - sha512 = "raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug=="; - }; - }; "domexception-2.0.1" = { name = "domexception"; packageName = "domexception"; @@ -2911,13 +2641,13 @@ let sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "electron-to-chromium-1.3.397" = { + "electron-to-chromium-1.3.496" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.397"; + version = "1.3.496"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.397.tgz"; - sha512 = "zcUd1p/7yzTSdWkCTrqGvbnEOASy96d0RJL/lc5BDJoO23Z3G/VHd0yIPbguDU9n8QNUTCigLO7oEdtOb7fp2A=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.496.tgz"; + sha512 = "TXY4mwoyowwi4Lsrq9vcTUYBThyc1b2hXaTZI13p8/FRhY2CTaq5lK+DVjhYkKiTLsKt569Xes+0J5JsVXFurQ=="; }; }; "emoji-regex-7.0.3" = { @@ -2956,6 +2686,15 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; + "enquirer-2.3.6" = { + name = "enquirer"; + packageName = "enquirer"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"; + sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; + }; + }; "error-ex-1.3.2" = { name = "error-ex"; packageName = "error-ex"; @@ -3019,6 +2758,15 @@ let sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; }; }; + "escalade-3.0.1" = { + name = "escalade"; + packageName = "escalade"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escalade/-/escalade-3.0.1.tgz"; + sha512 = "DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA=="; + }; + }; "escape-string-regexp-1.0.5" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -3037,31 +2785,31 @@ let sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; }; }; - "escodegen-1.14.1" = { + "escodegen-1.14.3" = { name = "escodegen"; packageName = "escodegen"; - version = "1.14.1"; + version = "1.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz"; - sha512 = "Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ=="; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz"; + sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; }; }; - "eslint-6.8.0" = { + "eslint-7.4.0" = { name = "eslint"; packageName = "eslint"; - version = "6.8.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz"; - sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.4.0.tgz"; + sha512 = "gU+lxhlPHu45H3JkEGgYhWhkR9wLHHEXC9FbWFnTlEkbKyZKWgWRLgf61E8zWmBuI6g5xKBph9ltg3NtZMVF8g=="; }; }; - "eslint-7.1.0" = { + "eslint-7.5.0" = { name = "eslint"; packageName = "eslint"; - version = "7.1.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.1.0.tgz"; - sha512 = "DfS3b8iHMK5z/YLSme8K5cge168I8j8o1uiVmFCgnnjxZQbCGyraF8bMl7Ju4yfBmCuxD7shOF7eqGkcuIHfsA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.5.0.tgz"; + sha512 = "vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q=="; }; }; "eslint-config-google-0.14.0" = { @@ -3073,67 +2821,58 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-plugin-jest-23.13.1" = { + "eslint-plugin-jest-23.18.0" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "23.13.1"; + version = "23.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.13.1.tgz"; - sha512 = "TRLJH6M6EDvGocD98a7yVThrAOCK9WJfo9phuUb0MJptcrOYZeCKzC9aOzZCD93sxXCsiJVZywaTHdI/mAi0FQ=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.18.0.tgz"; + sha512 = "wLPM/Rm1SGhxrFQ2TKM/BYsYPhn7ch6ZEK92S2o/vGkAAnDXM0I4nTIo745RIX+VlCRMFgBuJEax6XfTHMdeKg=="; }; }; - "eslint-scope-5.0.0" = { + "eslint-scope-5.1.0" = { name = "eslint-scope"; packageName = "eslint-scope"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz"; - sha512 = "oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw=="; - }; - }; - "eslint-utils-1.4.3" = { - name = "eslint-utils"; - packageName = "eslint-utils"; - version = "1.4.3"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz"; - sha512 = "fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q=="; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz"; + sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w=="; }; }; - "eslint-utils-2.0.0" = { + "eslint-utils-2.1.0" = { name = "eslint-utils"; packageName = "eslint-utils"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz"; - sha512 = "0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA=="; + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; - "eslint-visitor-keys-1.1.0" = { + "eslint-visitor-keys-1.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; - version = "1.1.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; - sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="; + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; }; - "espree-6.2.1" = { + "espree-7.1.0" = { name = "espree"; packageName = "espree"; - version = "6.2.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz"; - sha512 = "ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw=="; + url = "https://registry.npmjs.org/espree/-/espree-7.1.0.tgz"; + sha512 = "dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw=="; }; }; - "espree-7.0.0" = { + "espree-7.2.0" = { name = "espree"; packageName = "espree"; - version = "7.0.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-7.0.0.tgz"; - sha512 = "/r2XEx5Mw4pgKdyb7GNLQNsu++asx/dltf/CI8RFi9oGHxmQFgvLbc5Op4U6i8Oaj+kdslhJtVlEZeAqH5qOTw=="; + url = "https://registry.npmjs.org/espree/-/espree-7.2.0.tgz"; + sha512 = "H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g=="; }; }; "esprima-4.0.1" = { @@ -3145,15 +2884,6 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esquery-1.2.0" = { - name = "esquery"; - packageName = "esquery"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz"; - sha512 = "weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q=="; - }; - }; "esquery-1.3.1" = { name = "esquery"; packageName = "esquery"; @@ -3181,15 +2911,6 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "estraverse-5.0.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz"; - sha512 = "j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A=="; - }; - }; "estraverse-5.1.0" = { name = "estraverse"; packageName = "estraverse"; @@ -3235,22 +2956,13 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-3.4.0" = { - name = "execa"; - packageName = "execa"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz"; - sha512 = "r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g=="; - }; - }; - "execa-4.0.2" = { + "execa-4.0.3" = { name = "execa"; packageName = "execa"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz"; - sha512 = "QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q=="; + url = "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz"; + sha512 = "WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A=="; }; }; "exit-0.1.2" = { @@ -3280,22 +2992,13 @@ let sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; }; - "expect-25.2.7" = { - name = "expect"; - packageName = "expect"; - version = "25.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-25.2.7.tgz"; - sha512 = "yA+U2Ph0MkMsJ9N8q5hs9WgWI6oJYfecdXta6LkP/alY/jZZL1MHlJ2wbLh60Ucqf3G+51ytbqV3mlGfmxkpNw=="; - }; - }; - "expect-26.0.1" = { + "expect-26.1.0" = { name = "expect"; packageName = "expect"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-26.0.1.tgz"; - sha512 = "QcCy4nygHeqmbw564YxNbHTJlXh47dVID2BUP52cZFpLU9zHViMFK6h07cC1wf7GYCTIigTdAXhVua8Yl1FkKg=="; + url = "https://registry.npmjs.org/expect/-/expect-26.1.0.tgz"; + sha512 = "QbH4LZXDsno9AACrN9eM0zfnby9G+OsdNgZUohjg/P0mLy1O+/bzTAJGT6VSIjVCe8yKM6SzEl/ckEOFBT7Vnw=="; }; }; "ext-1.4.0" = { @@ -3334,15 +3037,6 @@ let sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; }; }; - "external-editor-3.1.0" = { - name = "external-editor"; - packageName = "external-editor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; - sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; - }; - }; "extglob-2.0.4" = { name = "extglob"; packageName = "extglob"; @@ -3361,24 +3055,6 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-2.0.1" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; - }; - }; - "fast-deep-equal-3.1.1" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="; - }; - }; "fast-deep-equal-3.1.3" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; @@ -3433,15 +3109,6 @@ let sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="; }; }; - "figures-3.2.0" = { - name = "figures"; - packageName = "figures"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"; - sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; - }; - }; "file-entry-cache-5.0.1" = { name = "file-entry-cache"; packageName = "file-entry-cache"; @@ -3478,15 +3145,6 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; - "find-up-2.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; - sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; - }; - }; "find-up-4.1.0" = { name = "find-up"; packageName = "find-up"; @@ -3586,6 +3244,15 @@ let sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; }; + "fs-extra-9.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz"; + sha512 = "h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ=="; + }; + }; "fs-readdir-recursive-1.1.0" = { name = "fs-readdir-recursive"; packageName = "fs-readdir-recursive"; @@ -3604,22 +3271,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-1.2.12" = { - name = "fsevents"; - packageName = "fsevents"; - version = "1.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz"; - sha512 = "Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q=="; - }; - }; - "fsevents-2.1.2" = { + "fsevents-1.2.13" = { name = "fsevents"; packageName = "fsevents"; - version = "2.1.2"; + version = "1.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz"; - sha512 = "R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz"; + sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; }; }; "fsevents-2.1.3" = { @@ -3802,15 +3460,6 @@ let sha1 = "769b5984a96f6066ab9ea758224825ee6c210f0b"; }; }; - "graceful-fs-4.2.3" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; - }; - }; "graceful-fs-4.2.4" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -3937,13 +3586,13 @@ let sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "highlight.js-9.18.1" = { + "highlight.js-10.1.1" = { name = "highlight.js"; packageName = "highlight.js"; - version = "9.18.1"; + version = "10.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz"; - sha512 = "OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.1.tgz"; + sha512 = "b4L09127uVa+9vkMgPpdUQP78ickGbHEQTWeBrQFTJZ4/n2aihWOGS0ZoUqAwjVmfjhq/C76HRzkqwZhK4sBbg=="; }; }; "hosted-git-info-2.8.8" = { @@ -3955,15 +3604,6 @@ let sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; }; }; - "html-encoding-sniffer-1.0.2" = { - name = "html-encoding-sniffer"; - packageName = "html-encoding-sniffer"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz"; - sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw=="; - }; - }; "html-encoding-sniffer-2.0.1" = { name = "html-encoding-sniffer"; packageName = "html-encoding-sniffer"; @@ -4099,22 +3739,13 @@ let sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; }; }; - "inquirer-7.1.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz"; - sha512 = "5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg=="; - }; - }; - "interpret-1.2.0" = { + "interpret-1.4.0" = { name = "interpret"; packageName = "interpret"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz"; - sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="; + url = "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"; + sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; }; }; "invariant-2.2.4" = { @@ -4378,15 +4009,6 @@ let sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; }; }; - "is-promise-2.1.0" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - }; "is-relative-1.0.0" = { name = "is-relative"; packageName = "is-relative"; @@ -4441,15 +4063,6 @@ let sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; }; - "is-wsl-2.1.1" = { - name = "is-wsl"; - packageName = "is-wsl"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz"; - sha512 = "umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog=="; - }; - }; "is-wsl-2.2.0" = { name = "is-wsl"; packageName = "is-wsl"; @@ -4513,15 +4126,6 @@ let sha512 = "UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg=="; }; }; - "istanbul-lib-instrument-4.0.1" = { - name = "istanbul-lib-instrument"; - packageName = "istanbul-lib-instrument"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz"; - sha512 = "imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg=="; - }; - }; "istanbul-lib-instrument-4.0.3" = { name = "istanbul-lib-instrument"; packageName = "istanbul-lib-instrument"; @@ -4558,103 +4162,58 @@ let sha512 = "9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw=="; }; }; - "jest-25.2.7" = { + "jest-26.1.0" = { name = "jest"; packageName = "jest"; - version = "25.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-25.2.7.tgz"; - sha512 = "XV1n/CE2McCikl4tfpCY950RytHYvxdo/wvtgmn/qwA8z1s16fuvgFL/KoPrrmkqJTaPMUlLVE58pwiaTX5TdA=="; - }; - }; - "jest-26.0.1" = { - name = "jest"; - packageName = "jest"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-26.0.1.tgz"; - sha512 = "29Q54kn5Bm7ZGKIuH2JRmnKl85YRigp0o0asTc6Sb6l2ch1DCXIeZTLLFy9ultJvhkTqbswF5DEx4+RlkmCxWg=="; - }; - }; - "jest-changed-files-25.2.6" = { - name = "jest-changed-files"; - packageName = "jest-changed-files"; - version = "25.2.6"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-25.2.6.tgz"; - sha512 = "F7l2m5n55jFnJj4ItB9XbAlgO+6umgvz/mdK76BfTd2NGkvGf9x96hUXP/15a1K0k14QtVOoutwpRKl360msvg=="; + url = "https://registry.npmjs.org/jest/-/jest-26.1.0.tgz"; + sha512 = "LIti8jppw5BcQvmNJe4w2g1N/3V68HUfAv9zDVm7v+VAtQulGhH0LnmmiVkbNE4M4I43Bj2fXPiBGKt26k9tHw=="; }; }; - "jest-changed-files-26.0.1" = { + "jest-changed-files-26.1.0" = { name = "jest-changed-files"; packageName = "jest-changed-files"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.0.1.tgz"; - sha512 = "q8LP9Sint17HaE2LjxQXL+oYWW/WeeXMPE2+Op9X3mY8IEGFVc14xRxFjUuXUbcPAlDLhtWdIEt59GdQbn76Hw=="; + url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.1.0.tgz"; + sha512 = "HS5MIJp3B8t0NRKGMCZkcDUZo36mVRvrDETl81aqljT1S9tqiHRSpyoOvWg9ZilzZG9TDisDNaN1IXm54fLRZw=="; }; }; - "jest-cli-25.2.7" = { + "jest-cli-26.1.0" = { name = "jest-cli"; packageName = "jest-cli"; - version = "25.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-cli/-/jest-cli-25.2.7.tgz"; - sha512 = "OOAZwY4Jkd3r5WhVM5L3JeLNFaylvHUczMLxQDVLrrVyb1Cy+DNJ6MVsb5TLh6iBklB42m5TOP+IbOgKGGOtMw=="; - }; - }; - "jest-cli-26.0.1" = { - name = "jest-cli"; - packageName = "jest-cli"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.0.1.tgz"; - sha512 = "pFLfSOBcbG9iOZWaMK4Een+tTxi/Wcm34geqZEqrst9cZDkTQ1LZ2CnBrTlHWuYAiTMFr0EQeK52ScyFU8wK+w=="; - }; - }; - "jest-config-25.2.7" = { - name = "jest-config"; - packageName = "jest-config"; - version = "25.2.7"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-config/-/jest-config-25.2.7.tgz"; - sha512 = "rIdPPXR6XUxi+7xO4CbmXXkE6YWprvlKc4kg1SrkCL2YV5m/8MkHstq9gBZJ19Qoa3iz/GP+0sTG/PcIwkFojg=="; + url = "https://registry.npmjs.org/jest-cli/-/jest-cli-26.1.0.tgz"; + sha512 = "Imumvjgi3rU7stq6SJ1JUEMaV5aAgJYXIs0jPqdUnF47N/Tk83EXfmtvNKQ+SnFVI6t6mDOvfM3aA9Sg6kQPSw=="; }; }; - "jest-config-26.0.1" = { + "jest-config-26.1.0" = { name = "jest-config"; packageName = "jest-config"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-config/-/jest-config-26.0.1.tgz"; - sha512 = "9mWKx2L1LFgOXlDsC4YSeavnblN6A4CPfXFiobq+YYLaBMymA/SczN7xYTSmLaEYHZOcB98UdoN4m5uNt6tztg=="; + url = "https://registry.npmjs.org/jest-config/-/jest-config-26.1.0.tgz"; + sha512 = "ONTGeoMbAwGCdq4WuKkMcdMoyfs5CLzHEkzFOlVvcDXufZSaIWh/OXMLa2fwKXiOaFcqEw8qFr4VOKJQfn4CVw=="; }; }; - "jest-diff-25.2.6" = { + "jest-diff-25.5.0" = { name = "jest-diff"; packageName = "jest-diff"; - version = "25.2.6"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-25.2.6.tgz"; - sha512 = "KuadXImtRghTFga+/adnNrv9s61HudRMR7gVSbP35UKZdn4IK2/0N0PpGZIqtmllK9aUyye54I3nu28OYSnqOg=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz"; + sha512 = "z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A=="; }; }; - "jest-diff-26.0.1" = { + "jest-diff-26.1.0" = { name = "jest-diff"; packageName = "jest-diff"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.0.1.tgz"; - sha512 = "odTcHyl5X+U+QsczJmOjWw5tPvww+y9Yim5xzqxVl/R1j4z71+fHW4g8qu1ugMmKdFdxw+AtQgs5mupPnzcIBQ=="; - }; - }; - "jest-docblock-25.2.6" = { - name = "jest-docblock"; - packageName = "jest-docblock"; - version = "25.2.6"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.2.6.tgz"; - sha512 = "VAYrljEq0upq0oERfIaaNf28gC6p9gORndhHstCYF8NWGNQJnzoaU//S475IxfWMk4UjjVmS9rJKLe5Jjjbixw=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.1.0.tgz"; + sha512 = "GZpIcom339y0OXznsEKjtkfKxNdg7bVbEofK8Q6MnevTIiR1jNhDWKhRX6X0SDXJlwn3dy59nZ1z55fLkAqPWg=="; }; }; "jest-docblock-26.0.0" = { @@ -4666,58 +4225,31 @@ let sha512 = "RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w=="; }; }; - "jest-each-25.2.6" = { + "jest-each-26.1.0" = { name = "jest-each"; packageName = "jest-each"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-each/-/jest-each-25.2.6.tgz"; - sha512 = "OgQ01VINaRD6idWJOhCYwUc5EcgHBiFlJuw+ON2VgYr7HLtMFyCcuo+3mmBvuLUH4QudREZN7cDCZviknzsaJQ=="; - }; - }; - "jest-each-26.0.1" = { - name = "jest-each"; - packageName = "jest-each"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-each/-/jest-each-26.0.1.tgz"; - sha512 = "OTgJlwXCAR8NIWaXFL5DBbeS4QIYPuNASkzSwMCJO+ywo9BEa6TqkaSWsfR7VdbMLdgYJqSfQcIyjJCNwl5n4Q=="; - }; - }; - "jest-environment-jsdom-25.2.6" = { - name = "jest-environment-jsdom"; - packageName = "jest-environment-jsdom"; - version = "25.2.6"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.2.6.tgz"; - sha512 = "/o7MZIhGmLGIEG5j7r5B5Az0umWLCHU+F5crwfbm0BzC4ybHTJZOQTFQWhohBg+kbTCNOuftMcqHlVkVduJCQQ=="; + url = "https://registry.npmjs.org/jest-each/-/jest-each-26.1.0.tgz"; + sha512 = "lYiSo4Igr81q6QRsVQq9LIkJW0hZcKxkIkHzNeTMPENYYDw/W/Raq28iJ0sLlNFYz2qxxeLnc5K2gQoFYlu2bA=="; }; }; - "jest-environment-jsdom-26.0.1" = { + "jest-environment-jsdom-26.1.0" = { name = "jest-environment-jsdom"; packageName = "jest-environment-jsdom"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.0.1.tgz"; - sha512 = "u88NJa3aptz2Xix2pFhihRBAatwZHWwSiRLBDBQE1cdJvDjPvv7ZGA0NQBxWwDDn7D0g1uHqxM8aGgfA9Bx49g=="; - }; - }; - "jest-environment-node-25.2.6" = { - name = "jest-environment-node"; - packageName = "jest-environment-node"; - version = "25.2.6"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.2.6.tgz"; - sha512 = "D1Ihj14fxZiMHGeTtU/LunhzSI+UeBvlr/rcXMTNyRMUMSz2PEhuqGbB78brBY6Dk3FhJDk7Ta+8reVaGjLWhA=="; + url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.1.0.tgz"; + sha512 = "dWfiJ+spunVAwzXbdVqPH1LbuJW/kDL+FyqgA5YzquisHqTi0g9hquKif9xKm7c1bKBj6wbmJuDkeMCnxZEpUw=="; }; }; - "jest-environment-node-26.0.1" = { + "jest-environment-node-26.1.0" = { name = "jest-environment-node"; packageName = "jest-environment-node"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.0.1.tgz"; - sha512 = "4FRBWcSn5yVo0KtNav7+5NH5Z/tEgDLp7VRQVS5tCouWORxj+nI+1tOLutM07Zb2Qi7ja+HEDoOUkjBSWZg/IQ=="; + url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.1.0.tgz"; + sha512 = "DNm5x1aQH0iRAe9UYAkZenuzuJ69VKzDCAYISFHQ5i9e+2Tbeu2ONGY7YStubCLH8a1wdKBgqScYw85+ySxqxg=="; }; }; "jest-get-type-25.2.6" = { @@ -4738,130 +4270,67 @@ let sha512 = "zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg=="; }; }; - "jest-haste-map-25.2.6" = { + "jest-haste-map-26.1.0" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.2.6.tgz"; - sha512 = "nom0+fnY8jwzelSDQnrqaKAcDZczYQvMEwcBjeL3PQ4MlcsqeB7dmrsAniUw/9eLkngT5DE6FhnenypilQFsgA=="; - }; - }; - "jest-haste-map-26.0.1" = { - name = "jest-haste-map"; - packageName = "jest-haste-map"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.0.1.tgz"; - sha512 = "J9kBl/EdjmDsvyv7CiyKY5+DsTvVOScenprz/fGqfLg/pm1gdjbwwQ98nW0t+OIt+f+5nAVaElvn/6wP5KO7KA=="; - }; - }; - "jest-jasmine2-25.2.7" = { - name = "jest-jasmine2"; - packageName = "jest-jasmine2"; - version = "25.2.7"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.2.7.tgz"; - sha512 = "HeQxEbonp8fUvik9jF0lkU9ab1u5TQdIb7YSU9Fj7SxWtqHNDGyCpF6ZZ3r/5yuertxi+R95Ba9eA91GMQ38eA=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.1.0.tgz"; + sha512 = "WeBS54xCIz9twzkEdm6+vJBXgRBQfdbbXD0dk8lJh7gLihopABlJmIQFdWSDDtuDe4PRiObsjZSUjbJ1uhWEpA=="; }; }; - "jest-jasmine2-26.0.1" = { + "jest-jasmine2-26.1.0" = { name = "jest-jasmine2"; packageName = "jest-jasmine2"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.0.1.tgz"; - sha512 = "ILaRyiWxiXOJ+RWTKupzQWwnPaeXPIoLS5uW41h18varJzd9/7I0QJGqg69fhTT1ev9JpSSo9QtalriUN0oqOg=="; - }; - }; - "jest-leak-detector-25.2.6" = { - name = "jest-leak-detector"; - packageName = "jest-leak-detector"; - version = "25.2.6"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.2.6.tgz"; - sha512 = "n+aJUM+j/x1kIaPVxzerMqhAUuqTU1PL5kup46rXh+l9SP8H6LqECT/qD1GrnylE1L463/0StSPkH4fUpkuEjA=="; + url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.1.0.tgz"; + sha512 = "1IPtoDKOAG+MeBrKvvuxxGPJb35MTTRSDglNdWWCndCB3TIVzbLThRBkwH9P081vXLgiJHZY8Bz3yzFS803xqQ=="; }; }; - "jest-leak-detector-26.0.1" = { + "jest-leak-detector-26.1.0" = { name = "jest-leak-detector"; packageName = "jest-leak-detector"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.0.1.tgz"; - sha512 = "93FR8tJhaYIWrWsbmVN1pQ9ZNlbgRpfvrnw5LmgLRX0ckOJ8ut/I35CL7awi2ecq6Ca4lL59bEK9hr7nqoHWPA=="; + url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.1.0.tgz"; + sha512 = "dsMnKF+4BVOZwvQDlgn3MG+Ns4JuLv8jNvXH56bgqrrboyCbI1rQg6EI5rs+8IYagVcfVP2yZFKfWNZy0rK0Hw=="; }; }; - "jest-matcher-utils-25.2.7" = { + "jest-matcher-utils-26.1.0" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "25.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.2.7.tgz"; - sha512 = "jNYmKQPRyPO3ny0KY1I4f0XW4XnpJ3Nx5ovT4ik0TYDOYzuXJW40axqOyS61l/voWbVT9y9nZ1THL1DlpaBVpA=="; - }; - }; - "jest-matcher-utils-26.0.1" = { - name = "jest-matcher-utils"; - packageName = "jest-matcher-utils"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.0.1.tgz"; - sha512 = "PUMlsLth0Azen8Q2WFTwnSkGh2JZ8FYuwijC8NR47vXKpsrKmA1wWvgcj1CquuVfcYiDEdj985u5Wmg7COEARw=="; - }; - }; - "jest-message-util-25.2.6" = { - name = "jest-message-util"; - packageName = "jest-message-util"; - version = "25.2.6"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.2.6.tgz"; - sha512 = "Hgg5HbOssSqOuj+xU1mi7m3Ti2nwSQJQf/kxEkrz2r2rp2ZLO1pMeKkz2WiDUWgSR+APstqz0uMFcE5yc0qdcg=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.1.0.tgz"; + sha512 = "PW9JtItbYvES/xLn5mYxjMd+Rk+/kIt88EfH3N7w9KeOrHWaHrdYPnVHndGbsFGRJ2d5gKtwggCvkqbFDoouQA=="; }; }; - "jest-message-util-26.0.1" = { + "jest-message-util-26.1.0" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.0.1.tgz"; - sha512 = "CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q=="; - }; - }; - "jest-mock-25.2.6" = { - name = "jest-mock"; - packageName = "jest-mock"; - version = "25.2.6"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-mock/-/jest-mock-25.2.6.tgz"; - sha512 = "vc4nibavi2RGPdj/MyZy/azuDjZhpYZLvpfgq1fxkhbyTpKVdG7CgmRVKJ7zgLpY5kuMjTzDYA6QnRwhsCU+tA=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.1.0.tgz"; + sha512 = "dY0+UlldiAJwNDJ08SF0HdF32g9PkbF2NRK/+2iMPU40O6q+iSn1lgog/u0UH8ksWoPv0+gNq8cjhYO2MFtT0g=="; }; }; - "jest-mock-26.0.1" = { + "jest-mock-26.1.0" = { name = "jest-mock"; packageName = "jest-mock"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.0.1.tgz"; - sha512 = "MpYTBqycuPYSY6xKJognV7Ja46/TeRbAZept987Zp+tuJvMN0YBWyyhG9mXyYQaU3SBI0TUlSaO5L3p49agw7Q=="; + url = "https://registry.npmjs.org/jest-mock/-/jest-mock-26.1.0.tgz"; + sha512 = "1Rm8EIJ3ZFA8yCIie92UbxZWj9SuVmUGcyhLHyAhY6WI3NIct38nVcfOPWhJteqSn8V8e3xOMha9Ojfazfpovw=="; }; }; - "jest-pnp-resolver-1.2.1" = { + "jest-pnp-resolver-1.2.2" = { name = "jest-pnp-resolver"; packageName = "jest-pnp-resolver"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz"; - sha512 = "pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ=="; - }; - }; - "jest-regex-util-25.2.6" = { - name = "jest-regex-util"; - packageName = "jest-regex-util"; - version = "25.2.6"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz"; - sha512 = "KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw=="; + url = "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"; + sha512 = "olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w=="; }; }; "jest-regex-util-26.0.0" = { @@ -4873,184 +4342,94 @@ let sha512 = "Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A=="; }; }; - "jest-resolve-25.2.6" = { - name = "jest-resolve"; - packageName = "jest-resolve"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.2.6.tgz"; - sha512 = "7O61GVdcAXkLz/vNGKdF+00A80/fKEAA47AEXVNcZwj75vEjPfZbXDaWFmAQCyXj4oo9y9dC9D+CLA11t8ieGw=="; - }; - }; - "jest-resolve-26.0.1" = { + "jest-resolve-26.1.0" = { name = "jest-resolve"; packageName = "jest-resolve"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.0.1.tgz"; - sha512 = "6jWxk0IKZkPIVTvq6s72RH735P8f9eCJW3IM5CX/SJFeKq1p2cZx0U49wf/SdMlhaB/anann5J2nCJj6HrbezQ=="; - }; - }; - "jest-resolve-dependencies-25.2.7" = { - name = "jest-resolve-dependencies"; - packageName = "jest-resolve-dependencies"; - version = "25.2.7"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-25.2.7.tgz"; - sha512 = "IrnMzCAh11Xd2gAOJL+ThEW6QO8DyqNdvNkQcaCticDrOAr9wtKT7yT6QBFFjqKFgjjvaVKDs59WdgUhgYnHnQ=="; + url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.1.0.tgz"; + sha512 = "KsY1JV9FeVgEmwIISbZZN83RNGJ1CC+XUCikf/ZWJBX/tO4a4NvA21YixokhdR9UnmPKKAC4LafVixJBrwlmfg=="; }; }; - "jest-resolve-dependencies-26.0.1" = { + "jest-resolve-dependencies-26.1.0" = { name = "jest-resolve-dependencies"; packageName = "jest-resolve-dependencies"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.0.1.tgz"; - sha512 = "9d5/RS/ft0vB/qy7jct/qAhzJsr6fRQJyGAFigK3XD4hf9kIbEH5gks4t4Z7kyMRhowU6HWm/o8ILqhaHdSqLw=="; + url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.1.0.tgz"; + sha512 = "fQVEPHHQ1JjHRDxzlLU/buuQ9om+hqW6Vo928aa4b4yvq4ZHBtRSDsLdKQLuCqn5CkTVpYZ7ARh2fbA8WkRE6g=="; }; }; - "jest-runner-25.2.7" = { + "jest-runner-26.1.0" = { name = "jest-runner"; packageName = "jest-runner"; - version = "25.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-runner/-/jest-runner-25.2.7.tgz"; - sha512 = "RFEr71nMrtNwcpoHzie5+fe1w3JQCGMyT2xzNwKe3f88+bK+frM2o1v24gEcPxQ2QqB3COMCe2+1EkElP+qqqQ=="; - }; - }; - "jest-runner-26.0.1" = { - name = "jest-runner"; - packageName = "jest-runner"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.0.1.tgz"; - sha512 = "CApm0g81b49Znm4cZekYQK67zY7kkB4umOlI2Dx5CwKAzdgw75EN+ozBHRvxBzwo1ZLYZ07TFxkaPm+1t4d8jA=="; - }; - }; - "jest-runtime-25.2.7" = { - name = "jest-runtime"; - packageName = "jest-runtime"; - version = "25.2.7"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.2.7.tgz"; - sha512 = "Gw3X8KxTTFylu2T/iDSNKRUQXQiPIYUY0b66GwVYa7W8wySkUljKhibQHSq0VhmCAN7vRBEQjlVQ+NFGNmQeBw=="; + url = "https://registry.npmjs.org/jest-runner/-/jest-runner-26.1.0.tgz"; + sha512 = "elvP7y0fVDREnfqit0zAxiXkDRSw6dgCkzPCf1XvIMnSDZ8yogmSKJf192dpOgnUVykmQXwYYJnCx641uLTgcw=="; }; }; - "jest-runtime-26.0.1" = { + "jest-runtime-26.1.0" = { name = "jest-runtime"; packageName = "jest-runtime"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.0.1.tgz"; - sha512 = "Ci2QhYFmANg5qaXWf78T2Pfo6GtmIBn2rRaLnklRyEucmPccmCKvS9JPljcmtVamsdMmkyNkVFb9pBTD6si9Lw=="; + url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.1.0.tgz"; + sha512 = "1qiYN+EZLmG1QV2wdEBRf+Ci8i3VSfIYLF02U18PiUDrMbhfpN/EAMMkJtT02jgJUoaEOpHAIXG6zS3QRMzRmA=="; }; }; - "jest-serializer-25.2.6" = { + "jest-serializer-26.1.0" = { name = "jest-serializer"; packageName = "jest-serializer"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz"; - sha512 = "RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ=="; - }; - }; - "jest-serializer-26.0.0" = { - name = "jest-serializer"; - packageName = "jest-serializer"; - version = "26.0.0"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.0.0.tgz"; - sha512 = "sQGXLdEGWFAE4wIJ2ZaIDb+ikETlUirEOBsLXdoBbeLhTHkZUJwgk3+M8eyFizhM6le43PDCCKPA1hzkSDo4cQ=="; + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.1.0.tgz"; + sha512 = "eqZOQG/0+MHmr25b2Z86g7+Kzd5dG9dhCiUoyUNJPgiqi38DqbDEOlHcNijyfZoj74soGBohKBZuJFS18YTJ5w=="; }; }; - "jest-snapshot-25.2.7" = { + "jest-snapshot-26.1.0" = { name = "jest-snapshot"; packageName = "jest-snapshot"; - version = "25.2.7"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.2.7.tgz"; - sha512 = "Rm8k7xpGM4tzmYhB6IeRjsOMkXaU8/FOz5XlU6oYwhy53mq6txVNqIKqN1VSiexzpC80oWVxVDfUDt71M6XPOA=="; + url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.1.0.tgz"; + sha512 = "YhSbU7eMTVQO/iRbNs8j0mKRxGp4plo7sJ3GzOQ0IYjvsBiwg0T1o0zGQAYepza7lYHuPTrG5J2yDd0CE2YxSw=="; }; }; - "jest-snapshot-26.0.1" = { - name = "jest-snapshot"; - packageName = "jest-snapshot"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.0.1.tgz"; - sha512 = "jxd+cF7+LL+a80qh6TAnTLUZHyQoWwEHSUFJjkw35u3Gx+BZUNuXhYvDqHXr62UQPnWo2P6fvQlLjsU93UKyxA=="; - }; - }; - "jest-util-25.2.6" = { + "jest-util-26.1.0" = { name = "jest-util"; packageName = "jest-util"; - version = "25.2.6"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-25.2.6.tgz"; - sha512 = "gpXy0H5ymuQ0x2qgl1zzHg7LYHZYUmDEq6F7lhHA8M0eIwDB2WteOcCnQsohl9c/vBKZ3JF2r4EseipCZz3s4Q=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-26.1.0.tgz"; + sha512 = "rNMOwFQevljfNGvbzNQAxdmXQ+NawW/J72dmddsK0E8vgxXCMtwQ/EH0BiWEIxh0hhMcTsxwAxINt7Lh46Uzbg=="; }; }; - "jest-util-26.0.1" = { - name = "jest-util"; - packageName = "jest-util"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-26.0.1.tgz"; - sha512 = "byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g=="; - }; - }; - "jest-validate-25.2.6" = { + "jest-validate-26.1.0" = { name = "jest-validate"; packageName = "jest-validate"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-25.2.6.tgz"; - sha512 = "a4GN7hYbqQ3Rt9iHsNLFqQz7HDV7KiRPCwPgo5nqtTIWNZw7gnT8KchG+Riwh+UTSn8REjFCodGp50KX/fRNgQ=="; - }; - }; - "jest-validate-26.0.1" = { - name = "jest-validate"; - packageName = "jest-validate"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.0.1.tgz"; - sha512 = "u0xRc+rbmov/VqXnX3DlkxD74rHI/CfS5xaV2VpeaVySjbb1JioNVOyly5b56q2l9ZKe7bVG5qWmjfctkQb0bA=="; - }; - }; - "jest-watcher-25.2.7" = { - name = "jest-watcher"; - packageName = "jest-watcher"; - version = "25.2.7"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.2.7.tgz"; - sha512 = "RdHuW+f49tahWtluTnUdZ2iPliebleROI2L/J5phYrUS6DPC9RB3SuUtqYyYhGZJsbvRSuLMIlY/cICJ+PIecw=="; + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-26.1.0.tgz"; + sha512 = "WPApOOnXsiwhZtmkDsxnpye+XLb/tUISP+H6cHjfUIXvlG+eKwP+isnivsxlHCPaO9Q5wvbhloIBkdF3qUn+Nw=="; }; }; - "jest-watcher-26.0.1" = { + "jest-watcher-26.1.0" = { name = "jest-watcher"; packageName = "jest-watcher"; - version = "26.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.0.1.tgz"; - sha512 = "pdZPydsS8475f89kGswaNsN3rhP6lnC3/QDCppP7bg1L9JQz7oU9Mb/5xPETk1RHDCWeqmVC47M4K5RR7ejxFw=="; - }; - }; - "jest-worker-25.2.6" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "25.2.6"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.2.6.tgz"; - sha512 = "FJn9XDUSxcOR4cwDzRfL1z56rUofNTFs539FGASpd50RHdb6EVkhxQqktodW2mI49l+W3H+tFJDotCHUQF6dmA=="; + url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.1.0.tgz"; + sha512 = "ffEOhJl2EvAIki613oPsSG11usqnGUzIiK7MMX6hE4422aXOcVEG3ySCTDFLn1+LZNXGPE8tuJxhp8OBJ1pgzQ=="; }; }; - "jest-worker-26.0.0" = { + "jest-worker-26.1.0" = { name = "jest-worker"; packageName = "jest-worker"; - version = "26.0.0"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz"; - sha512 = "pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.1.0.tgz"; + sha512 = "Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ=="; }; }; "js-tokens-4.0.0" = { @@ -5062,15 +4441,6 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; - "js-yaml-3.13.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; - }; - }; "js-yaml-3.14.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -5089,22 +4459,13 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "jsdom-15.2.1" = { - name = "jsdom"; - packageName = "jsdom"; - version = "15.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz"; - sha512 = "fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g=="; - }; - }; - "jsdom-16.2.2" = { + "jsdom-16.3.0" = { name = "jsdom"; packageName = "jsdom"; - version = "16.2.2"; + version = "16.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-16.2.2.tgz"; - sha512 = "pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg=="; + url = "https://registry.npmjs.org/jsdom/-/jsdom-16.3.0.tgz"; + sha512 = "zggeX5UuEknpdZzv15+MS1dPYG0J/TftiiNunOeNxSl3qr8Z6cIlQpN0IdJa44z9aFxZRIVqRncvEhQ7X5DtZg=="; }; }; "jsesc-0.5.0" = { @@ -5170,15 +4531,6 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json5-2.1.2" = { - name = "json5"; - packageName = "json5"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz"; - sha512 = "MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ=="; - }; - }; "json5-2.1.3" = { name = "json5"; packageName = "json5"; @@ -5197,6 +4549,15 @@ let sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; }; }; + "jsonfile-6.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz"; + sha512 = "jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg=="; + }; + }; "jsprim-1.4.1" = { name = "jsprim"; packageName = "jsprim"; @@ -5314,15 +4675,6 @@ let sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; }; }; - "locate-path-2.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; - sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; - }; - }; "locate-path-5.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -5332,13 +4684,13 @@ let sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; }; - "lodash-4.17.15" = { + "lodash-4.17.19" = { name = "lodash"; packageName = "lodash"; - version = "4.17.15"; + version = "4.17.19"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz"; + sha512 = "JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="; }; }; "lodash.sortby-4.7.0" = { @@ -5359,15 +4711,6 @@ let sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; }; }; - "lolex-5.1.2" = { - name = "lolex"; - packageName = "lolex"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz"; - sha512 = "h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A=="; - }; - }; "loose-envify-1.4.0" = { name = "loose-envify"; packageName = "loose-envify"; @@ -5395,15 +4738,6 @@ let sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; - "make-dir-3.0.2" = { - name = "make-dir"; - packageName = "make-dir"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz"; - sha512 = "rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w=="; - }; - }; "make-dir-3.1.0" = { name = "make-dir"; packageName = "make-dir"; @@ -5440,13 +4774,13 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; - "marked-0.8.0" = { + "marked-1.0.0" = { name = "marked"; packageName = "marked"; - version = "0.8.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.8.0.tgz"; - sha512 = "MyUe+T/Pw4TZufHkzAfDj6HarCBWia2y27/bhuYkTaiUnfDYFnCP3KUN+9oM7Wi6JA2rymtVYbQu3spE0GCmxQ=="; + url = "https://registry.npmjs.org/marked/-/marked-1.0.0.tgz"; + sha512 = "Wo+L1pWTVibfrSr+TTtMuiMfNzmZWiOPeO7rZsQUY5bgsxpHesBEcIWJloWVTFnrMXnf/TL30eTFSGJddmQAng=="; }; }; "merge-stream-2.0.0" = { @@ -5476,15 +4810,6 @@ let sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; }; }; - "mime-db-1.43.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.43.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; - }; - }; "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; @@ -5494,15 +4819,6 @@ let sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-types-2.1.26" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.26"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; - }; - }; "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; @@ -5584,13 +4900,13 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mkdirp-classic-0.5.2" = { + "mkdirp-classic-0.5.3" = { name = "mkdirp-classic"; packageName = "mkdirp-classic"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz"; - sha512 = "ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g=="; + url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; }; "moment-2.27.0" = { @@ -5638,24 +4954,6 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; - "mute-stream-0.0.8" = { - name = "mute-stream"; - packageName = "mute-stream"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"; - sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; - }; - }; - "nan-2.14.0" = { - name = "nan"; - packageName = "nan"; - version = "2.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; - sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; - }; - }; "nan-2.14.1" = { name = "nan"; packageName = "nan"; @@ -5692,13 +4990,13 @@ let sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; }; }; - "neo-async-2.6.1" = { + "neo-async-2.6.2" = { name = "neo-async"; packageName = "neo-async"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"; - sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="; + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; + sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; "next-tick-1.0.0" = { @@ -5719,13 +5017,13 @@ let sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; }; - "node-abi-2.15.0" = { + "node-abi-2.18.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.15.0"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.15.0.tgz"; - sha512 = "FeLpTS0F39U7hHZU1srAK4Vx+5AHNVOTP+hxBNQknR/54laTHSFIJkDWDqiquY1LeLUgTfPN7sLPhMubx0PLAg=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.18.0.tgz"; + sha512 = "yi05ZoiuNNEbyT/xXfSySZE+yVnQW6fxPZuFbLyS1s6b5Kw3HzV2PHOM4XR+nsjzkHxByK+2Wg+yCQbe35l8dw=="; }; }; "node-int64-0.4.0" = { @@ -5746,15 +5044,6 @@ let sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; }; }; - "node-notifier-6.0.0" = { - name = "node-notifier"; - packageName = "node-notifier"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-6.0.0.tgz"; - sha512 = "SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw=="; - }; - }; "node-notifier-7.0.1" = { name = "node-notifier"; packageName = "node-notifier"; @@ -5764,13 +5053,13 @@ let sha512 = "VkzhierE7DBmQEElhTGJIoiZa1oqRijOtgOlsXg32KrJRXsPy0NXFBqWGW/wTswnJlDCs5viRYaqWguqzsKcmg=="; }; }; - "node-releases-1.1.53" = { + "node-releases-1.1.59" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.53"; + version = "1.1.59"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz"; - sha512 = "wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.59.tgz"; + sha512 = "H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw=="; }; }; "noop-logger-0.1.1" = { @@ -5980,15 +5269,6 @@ let sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; }; }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - }; "p-each-series-2.1.0" = { name = "p-each-series"; packageName = "p-each-series"; @@ -6007,33 +5287,6 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-finally-2.0.1" = { - name = "p-finally"; - packageName = "p-finally"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz"; - sha512 = "vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="; - }; - }; - "p-limit-1.3.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; - sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; - }; - }; - "p-limit-2.2.2" = { - name = "p-limit"; - packageName = "p-limit"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz"; - sha512 = "WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ=="; - }; - }; "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -6043,15 +5296,6 @@ let sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; }; - "p-locate-2.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; - sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; - }; - }; "p-locate-4.1.0" = { name = "p-locate"; packageName = "p-locate"; @@ -6061,15 +5305,6 @@ let sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; }; - "p-try-1.0.0" = { - name = "p-try"; - packageName = "p-try"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; - }; - }; "p-try-2.2.0" = { name = "p-try"; packageName = "p-try"; @@ -6097,15 +5332,6 @@ let sha512 = "OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw=="; }; }; - "parse5-5.1.0" = { - name = "parse5"; - packageName = "parse5"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz"; - sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="; - }; - }; "parse5-5.1.1" = { name = "parse5"; packageName = "parse5"; @@ -6133,15 +5359,6 @@ let sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; }; }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; - }; - }; "path-exists-4.0.0" = { name = "path-exists"; packageName = "path-exists"; @@ -6232,24 +5449,6 @@ let sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; }; - "pkg-up-2.0.0" = { - name = "pkg-up"; - packageName = "pkg-up"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz"; - sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; - }; - }; - "pn-1.1.0" = { - name = "pn"; - packageName = "pn"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz"; - sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="; - }; - }; "posix-character-classes-0.1.1" = { name = "posix-character-classes"; packageName = "posix-character-classes"; @@ -6259,13 +5458,13 @@ let sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; }; - "prebuild-install-5.3.3" = { + "prebuild-install-5.3.5" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "5.3.3"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.3.tgz"; - sha512 = "GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.5.tgz"; + sha512 = "YmMO7dph9CYKi5IR/BzjOJlRzpxGGVo1EsLSUZ0mt/Mq0HWZIHOKHHcHdT69yG54C9m6i45GpItwRHpk0Py7Uw=="; }; }; "prelude-ls-1.1.2" = { @@ -6286,31 +5485,22 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "pretty-format-25.2.6" = { + "pretty-format-25.5.0" = { name = "pretty-format"; packageName = "pretty-format"; - version = "25.2.6"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-25.2.6.tgz"; - sha512 = "DEiWxLBaCHneffrIT4B+TpMvkV9RNvvJrd3lY9ew1CEQobDzEXmYT1mg0hJhljZty7kCc10z13ohOFAE8jrUDg=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz"; + sha512 = "kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="; }; }; - "pretty-format-26.0.1" = { + "pretty-format-26.1.0" = { name = "pretty-format"; packageName = "pretty-format"; - version = "26.0.1"; + version = "26.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz"; - sha512 = "SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw=="; - }; - }; - "private-0.1.8" = { - name = "private"; - packageName = "private"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; - sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.1.0.tgz"; + sha512 = "GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg=="; }; }; "process-nextick-args-2.0.1" = { @@ -6457,15 +5647,6 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; - "realpath-native-2.0.0" = { - name = "realpath-native"; - packageName = "realpath-native"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz"; - sha512 = "v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q=="; - }; - }; "rechoir-0.6.2" = { name = "rechoir"; packageName = "rechoir"; @@ -6475,13 +5656,13 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "regenerate-1.4.0" = { + "regenerate-1.4.1" = { name = "regenerate"; packageName = "regenerate"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz"; - sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="; + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz"; + sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="; }; }; "regenerate-unicode-properties-8.2.0" = { @@ -6502,13 +5683,13 @@ let sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; }; }; - "regenerator-transform-0.14.4" = { + "regenerator-transform-0.14.5" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.14.4"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; - sha512 = "EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; + sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw=="; }; }; "regex-not-1.0.2" = { @@ -6520,15 +5701,6 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexpp-2.0.1" = { - name = "regexpp"; - packageName = "regexpp"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz"; - sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="; - }; - }; "regexpp-3.1.0" = { name = "regexpp"; packageName = "regexpp"; @@ -6547,13 +5719,13 @@ let sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ=="; }; }; - "regjsgen-0.5.1" = { + "regjsgen-0.5.2" = { name = "regjsgen"; packageName = "regjsgen"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz"; - sha512 = "5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg=="; + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"; + sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; }; }; "regjsparser-0.6.4" = { @@ -6646,24 +5818,6 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; - "resolve-1.1.7" = { - name = "resolve"; - packageName = "resolve"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; - }; - }; - "resolve-1.15.1" = { - name = "resolve"; - packageName = "resolve"; - version = "1.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; - }; - }; "resolve-1.17.0" = { name = "resolve"; packageName = "resolve"; @@ -6709,15 +5863,6 @@ let sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; }; }; - "restore-cursor-3.1.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; - }; - }; "ret-0.1.15" = { name = "ret"; packageName = "ret"; @@ -6754,33 +5899,6 @@ let sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="; }; }; - "run-async-2.4.0" = { - name = "run-async"; - packageName = "run-async"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz"; - sha512 = "xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg=="; - }; - }; - "run-async-2.4.1" = { - name = "run-async"; - packageName = "run-async"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; - sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; - }; - }; - "rxjs-6.5.5" = { - name = "rxjs"; - packageName = "rxjs"; - version = "6.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz"; - sha512 = "WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ=="; - }; - }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -6826,15 +5944,6 @@ let sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA=="; }; }; - "saxes-3.1.11" = { - name = "saxes"; - packageName = "saxes"; - version = "3.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz"; - sha512 = "Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g=="; - }; - }; "saxes-5.0.1" = { name = "saxes"; packageName = "saxes"; @@ -6880,13 +5989,13 @@ let sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; }; }; - "serialport-8.0.7" = { + "serialport-9.0.0" = { name = "serialport"; packageName = "serialport"; - version = "8.0.7"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-8.0.7.tgz"; - sha512 = "R9bfNebs2dblYf5sD/Aaa7j8+siP4X7TGT02lqHM9DF5fyjlrPGXmsLw9+LKOz1AvjGjkxf2NzBVnDpqRX7clQ=="; + url = "https://registry.npmjs.org/serialport/-/serialport-9.0.0.tgz"; + sha512 = "4kQqIM0XhT6QECyzJtPdSsDWRFt8u3/vscQxb+z4TrAMiPDkDGBTLDaXmCxarXDa1s7EeK1IyxMce9wzWPFzAQ=="; }; }; "set-blocking-2.0.0" = { @@ -6943,13 +6052,13 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; - "shelljs-0.8.3" = { + "shelljs-0.8.4" = { name = "shelljs"; packageName = "shelljs"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz"; - sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A=="; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz"; + sha512 = "7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ=="; }; }; "shellwords-0.1.1" = { @@ -7105,15 +6214,6 @@ let sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; - "source-map-support-0.5.16" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.16"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; - sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; - }; - }; "source-map-support-0.5.19" = { name = "source-map-support"; packageName = "source-map-support"; @@ -7213,15 +6313,6 @@ let sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; - "stack-utils-1.0.2" = { - name = "stack-utils"; - packageName = "stack-utils"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz"; - sha512 = "MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA=="; - }; - }; "stack-utils-2.0.2" = { name = "stack-utils"; packageName = "stack-utils"; @@ -7258,15 +6349,6 @@ let sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; }; }; - "string-length-3.1.0" = { - name = "string-length"; - packageName = "string-length"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-length/-/string-length-3.1.0.tgz"; - sha512 = "Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA=="; - }; - }; "string-length-4.0.1" = { name = "string-length"; packageName = "string-length"; @@ -7384,22 +6466,22 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "strip-json-comments-3.0.1" = { + "strip-json-comments-3.1.0" = { name = "strip-json-comments"; packageName = "strip-json-comments"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz"; - sha512 = "VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="; + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz"; + sha512 = "e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w=="; }; }; - "strip-json-comments-3.1.0" = { + "strip-json-comments-3.1.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz"; - sha512 = "e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w=="; + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; }; "supports-color-5.5.0" = { @@ -7447,22 +6529,22 @@ let sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; - "tar-fs-2.0.1" = { + "tar-fs-2.1.0" = { name = "tar-fs"; packageName = "tar-fs"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz"; - sha512 = "6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA=="; + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz"; + sha512 = "9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg=="; }; }; - "tar-stream-2.1.2" = { + "tar-stream-2.1.3" = { name = "tar-stream"; packageName = "tar-stream"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.2.tgz"; - sha512 = "UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q=="; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz"; + sha512 = "Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA=="; }; }; "terminal-link-2.1.1" = { @@ -7510,15 +6592,6 @@ let sha512 = "fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA=="; }; }; - "through-2.3.8" = { - name = "through"; - packageName = "through"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - }; "through2-2.0.5" = { name = "through2"; packageName = "through2"; @@ -7537,15 +6610,6 @@ let sha512 = "jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA=="; }; }; - "tmp-0.0.33" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.33"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; - sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; - }; - }; "tmpl-1.0.4" = { name = "tmpl"; packageName = "tmpl"; @@ -7627,15 +6691,6 @@ let sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; }; }; - "tr46-1.0.1" = { - name = "tr46"; - packageName = "tr46"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz"; - sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; - }; - }; "tr46-2.0.2" = { name = "tr46"; packageName = "tr46"; @@ -7654,15 +6709,6 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "tslib-1.11.1" = { - name = "tslib"; - packageName = "tslib"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; - sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; - }; - }; "tslib-1.13.0" = { name = "tslib"; packageName = "tslib"; @@ -7789,31 +6835,31 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typedoc-0.17.3" = { + "typedoc-0.17.8" = { name = "typedoc"; packageName = "typedoc"; - version = "0.17.3"; + version = "0.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc/-/typedoc-0.17.3.tgz"; - sha512 = "sCKyLeXMUYHyul0kd/jSGSGY+o7lfLvbNlnp8kAamQSLPp/f4EOOR50JGjwfYEQkEeETWMXILdU4UUXS42MmSQ=="; + url = "https://registry.npmjs.org/typedoc/-/typedoc-0.17.8.tgz"; + sha512 = "/OyrHCJ8jtzu+QZ+771YaxQ9s4g5Z3XsQE3Ma7q+BL392xxBn4UMvvCdVnqKC2T/dz03/VXSLVKOP3lHmDdc/w=="; }; }; - "typedoc-default-themes-0.9.0" = { + "typedoc-default-themes-0.10.2" = { name = "typedoc-default-themes"; packageName = "typedoc-default-themes"; - version = "0.9.0"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.9.0.tgz"; - sha512 = "ExfIAg3EjZvWnnDsv2wQcZ9I8Lnln643LsfV05BrRGcIMSYPuavils96j4yGXiBYUzldIYw3xmZ7rsdqWfDunQ=="; + url = "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.10.2.tgz"; + sha512 = "zo09yRj+xwLFE3hyhJeVHWRSPuKEIAsFK5r2u47KL/HBKqpwdUSanoaz5L34IKiSATFrjG5ywmIu98hPVMfxZg=="; }; }; - "typedoc-plugin-markdown-2.2.17" = { + "typedoc-plugin-markdown-2.3.1" = { name = "typedoc-plugin-markdown"; packageName = "typedoc-plugin-markdown"; - version = "2.2.17"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-2.2.17.tgz"; - sha512 = "eE6cTeqsZIbjur6RG91Lhx1vTwjR49OHwVPRlmsxY3dthS4FNRL8sHxT5Y9pkosBwv1kSmNGQEPHjMYy1Ag6DQ=="; + url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-2.3.1.tgz"; + sha512 = "7rlmg1tLjddYy11uznHCAlyoOpxdWnFXqGEZ7j2mJ4KJg2avwWgEpw6SFZVofgPCGn36zklpFS51lHxYSRTLVQ=="; }; }; "typedoc-plugin-no-inherit-1.1.10" = { @@ -7834,22 +6880,22 @@ let sha512 = "xHq9DzkoQywS7FyPneMm2/Hr9GRoCpjSQXkVN0W6SCJKP7fguqg2tasgh+8l5/mW6YSYvqCqEbkSYLbuD4Y6gA=="; }; }; - "typescript-3.8.3" = { + "typescript-3.9.6" = { name = "typescript"; packageName = "typescript"; - version = "3.8.3"; + version = "3.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz"; - sha512 = "MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.9.6.tgz"; + sha512 = "Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw=="; }; }; - "uglify-js-3.8.1" = { + "uglify-js-3.10.0" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.8.1"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.1.tgz"; - sha512 = "W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz"; + sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; }; }; "ultron-1.1.1" = { @@ -7933,6 +6979,15 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; + "universalify-1.0.0" = { + name = "universalify"; + packageName = "universalify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz"; + sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="; + }; + }; "unix-dgram-2.0.3" = { name = "unix-dgram"; packageName = "unix-dgram"; @@ -8014,22 +7069,13 @@ let sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; }; }; - "v8-compile-cache-2.1.0" = { + "v8-compile-cache-2.1.1" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz"; - sha512 = "usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="; - }; - }; - "v8-to-istanbul-4.1.3" = { - name = "v8-to-istanbul"; - packageName = "v8-to-istanbul"; - version = "4.1.3"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz"; - sha512 = "sAjOC+Kki6aJVbUOXJbcR0MnbfjvBzwKZazEJymA2IX49uoOdEdk+4fBq5cXgYgiyKtAyrrJNtBZdOeDIF+Fng=="; + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz"; + sha512 = "8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ=="; }; }; "v8-to-istanbul-4.1.4" = { @@ -8068,15 +7114,6 @@ let sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ=="; }; }; - "w3c-xmlserializer-1.1.2" = { - name = "w3c-xmlserializer"; - packageName = "w3c-xmlserializer"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz"; - sha512 = "p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg=="; - }; - }; "w3c-xmlserializer-2.0.0" = { name = "w3c-xmlserializer"; packageName = "w3c-xmlserializer"; @@ -8095,15 +7132,6 @@ let sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; }; }; - "webidl-conversions-4.0.2" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; - sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; - }; - }; "webidl-conversions-5.0.0" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -8149,15 +7177,6 @@ let sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; }; }; - "whatwg-url-7.1.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz"; - sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; - }; - }; "whatwg-url-8.1.0" = { name = "whatwg-url"; packageName = "whatwg-url"; @@ -8302,22 +7321,13 @@ let sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; }; }; - "ws-7.2.3" = { + "ws-7.3.1" = { name = "ws"; packageName = "ws"; - version = "7.2.3"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz"; - sha512 = "HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ=="; - }; - }; - "ws-7.3.0" = { - name = "ws"; - packageName = "ws"; - version = "7.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz"; - sha512 = "iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w=="; + url = "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz"; + sha512 = "D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="; }; }; "xml-name-validator-3.0.0" = { @@ -8356,22 +7366,13 @@ let sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; - "yargs-15.3.1" = { + "yargs-15.4.1" = { name = "yargs"; packageName = "yargs"; - version = "15.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz"; - sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA=="; - }; - }; - "yargs-parser-18.1.2" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "18.1.2"; + version = "15.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz"; - sha512 = "hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ=="; + url = "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"; + sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; }; }; "yargs-parser-18.1.3" = { @@ -8383,33 +7384,33 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; - "zigbee-herdsman-0.12.97" = { + "zigbee-herdsman-0.12.108" = { name = "zigbee-herdsman"; packageName = "zigbee-herdsman"; - version = "0.12.97"; + version = "0.12.108"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.97.tgz"; - sha512 = "D60ZmEhy0kf3s7qUym9Ajcra+IsLS7nVMuEHxCO5kPfd2DHOk10diS+3BOKHrO87LJDuOk5fmuj1owKFz32q6A=="; + url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.108.tgz"; + sha512 = "5xPgCYFAu/Q8mibEzB2be/nkkyCjMNKox+sYnaNNbUm0w25YRcI3FWuxE+wl9v7UVopZ8P9Wfou+XGsFbdaWRA=="; }; }; - "zigbee-herdsman-converters-12.0.122" = { + "zigbee-herdsman-converters-12.0.147" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "12.0.122"; + version = "12.0.147"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.122.tgz"; - sha512 = "/glRVGi9NGDA5Lvx00HzitXcSEZgybkCPykBfgHkZlB450la37RUlxT62DicXd1mNg2B4ibug45hTt24REqG9A=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.147.tgz"; + sha512 = "WlNkN5xG+HdS1hZ5jTjR2vFii1OfOqTFUEQ+uZg06L7V1TucHRPlQ4AMY0WUQksnX2uuRqwehA3iuyszZjBAOg=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.14.1"; + version = "1.14.2"; src = ./.; dependencies = [ sources."@dabh/diagnostics-2.0.2" - sources."ajv-6.12.2" + sources."ajv-6.12.3" sources."argparse-1.0.10" sources."async-3.2.0" sources."async-limiter-1.0.1" @@ -8548,115 +7549,112 @@ let sources."wrappy-1.0.2" sources."ws-3.3.3" sources."xtend-4.0.2" - (sources."zigbee-herdsman-0.12.97" // { + (sources."zigbee-herdsman-0.12.108" // { dependencies = [ - sources."@babel/cli-7.8.4" - sources."@babel/code-frame-7.8.3" - sources."@babel/compat-data-7.9.0" - sources."@babel/core-7.9.0" - sources."@babel/generator-7.9.4" - sources."@babel/helper-annotate-as-pure-7.8.3" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - sources."@babel/helper-compilation-targets-7.8.7" - sources."@babel/helper-create-class-features-plugin-7.8.6" - sources."@babel/helper-create-regexp-features-plugin-7.8.8" - sources."@babel/helper-define-map-7.8.3" - sources."@babel/helper-explode-assignable-expression-7.8.3" - sources."@babel/helper-function-name-7.8.3" - sources."@babel/helper-get-function-arity-7.8.3" - sources."@babel/helper-hoist-variables-7.8.3" - sources."@babel/helper-member-expression-to-functions-7.8.3" - sources."@babel/helper-module-imports-7.8.3" - sources."@babel/helper-module-transforms-7.9.0" - sources."@babel/helper-optimise-call-expression-7.8.3" - sources."@babel/helper-plugin-utils-7.8.3" - sources."@babel/helper-regex-7.8.3" - sources."@babel/helper-remap-async-to-generator-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" - sources."@babel/helper-simple-access-7.8.3" - sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" - sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.9.2" - sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" - sources."@babel/plugin-proposal-async-generator-functions-7.8.3" - sources."@babel/plugin-proposal-class-properties-7.8.3" - sources."@babel/plugin-proposal-dynamic-import-7.8.3" - sources."@babel/plugin-proposal-json-strings-7.8.3" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-proposal-numeric-separator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.9.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" - sources."@babel/plugin-proposal-optional-chaining-7.9.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" + sources."@babel/cli-7.10.4" + sources."@babel/code-frame-7.10.4" + sources."@babel/compat-data-7.10.4" + sources."@babel/core-7.10.4" + sources."@babel/generator-7.10.4" + 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" + sources."@babel/helper-create-class-features-plugin-7.10.4" + sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-define-map-7.10.4" + sources."@babel/helper-explode-assignable-expression-7.10.4" + 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.10.4" + sources."@babel/helper-module-imports-7.10.4" + sources."@babel/helper-module-transforms-7.10.4" + sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-plugin-utils-7.10.4" + sources."@babel/helper-regex-7.10.4" + sources."@babel/helper-remap-async-to-generator-7.10.4" + sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helpers-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@babel/parser-7.10.4" + sources."@babel/plugin-proposal-async-generator-functions-7.10.4" + sources."@babel/plugin-proposal-class-properties-7.10.4" + sources."@babel/plugin-proposal-dynamic-import-7.10.4" + sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" + sources."@babel/plugin-proposal-numeric-separator-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.10.4" + sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.10.4" + sources."@babel/plugin-proposal-private-methods-7.10.4" + sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" 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" sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-import-meta-7.10.4" 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.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.8.3" - sources."@babel/plugin-syntax-typescript-7.8.3" - sources."@babel/plugin-transform-arrow-functions-7.8.3" - sources."@babel/plugin-transform-async-to-generator-7.8.3" - sources."@babel/plugin-transform-block-scoped-functions-7.8.3" - sources."@babel/plugin-transform-block-scoping-7.8.3" - sources."@babel/plugin-transform-classes-7.9.2" - sources."@babel/plugin-transform-computed-properties-7.8.3" - sources."@babel/plugin-transform-destructuring-7.8.8" - sources."@babel/plugin-transform-dotall-regex-7.8.3" - sources."@babel/plugin-transform-duplicate-keys-7.8.3" - sources."@babel/plugin-transform-exponentiation-operator-7.8.3" - sources."@babel/plugin-transform-for-of-7.9.0" - sources."@babel/plugin-transform-function-name-7.8.3" - sources."@babel/plugin-transform-literals-7.8.3" - sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.9.0" - sources."@babel/plugin-transform-modules-commonjs-7.9.0" - sources."@babel/plugin-transform-modules-systemjs-7.9.0" - sources."@babel/plugin-transform-modules-umd-7.9.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" - sources."@babel/plugin-transform-new-target-7.8.3" - sources."@babel/plugin-transform-object-super-7.8.3" - sources."@babel/plugin-transform-parameters-7.9.3" - sources."@babel/plugin-transform-property-literals-7.8.3" - sources."@babel/plugin-transform-regenerator-7.8.7" - sources."@babel/plugin-transform-reserved-words-7.8.3" - sources."@babel/plugin-transform-shorthand-properties-7.8.3" - sources."@babel/plugin-transform-spread-7.8.3" - sources."@babel/plugin-transform-sticky-regex-7.8.3" - sources."@babel/plugin-transform-template-literals-7.8.3" - sources."@babel/plugin-transform-typeof-symbol-7.8.4" - sources."@babel/plugin-transform-typescript-7.9.4" - sources."@babel/plugin-transform-unicode-regex-7.8.3" - sources."@babel/preset-env-7.9.0" + sources."@babel/plugin-syntax-top-level-await-7.10.4" + sources."@babel/plugin-syntax-typescript-7.10.4" + sources."@babel/plugin-transform-arrow-functions-7.10.4" + sources."@babel/plugin-transform-async-to-generator-7.10.4" + sources."@babel/plugin-transform-block-scoped-functions-7.10.4" + sources."@babel/plugin-transform-block-scoping-7.10.4" + sources."@babel/plugin-transform-classes-7.10.4" + sources."@babel/plugin-transform-computed-properties-7.10.4" + sources."@babel/plugin-transform-destructuring-7.10.4" + sources."@babel/plugin-transform-dotall-regex-7.10.4" + sources."@babel/plugin-transform-duplicate-keys-7.10.4" + sources."@babel/plugin-transform-exponentiation-operator-7.10.4" + sources."@babel/plugin-transform-for-of-7.10.4" + sources."@babel/plugin-transform-function-name-7.10.4" + sources."@babel/plugin-transform-literals-7.10.4" + sources."@babel/plugin-transform-member-expression-literals-7.10.4" + sources."@babel/plugin-transform-modules-amd-7.10.4" + sources."@babel/plugin-transform-modules-commonjs-7.10.4" + sources."@babel/plugin-transform-modules-systemjs-7.10.4" + sources."@babel/plugin-transform-modules-umd-7.10.4" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" + sources."@babel/plugin-transform-new-target-7.10.4" + sources."@babel/plugin-transform-object-super-7.10.4" + sources."@babel/plugin-transform-parameters-7.10.4" + sources."@babel/plugin-transform-property-literals-7.10.4" + sources."@babel/plugin-transform-regenerator-7.10.4" + sources."@babel/plugin-transform-reserved-words-7.10.4" + sources."@babel/plugin-transform-shorthand-properties-7.10.4" + sources."@babel/plugin-transform-spread-7.10.4" + sources."@babel/plugin-transform-sticky-regex-7.10.4" + sources."@babel/plugin-transform-template-literals-7.10.4" + sources."@babel/plugin-transform-typeof-symbol-7.10.4" + sources."@babel/plugin-transform-typescript-7.10.4" + sources."@babel/plugin-transform-unicode-escapes-7.10.4" + sources."@babel/plugin-transform-unicode-regex-7.10.4" + sources."@babel/preset-env-7.10.4" sources."@babel/preset-modules-0.1.3" - sources."@babel/preset-typescript-7.9.0" - sources."@babel/runtime-7.9.2" - sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.0" - sources."@babel/types-7.9.0" + sources."@babel/preset-typescript-7.10.4" + sources."@babel/runtime-7.10.4" + sources."@babel/template-7.10.4" + sources."@babel/traverse-7.10.4" + sources."@babel/types-7.10.4" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" - (sources."@istanbuljs/load-nyc-config-1.0.0" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-limit-2.2.2" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" - ]; - }) + sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.2" - (sources."@jest/console-25.2.6" // { + (sources."@jest/console-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -8664,12 +7662,13 @@ let sources."supports-color-7.1.0" ]; }) - (sources."@jest/core-25.2.7" // { + (sources."@jest/core-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."fill-range-7.0.1" @@ -8683,12 +7682,44 @@ let sources."to-regex-range-5.0.1" ]; }) - sources."@jest/environment-25.2.6" - sources."@jest/fake-timers-25.2.6" - (sources."@jest/reporters-25.2.6" // { + (sources."@jest/environment-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.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.1.0" + ]; + }) + (sources."@jest/fake-timers-26.1.0" // { + dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-styles-4.2.1" + 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.1.0" + ]; + }) + (sources."@jest/globals-26.1.0" // { + dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-styles-4.2.1" + 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.1.0" + ]; + }) + (sources."@jest/reporters-26.1.0" // { + dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -8697,18 +7728,29 @@ let sources."supports-color-7.1.0" ]; }) - (sources."@jest/source-map-25.2.6" // { + (sources."@jest/source-map-26.1.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@jest/test-result-25.2.6" - sources."@jest/test-sequencer-25.2.7" - (sources."@jest/transform-25.2.6" // { + (sources."@jest/test-result-26.1.0" // { + dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-styles-4.2.1" + 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.1.0" + ]; + }) + sources."@jest/test-sequencer-26.1.0" + (sources."@jest/transform-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."fill-range-7.0.1" @@ -8721,7 +7763,7 @@ let sources."to-regex-range-5.0.1" ]; }) - (sources."@jest/types-25.2.6" // { + (sources."@jest/types-25.5.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-3.0.0" @@ -8731,58 +7773,60 @@ let sources."supports-color-7.1.0" ]; }) - sources."@serialport/binding-abstract-8.0.6" - sources."@serialport/binding-mock-8.0.6" - sources."@serialport/bindings-8.0.7" - sources."@serialport/parser-byte-length-8.0.6" - sources."@serialport/parser-cctalk-8.0.6" - sources."@serialport/parser-delimiter-8.0.6" - sources."@serialport/parser-readline-8.0.6" - sources."@serialport/parser-ready-8.0.6" - sources."@serialport/parser-regex-8.0.6" - sources."@serialport/stream-8.0.6" - sources."@sinonjs/commons-1.7.1" - sources."@types/babel__core-7.1.7" + sources."@serialport/binding-abstract-9.0.0" + sources."@serialport/binding-mock-9.0.0" + sources."@serialport/bindings-9.0.0" + sources."@serialport/parser-byte-length-9.0.0" + sources."@serialport/parser-cctalk-9.0.0" + sources."@serialport/parser-delimiter-9.0.0" + sources."@serialport/parser-readline-9.0.0" + sources."@serialport/parser-ready-9.0.0" + sources."@serialport/parser-regex-9.0.0" + sources."@serialport/stream-9.0.0" + sources."@sinonjs/commons-1.8.0" + 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.9" + sources."@types/babel__traverse-7.0.13" sources."@types/color-name-1.1.1" sources."@types/debug-4.1.5" sources."@types/eslint-visitor-keys-1.0.0" - sources."@types/istanbul-lib-coverage-2.0.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-1.1.1" - sources."@types/jest-25.2.1" - sources."@types/json-schema-7.0.4" - sources."@types/nedb-1.8.9" - sources."@types/node-13.11.0" - sources."@types/prettier-1.19.1" - sources."@types/serialport-8.0.0" + sources."@types/istanbul-reports-1.1.2" + sources."@types/jest-26.0.4" + sources."@types/json-schema-7.0.5" + sources."@types/nedb-1.8.10" + sources."@types/node-14.0.22" + sources."@types/normalize-package-data-2.4.0" + sources."@types/prettier-2.0.2" + sources."@types/serialport-8.0.1" sources."@types/stack-utils-1.0.1" - sources."@types/yargs-15.0.4" + sources."@types/yargs-15.0.5" sources."@types/yargs-parser-15.0.0" - sources."@typescript-eslint/eslint-plugin-2.26.0" - sources."@typescript-eslint/experimental-utils-2.26.0" - sources."@typescript-eslint/parser-2.26.0" - (sources."@typescript-eslint/typescript-estree-2.26.0" // { + (sources."@typescript-eslint/eslint-plugin-3.6.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-7.3.2" ]; }) - sources."abab-2.0.3" - sources."acorn-7.1.1" - (sources."acorn-globals-4.3.4" // { + sources."@typescript-eslint/experimental-utils-3.6.0" + sources."@typescript-eslint/parser-3.6.0" + sources."@typescript-eslint/types-3.6.0" + (sources."@typescript-eslint/typescript-estree-3.6.0" // { dependencies = [ - sources."acorn-6.4.1" + sources."semver-7.3.2" ]; }) + sources."@typescript-eslint/visitor-keys-3.6.0" + sources."abab-2.0.3" + sources."acorn-7.3.1" + sources."acorn-globals-6.0.0" sources."acorn-jsx-5.2.0" - sources."acorn-walk-6.2.0" - (sources."ajv-6.12.0" // { - dependencies = [ - sources."fast-deep-equal-3.1.1" - ]; - }) + sources."acorn-walk-7.2.0" + sources."ajv-6.12.3" + sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -8801,7 +7845,6 @@ let sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-equal-1.0.0" sources."array-unique-0.3.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -8809,13 +7852,15 @@ let sources."astral-regex-1.0.0" sources."async-each-1.0.3" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" - (sources."babel-jest-25.2.6" // { + sources."aws4-1.10.0" + (sources."babel-jest-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -8823,10 +7868,11 @@ let sources."supports-color-7.1.0" ]; }) - sources."babel-plugin-dynamic-import-node-2.3.0" + sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-25.2.6" - sources."babel-preset-jest-25.2.6" + sources."babel-plugin-jest-hoist-26.1.0" + sources."babel-preset-current-node-syntax-0.1.3" + sources."babel-preset-jest-26.1.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -8854,23 +7900,18 @@ let ]; }) sources."browser-process-hrtime-1.0.0" - (sources."browser-resolve-1.11.3" // { - dependencies = [ - sources."resolve-1.1.7" - ]; - }) - sources."browserslist-4.11.1" + sources."browserslist-4.13.0" sources."bser-2.1.1" - sources."buffer-5.5.0" + 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.30001039" + sources."caniuse-lite-1.0.30001099" sources."capture-exit-2.0.0" sources."caseless-0.12.0" sources."chalk-2.4.2" - sources."chardet-0.7.0" + sources."char-regex-1.0.2" sources."chokidar-2.1.8" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -8879,11 +7920,10 @@ let sources."define-property-0.2.5" ]; }) - sources."cli-cursor-3.1.0" - sources."cli-width-2.2.0" (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" @@ -8902,7 +7942,7 @@ let sources."console-control-strings-1.1.0" sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.6.4" // { + (sources."core-js-compat-3.6.5" // { dependencies = [ sources."semver-7.0.0" ]; @@ -8914,15 +7954,16 @@ let ]; }) sources."cssom-0.4.4" - (sources."cssstyle-2.2.0" // { + (sources."cssstyle-2.3.0" // { dependencies = [ sources."cssom-0.3.8" ]; }) sources."dashdash-1.14.1" - sources."data-urls-1.1.0" + sources."data-urls-2.0.0" sources."debug-4.1.1" sources."decamelize-1.2.0" + sources."decimal.js-10.2.0" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" @@ -8942,37 +7983,56 @@ let sources."detect-newline-3.1.0" sources."diff-sequences-25.2.6" sources."doctrine-3.0.0" - sources."domexception-1.0.1" + (sources."domexception-2.0.1" // { + dependencies = [ + sources."webidl-conversions-5.0.0" + ]; + }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.397" - sources."emoji-regex-8.0.0" + sources."electron-to-chromium-1.3.496" + 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.1" sources."escape-string-regexp-1.0.5" - (sources."escodegen-1.14.1" // { + (sources."escodegen-1.14.3" // { dependencies = [ + sources."levn-0.3.0" + sources."optionator-0.8.3" + sources."prelude-ls-1.1.2" sources."source-map-0.6.1" + sources."type-check-0.3.2" ]; }) - (sources."eslint-6.8.0" // { + (sources."eslint-7.4.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."eslint-utils-1.4.3" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.3" sources."glob-parent-5.1.1" sources."globals-12.4.0" - sources."regexpp-2.0.1" - sources."semver-6.3.0" - sources."strip-ansi-5.2.0" - sources."strip-json-comments-3.0.1" + sources."has-flag-4.0.0" + sources."path-key-3.1.1" + sources."semver-7.3.2" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."strip-ansi-6.0.0" + sources."strip-json-comments-3.1.0" + sources."supports-color-7.1.0" ]; }) - sources."eslint-scope-5.0.0" - sources."eslint-utils-2.0.0" - sources."eslint-visitor-keys-1.1.0" - sources."espree-6.2.1" + sources."eslint-scope-5.1.0" + sources."eslint-utils-2.1.0" + sources."eslint-visitor-keys-1.3.0" + sources."espree-7.1.0" sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -8990,11 +8050,16 @@ let ]; }) sources."expand-template-2.0.3" - (sources."expect-25.2.7" // { + (sources."expect-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."jest-get-type-26.0.0" + sources."supports-color-7.1.0" ]; }) sources."extend-3.0.2" @@ -9003,7 +8068,6 @@ let sources."is-extendable-1.0.1" ]; }) - sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -9014,11 +8078,10 @@ let ]; }) sources."extsprintf-1.3.0" - sources."fast-deep-equal-2.0.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fb-watchman-2.0.1" - sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { @@ -9026,7 +8089,7 @@ let sources."extend-shallow-2.0.1" ]; }) - sources."find-up-2.1.0" + sources."find-up-4.1.0" sources."flat-cache-2.0.1" sources."flatted-2.0.2" sources."for-in-1.0.2" @@ -9037,12 +8100,13 @@ let sources."fs-extra-8.1.0" sources."fs-readdir-recursive-1.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.12" + sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."gauge-2.7.4" sources."gensync-1.0.0-beta.1" sources."get-caller-file-2.0.5" + sources."get-package-type-0.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -9054,7 +8118,7 @@ let ]; }) sources."globals-11.12.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."growly-1.3.0" (sources."handlebars-4.7.6" // { dependencies = [ @@ -9072,8 +8136,9 @@ let sources."kind-of-4.0.0" ]; }) - sources."highlight.js-9.18.1" - sources."html-encoding-sniffer-1.0.2" + sources."highlight.js-10.1.1" + sources."hosted-git-info-2.8.8" + sources."html-encoding-sniffer-2.0.1" sources."html-escaper-2.0.2" sources."http-signature-1.2.0" sources."human-signals-1.1.1" @@ -9090,21 +8155,7 @@ let sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-7.1.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" - ]; - }) - sources."interpret-1.2.0" + sources."interpret-1.4.0" sources."invariant-2.2.4" sources."ip-regex-2.1.0" (sources."is-accessor-descriptor-0.1.6" // { @@ -9112,6 +8163,7 @@ let sources."kind-of-3.2.2" ]; }) + sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" @@ -9125,6 +8177,7 @@ let sources."kind-of-5.1.0" ]; }) + sources."is-docker-2.0.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -9136,17 +8189,17 @@ let ]; }) sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" + sources."is-potential-custom-element-name-1.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" sources."istanbul-lib-coverage-3.0.0" - (sources."istanbul-lib-instrument-4.0.1" // { + (sources."istanbul-lib-instrument-4.0.3" // { dependencies = [ sources."semver-6.3.0" ]; @@ -9154,7 +8207,7 @@ let (sources."istanbul-lib-report-3.0.0" // { dependencies = [ sources."has-flag-4.0.0" - sources."make-dir-3.0.2" + sources."make-dir-3.1.0" sources."semver-6.3.0" sources."supports-color-7.1.0" ]; @@ -9165,46 +8218,57 @@ let ]; }) sources."istanbul-reports-3.0.2" - (sources."jest-25.2.7" // { + (sources."jest-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.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."jest-cli-25.2.7" + sources."jest-cli-26.1.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-changed-files-25.2.6" // { + (sources."jest-changed-files-26.1.0" // { dependencies = [ - sources."cross-spawn-7.0.2" - sources."execa-3.4.0" + sources."@jest/types-26.1.0" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.3" + sources."execa-4.0.3" sources."get-stream-5.1.0" + sources."has-flag-4.0.0" sources."is-stream-2.0.0" sources."npm-run-path-4.0.1" - sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."supports-color-7.1.0" ]; }) - (sources."jest-config-25.2.7" // { + (sources."jest-config-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."fill-range-7.0.1" sources."has-flag-4.0.0" sources."is-number-7.0.0" + sources."jest-get-type-26.0.0" sources."micromatch-4.0.2" + sources."pretty-format-26.1.0" sources."supports-color-7.1.0" sources."to-regex-range-5.0.1" ]; }) - (sources."jest-diff-25.2.6" // { + (sources."jest-diff-25.5.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-3.0.0" @@ -9214,61 +8278,111 @@ let sources."supports-color-7.1.0" ]; }) - sources."jest-docblock-25.2.6" - (sources."jest-each-25.2.6" // { + sources."jest-docblock-26.0.0" + (sources."jest-each-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.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."jest-get-type-26.0.0" + sources."pretty-format-26.1.0" sources."supports-color-7.1.0" ]; }) - sources."jest-environment-jsdom-25.2.6" - (sources."jest-environment-node-25.2.6" // { + (sources."jest-environment-jsdom-26.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."@jest/types-26.1.0" + sources."ansi-styles-4.2.1" + 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.1.0" + ]; + }) + (sources."jest-environment-node-26.1.0" // { + dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-styles-4.2.1" + 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.1.0" ]; }) sources."jest-get-type-25.2.6" - (sources."jest-haste-map-25.2.6" // { + (sources."jest-haste-map-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."braces-3.0.2" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."fill-range-7.0.1" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" + sources."has-flag-4.0.0" sources."is-number-7.0.0" sources."micromatch-4.0.2" + sources."supports-color-7.1.0" sources."to-regex-range-5.0.1" ]; }) - (sources."jest-jasmine2-25.2.7" // { + (sources."jest-jasmine2-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.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."pretty-format-26.1.0" sources."supports-color-7.1.0" ]; }) - sources."jest-leak-detector-25.2.6" - (sources."jest-matcher-utils-25.2.7" // { + (sources."jest-leak-detector-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.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."jest-get-type-26.0.0" + sources."pretty-format-26.1.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-message-util-25.2.6" // { + (sources."jest-matcher-utils-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."diff-sequences-26.0.0" + sources."has-flag-4.0.0" + sources."jest-diff-26.1.0" + sources."jest-get-type-26.0.0" + sources."pretty-format-26.1.0" + sources."supports-color-7.1.0" + ]; + }) + (sources."jest-message-util-26.1.0" // { + dependencies = [ + sources."@jest/types-26.1.0" sources."ansi-styles-4.2.1" sources."braces-3.0.2" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."fill-range-7.0.1" @@ -9280,34 +8394,58 @@ let sources."to-regex-range-5.0.1" ]; }) - sources."jest-mock-25.2.6" - sources."jest-pnp-resolver-1.2.1" - sources."jest-regex-util-25.2.6" - (sources."jest-resolve-25.2.6" // { + (sources."jest-mock-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.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.1.0" ]; }) - sources."jest-resolve-dependencies-25.2.7" - (sources."jest-runner-25.2.7" // { + sources."jest-pnp-resolver-1.2.2" + sources."jest-regex-util-26.0.0" + (sources."jest-resolve-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.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."slash-3.0.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-runtime-25.2.7" // { + (sources."jest-resolve-dependencies-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.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.1.0" + ]; + }) + (sources."jest-runner-26.1.0" // { + dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-styles-4.2.1" + 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.1.0" + ]; + }) + (sources."jest-runtime-26.1.0" // { + dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -9315,115 +8453,130 @@ let sources."supports-color-7.1.0" ]; }) - sources."jest-serializer-25.2.6" - (sources."jest-snapshot-25.2.7" // { + sources."jest-serializer-26.1.0" + (sources."jest-snapshot-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."diff-sequences-26.0.0" sources."has-flag-4.0.0" - sources."make-dir-3.0.2" - sources."semver-6.3.0" + sources."jest-diff-26.1.0" + sources."jest-get-type-26.0.0" + sources."pretty-format-26.1.0" + sources."semver-7.3.2" sources."supports-color-7.1.0" ]; }) - (sources."jest-util-25.2.6" // { + (sources."jest-util-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."braces-3.0.2" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."fill-range-7.0.1" sources."has-flag-4.0.0" - sources."make-dir-3.0.2" - sources."semver-6.3.0" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" sources."supports-color-7.1.0" + sources."to-regex-range-5.0.1" ]; }) - (sources."jest-validate-25.2.6" // { + (sources."jest-validate-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."camelcase-6.0.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."jest-get-type-26.0.0" + sources."pretty-format-26.1.0" sources."supports-color-7.1.0" ]; }) - (sources."jest-watcher-25.2.7" // { + (sources."jest-watcher-26.1.0" // { dependencies = [ + sources."@jest/types-26.1.0" sources."ansi-styles-4.2.1" - sources."chalk-3.0.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.1.0" ]; }) - (sources."jest-worker-25.2.6" // { + (sources."jest-worker-26.1.0" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.1.0" ]; }) sources."js-tokens-4.0.0" - sources."js-yaml-3.13.1" + sources."js-yaml-3.14.0" sources."jsbn-0.1.1" - sources."jsdom-15.2.1" + sources."jsdom-16.3.0" sources."jsesc-2.5.2" + sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.1.2" + sources."json5-2.1.3" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."kind-of-6.0.3" sources."kleur-3.0.3" sources."leven-3.1.0" sources."levenary-1.1.1" - sources."levn-0.3.0" - sources."locate-path-2.0.0" - sources."lodash-4.17.15" + sources."levn-0.4.1" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" + sources."lodash-4.17.19" sources."lodash.sortby-4.7.0" - sources."lolex-5.1.2" sources."loose-envify-1.4.0" sources."lunr-2.3.8" sources."make-dir-2.1.0" sources."makeerror-1.0.11" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."marked-0.8.0" + sources."marked-1.0.0" sources."merge-stream-2.0.0" sources."micromatch-3.1.10" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + 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-2.0.1" sources."mkdirp-0.5.5" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" - sources."mute-stream-0.0.8" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" - sources."neo-async-2.6.1" + sources."neo-async-2.6.2" sources."nice-try-1.0.5" - sources."node-abi-2.15.0" + sources."node-abi-2.18.0" sources."node-int64-0.4.0" sources."node-modules-regexp-1.0.0" - (sources."node-notifier-6.0.0" // { + (sources."node-notifier-7.0.1" // { dependencies = [ - sources."semver-6.3.0" - sources."which-1.3.1" + sources."semver-7.3.2" ]; }) - sources."node-releases-1.1.53" + sources."node-releases-1.1.59" sources."noop-logger-0.1.1" + sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" sources."npmlog-4.1.2" @@ -9443,18 +8596,18 @@ let sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-5.1.0" - sources."optionator-0.8.3" - sources."os-tmpdir-1.0.2" + sources."optionator-0.9.1" sources."p-each-series-2.1.0" sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" sources."parent-module-1.0.1" - sources."parse5-5.1.0" + sources."parse-json-5.0.0" + sources."parse5-5.1.1" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" @@ -9462,22 +8615,11 @@ let sources."picomatch-2.2.2" sources."pify-4.0.1" sources."pirates-4.0.1" - (sources."pkg-dir-4.2.0" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-limit-2.2.2" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" - ]; - }) - sources."pkg-up-2.0.0" - sources."pn-1.1.0" + sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" - sources."prebuild-install-5.3.3" - sources."prelude-ls-1.1.2" - (sources."pretty-format-25.2.6" // { + sources."prebuild-install-5.3.5" + sources."prelude-ls-1.2.1" + (sources."pretty-format-25.5.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -9485,7 +8627,6 @@ let sources."color-name-1.1.4" ]; }) - sources."private-0.1.8" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."prompts-2.3.2" @@ -9495,18 +8636,23 @@ let sources."qs-6.5.2" sources."rc-1.2.8" sources."react-is-16.13.1" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + sources."read-pkg-up-7.0.1" sources."readable-stream-2.3.7" sources."readdirp-2.2.1" - sources."realpath-native-2.0.0" sources."rechoir-0.6.2" - sources."regenerate-1.4.0" + sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.5" - sources."regenerator-transform-0.14.4" + sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexpp-3.1.0" sources."regexpu-core-4.7.0" - sources."regjsgen-0.5.1" + sources."regjsgen-0.5.2" (sources."regjsparser-0.6.4" // { dependencies = [ sources."jsesc-0.5.0" @@ -9518,6 +8664,7 @@ let (sources."request-2.88.2" // { dependencies = [ sources."tough-cookie-2.5.0" + sources."uuid-3.4.0" ]; }) sources."request-promise-core-1.1.3" @@ -9528,23 +8675,20 @@ let }) sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" - sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."rimraf-2.6.3" sources."rsvp-4.8.5" - sources."run-async-2.4.0" - sources."rxjs-6.5.5" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sane-4.1.0" - sources."saxes-3.1.11" + sources."saxes-5.0.1" sources."semver-5.7.1" - sources."serialport-8.0.7" + sources."serialport-9.0.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -9553,7 +8697,7 @@ let }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shelljs-0.8.3" + sources."shelljs-0.8.4" sources."shellwords-0.1.1" sources."signal-exit-3.0.3" sources."simple-concat-1.0.0" @@ -9589,26 +8733,34 @@ let }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.16" // { + (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.5" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" - sources."stack-utils-1.0.2" + (sources."stack-utils-2.0.2" // { + dependencies = [ + sources."escape-string-regexp-2.0.0" + ]; + }) (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" ]; }) sources."stealthy-require-1.1.1" - (sources."string-length-3.1.0" // { + (sources."string-length-4.0.1" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."strip-ansi-6.0.0" ]; }) sources."string-width-1.0.2" @@ -9629,14 +8781,13 @@ let (sources."table-5.4.6" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) - sources."tar-fs-2.0.1" - (sources."tar-stream-2.1.2" // { + sources."tar-fs-2.1.0" + (sources."tar-stream-2.1.3" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -9645,8 +8796,6 @@ let sources."test-exclude-6.0.0" sources."text-table-0.2.0" sources."throat-5.0.0" - sources."through-2.3.8" - sources."tmp-0.0.33" sources."tmpl-1.0.4" sources."to-fast-properties-2.0.0" (sources."to-object-path-0.3.0" // { @@ -9657,27 +8806,28 @@ let sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."tough-cookie-3.0.1" - sources."tr46-1.0.1" - sources."tslib-1.11.1" + sources."tr46-2.0.2" + sources."tslib-1.13.0" sources."tsutils-3.17.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" + sources."type-check-0.4.0" sources."type-detect-4.0.8" sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" - sources."typedoc-0.17.3" - sources."typedoc-default-themes-0.9.0" - sources."typedoc-plugin-markdown-2.2.17" - sources."typedoc-plugin-no-inherit-1.1.10" - sources."typedoc-plugin-sourcefile-url-1.0.6" - sources."typescript-3.8.3" - (sources."uglify-js-3.8.1" // { + sources."typedoc-0.17.8" + sources."typedoc-default-themes-0.10.2" + (sources."typedoc-plugin-markdown-2.3.1" // { dependencies = [ - sources."commander-2.20.3" - sources."source-map-0.6.1" + sources."fs-extra-9.0.1" + sources."jsonfile-6.0.1" + sources."universalify-1.0.0" ]; }) + sources."typedoc-plugin-no-inherit-1.1.10" + sources."typedoc-plugin-sourcefile-url-1.0.6" + sources."typescript-3.9.6" + sources."uglify-js-3.10.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" @@ -9699,21 +8849,26 @@ let sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."v8-compile-cache-2.1.0" - (sources."v8-to-istanbul-4.1.3" // { + sources."uuid-7.0.3" + sources."v8-compile-cache-2.1.1" + (sources."v8-to-istanbul-4.1.4" // { dependencies = [ sources."source-map-0.7.3" ]; }) + sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-1.1.2" + sources."w3c-xmlserializer-2.0.0" sources."walker-1.0.7" - sources."webidl-conversions-4.0.2" + sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-7.1.0" + (sources."whatwg-url-8.1.0" // { + dependencies = [ + sources."webidl-conversions-5.0.0" + ]; + }) sources."which-2.0.2" sources."which-module-2.0.0" sources."which-pm-runs-1.0.0" @@ -9726,6 +8881,7 @@ let sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" @@ -9734,31 +8890,26 @@ let sources."wrappy-1.0.2" sources."write-1.0.3" sources."write-file-atomic-3.0.3" - sources."ws-7.2.3" + sources."ws-7.3.1" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-4.0.0" - (sources."yargs-15.3.1" // { + (sources."yargs-15.4.1" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."find-up-4.1.0" + sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."locate-path-5.0.0" - sources."p-limit-2.2.2" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" ]; }) - sources."yargs-parser-18.1.2" + sources."yargs-parser-18.1.3" ]; }) - (sources."zigbee-herdsman-converters-12.0.122" // { + (sources."zigbee-herdsman-converters-12.0.147" // { dependencies = [ - sources."@babel/code-frame-7.8.3" - (sources."@babel/core-7.9.6" // { + sources."@babel/code-frame-7.10.4" + (sources."@babel/core-7.10.5" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -9766,48 +8917,49 @@ let sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.9.6" // { + (sources."@babel/generator-7.10.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-function-name-7.9.5" - sources."@babel/helper-get-function-arity-7.8.3" - sources."@babel/helper-member-expression-to-functions-7.8.3" - sources."@babel/helper-module-imports-7.8.3" - sources."@babel/helper-module-transforms-7.9.0" - sources."@babel/helper-optimise-call-expression-7.8.3" - sources."@babel/helper-plugin-utils-7.8.3" - sources."@babel/helper-replace-supers-7.9.6" - sources."@babel/helper-simple-access-7.8.3" - sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helper-validator-identifier-7.9.5" - sources."@babel/helpers-7.9.6" - (sources."@babel/highlight-7.9.0" // { + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.10.5" + sources."@babel/helper-module-imports-7.10.4" + sources."@babel/helper-module-transforms-7.10.5" + sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-plugin-utils-7.10.4" + sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helpers-7.10.4" + (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.9.6" + sources."@babel/parser-7.10.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.8.3" + sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-logical-assignment-operators-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.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/template-7.8.6" - (sources."@babel/traverse-7.9.6" // { + sources."@babel/template-7.10.4" + (sources."@babel/traverse-7.10.5" // { dependencies = [ sources."debug-4.1.1" sources."globals-11.12.0" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.9.6" + sources."@babel/types-7.10.5" sources."@bcoe/v8-coverage-0.2.3" sources."@cnakazawa/watch-1.0.4" (sources."@istanbuljs/load-nyc-config-1.1.0" // { @@ -9816,36 +8968,36 @@ let ]; }) sources."@istanbuljs/schema-0.1.2" - sources."@jest/console-26.0.1" - (sources."@jest/core-26.0.1" // { + sources."@jest/console-26.1.0" + (sources."@jest/core-26.1.0" // { dependencies = [ sources."rimraf-3.0.2" ]; }) - sources."@jest/environment-26.0.1" - sources."@jest/fake-timers-26.0.1" - sources."@jest/globals-26.0.1" - sources."@jest/reporters-26.0.1" - sources."@jest/source-map-26.0.0" - sources."@jest/test-result-26.0.1" - sources."@jest/test-sequencer-26.0.1" - sources."@jest/transform-26.0.1" - sources."@jest/types-26.0.1" - sources."@sinonjs/commons-1.8.0" + sources."@jest/environment-26.1.0" + sources."@jest/fake-timers-26.1.0" + sources."@jest/globals-26.1.0" + sources."@jest/reporters-26.1.0" + sources."@jest/source-map-26.1.0" + sources."@jest/test-result-26.1.0" + sources."@jest/test-sequencer-26.1.0" + sources."@jest/transform-26.1.0" + sources."@jest/types-26.1.0" + sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" - sources."@types/babel__core-7.1.7" + 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.11" + sources."@types/babel__traverse-7.0.13" sources."@types/color-name-1.1.1" sources."@types/graceful-fs-4.1.3" - sources."@types/istanbul-lib-coverage-2.0.2" + 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/json-schema-7.0.4" - sources."@types/node-14.0.5" + sources."@types/json-schema-7.0.5" + sources."@types/node-14.0.23" sources."@types/normalize-package-data-2.4.0" - sources."@types/prettier-2.0.1" + sources."@types/prettier-2.0.2" sources."@types/stack-utils-1.0.1" sources."@types/yargs-15.0.5" sources."@types/yargs-parser-15.0.0" @@ -9857,17 +9009,18 @@ let ]; }) sources."abab-2.0.3" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-globals-6.0.0" sources."acorn-jsx-5.2.0" - sources."acorn-walk-7.1.1" - (sources."agent-base-6.0.0" // { + sources."acorn-walk-7.2.0" + (sources."agent-base-6.0.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - sources."ajv-6.12.2" + sources."ajv-6.12.3" + sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -9890,11 +9043,11 @@ let sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."axios-0.19.2" - sources."babel-jest-26.0.1" + sources."babel-jest-26.1.0" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-26.0.0" - sources."babel-preset-current-node-syntax-0.1.2" - sources."babel-preset-jest-26.0.0" + sources."babel-plugin-jest-hoist-26.1.0" + sources."babel-preset-current-node-syntax-0.1.3" + sources."babel-preset-jest-26.1.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -9918,7 +9071,7 @@ let sources."camelcase-5.3.1" sources."capture-exit-2.0.0" sources."caseless-0.12.0" - (sources."chalk-4.0.0" // { + (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" @@ -9928,16 +9081,19 @@ let ]; }) sources."char-regex-1.0.2" - sources."chardet-0.7.0" sources."ci-info-2.0.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" ]; }) - sources."cli-cursor-3.1.0" - sources."cli-width-2.2.1" - sources."cliui-6.0.0" + (sources."cliui-6.0.0" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + ]; + }) sources."co-4.6.0" sources."collect-v8-coverage-1.0.1" sources."collection-visit-1.0.0" @@ -9953,7 +9109,7 @@ let }) sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."cross-spawn-7.0.2" + sources."cross-spawn-7.0.3" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { dependencies = [ @@ -9985,11 +9141,12 @@ let ]; }) sources."ecc-jsbn-0.1.2" - sources."emoji-regex-8.0.0" + 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."escape-string-regexp-1.0.5" - (sources."escodegen-1.14.1" // { + (sources."escodegen-1.14.3" // { dependencies = [ sources."levn-0.3.0" sources."optionator-0.8.3" @@ -9997,18 +9154,18 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-7.1.0" // { + (sources."eslint-7.5.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-23.13.1" - sources."eslint-scope-5.0.0" - sources."eslint-utils-2.0.0" - sources."eslint-visitor-keys-1.1.0" - sources."espree-7.0.0" + sources."eslint-plugin-jest-23.18.0" + sources."eslint-scope-5.1.0" + sources."eslint-utils-2.1.0" + sources."eslint-visitor-keys-1.3.0" + sources."espree-7.2.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ @@ -10037,7 +9194,7 @@ let sources."extend-shallow-2.0.1" ]; }) - (sources."expect-26.0.1" // { + (sources."expect-26.1.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" @@ -10050,7 +9207,6 @@ let sources."is-extendable-1.0.1" ]; }) - sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -10061,11 +9217,10 @@ let ]; }) sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fb-watchman-2.0.1" - sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -10124,16 +9279,6 @@ let sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.1.0" // { - dependencies = [ - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.1.0" - ]; - }) sources."ip-regex-2.1.0" (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ @@ -10156,7 +9301,7 @@ let sources."is-docker-2.0.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-generator-fn-2.1.0" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -10189,48 +9334,48 @@ let ]; }) sources."istanbul-reports-3.0.2" - (sources."jest-26.0.1" // { + (sources."jest-26.1.0" // { dependencies = [ - sources."jest-cli-26.0.1" + sources."jest-cli-26.1.0" ]; }) - (sources."jest-changed-files-26.0.1" // { + (sources."jest-changed-files-26.1.0" // { dependencies = [ - sources."execa-4.0.2" + sources."execa-4.0.3" sources."get-stream-5.1.0" sources."is-stream-2.0.0" sources."npm-run-path-4.0.1" ]; }) - sources."jest-config-26.0.1" - sources."jest-diff-26.0.1" + sources."jest-config-26.1.0" + sources."jest-diff-26.1.0" sources."jest-docblock-26.0.0" - sources."jest-each-26.0.1" - sources."jest-environment-jsdom-26.0.1" - sources."jest-environment-node-26.0.1" + sources."jest-each-26.1.0" + sources."jest-environment-jsdom-26.1.0" + sources."jest-environment-node-26.1.0" sources."jest-get-type-26.0.0" - sources."jest-haste-map-26.0.1" - sources."jest-jasmine2-26.0.1" - sources."jest-leak-detector-26.0.1" - sources."jest-matcher-utils-26.0.1" - sources."jest-message-util-26.0.1" - sources."jest-mock-26.0.1" - sources."jest-pnp-resolver-1.2.1" + sources."jest-haste-map-26.1.0" + sources."jest-jasmine2-26.1.0" + sources."jest-leak-detector-26.1.0" + sources."jest-matcher-utils-26.1.0" + sources."jest-message-util-26.1.0" + sources."jest-mock-26.1.0" + sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-26.0.0" - sources."jest-resolve-26.0.1" - sources."jest-resolve-dependencies-26.0.1" - sources."jest-runner-26.0.1" - sources."jest-runtime-26.0.1" - sources."jest-serializer-26.0.0" - sources."jest-snapshot-26.0.1" - sources."jest-util-26.0.1" - (sources."jest-validate-26.0.1" // { + sources."jest-resolve-26.1.0" + sources."jest-resolve-dependencies-26.1.0" + sources."jest-runner-26.1.0" + sources."jest-runtime-26.1.0" + sources."jest-serializer-26.1.0" + sources."jest-snapshot-26.1.0" + sources."jest-util-26.1.0" + (sources."jest-validate-26.1.0" // { dependencies = [ sources."camelcase-6.0.0" ]; }) - sources."jest-watcher-26.0.1" - (sources."jest-worker-26.0.0" // { + sources."jest-watcher-26.1.0" + (sources."jest-worker-26.1.0" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.1.0" @@ -10239,7 +9384,7 @@ let sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsbn-0.1.1" - sources."jsdom-16.2.2" + sources."jsdom-16.3.0" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" @@ -10254,7 +9399,7 @@ let sources."levn-0.4.1" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.19" sources."lodash.sortby-4.7.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -10278,7 +9423,6 @@ let }) sources."mkdirp-0.5.5" sources."ms-2.0.0" - sources."mute-stream-0.0.8" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" @@ -10309,7 +9453,6 @@ let sources."once-1.4.0" sources."onetime-5.1.0" sources."optionator-0.9.1" - sources."os-tmpdir-1.0.2" sources."p-each-series-2.1.0" sources."p-finally-1.0.0" sources."p-limit-2.3.0" @@ -10329,7 +9472,7 @@ let sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" sources."prelude-ls-1.2.1" - (sources."pretty-format-26.0.1" // { + (sources."pretty-format-26.1.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" @@ -10377,12 +9520,9 @@ let }) sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" - sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."rimraf-2.6.3" sources."rsvp-4.8.5" - sources."run-async-2.4.1" - sources."rxjs-6.5.5" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -10423,11 +9563,7 @@ let sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" sources."slash-3.0.0" - (sources."slice-ansi-2.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - ]; - }) + sources."slice-ansi-2.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -10472,13 +9608,18 @@ let }) sources."stealthy-require-1.1.1" sources."string-length-4.0.1" - sources."string-width-4.2.0" + (sources."string-width-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."strip-bom-4.0.0" sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" - sources."strip-json-comments-3.1.0" + sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" (sources."supports-hyperlinks-2.1.0" // { dependencies = [ @@ -10487,22 +9628,12 @@ let ]; }) sources."symbol-tree-3.2.4" - (sources."table-5.4.6" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - sources."tar-stream-2.1.2" + sources."table-5.4.6" + sources."tar-stream-2.1.3" sources."terminal-link-2.1.1" sources."test-exclude-6.0.0" sources."text-table-0.2.0" sources."throat-5.0.0" - sources."through-2.3.8" - sources."tmp-0.0.33" sources."tmpl-1.0.4" sources."to-fast-properties-2.0.0" (sources."to-object-path-0.3.0" // { @@ -10538,7 +9669,7 @@ let sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."uuid-7.0.3" - sources."v8-compile-cache-2.1.0" + sources."v8-compile-cache-2.1.1" (sources."v8-to-istanbul-4.1.4" // { dependencies = [ sources."source-map-0.7.3" @@ -10565,16 +9696,25 @@ let sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" ]; }) sources."wrappy-1.0.2" sources."write-1.0.3" sources."write-file-atomic-3.0.3" - sources."ws-7.3.0" + sources."ws-7.3.1" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-4.0.0" - sources."yargs-15.3.1" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + ]; + }) sources."yargs-parser-18.1.3" ]; }) diff --git a/pkgs/servers/zigbee2mqtt/update.sh b/pkgs/servers/zigbee2mqtt/update.sh new file mode 100755 index 0000000000000..7fd32dff4634b --- /dev/null +++ b/pkgs/servers/zigbee2mqtt/update.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq nix-update + +CURRENT_VERSION=$(nix eval --raw '(with import ../../.. {}; zigbee2mqtt.version)') +TARGET_VERSION=$(curl https://api.github.com/repos/Koenkk/zigbee2mqtt/releases/latest | jq -r ".tag_name") +ZIGBEE2MQTT=https://github.com/Koenkk/zigbee2mqtt/raw/$TARGET_VERSION + +if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then + echo "zigbee2mqtt is up-to-date: ${CURRENT_VERSION}" + exit 0 +fi + +wget $ZIGBEE2MQTT/package.json +wget $ZIGBEE2MQTT/npm-shrinkwrap.json + +node2nix --nodejs-12 \ + -l npm-shrinkwrap.json \ + -c node.nix \ + --bypass-cache \ + --no-copy-node-env \ + --node-env ../../development/node-packages/node-env.nix +rm package.json npm-shrinkwrap.json + +{ + cd ../../.. + nix-update --version "$TARGET_VERSION" --build zigbee2mqtt +} + +git add ./default.nix ./node-packages.nix ./node.nix +git commit -m "zigbee2mqtt: ${CURRENT_VERSION} -> ${TARGET_VERSION}" diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index 4cb3c14a9a0d7..deeb4093c6822 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -12,6 +12,11 @@ assert interactive -> readline70 != null; assert withDocs -> texinfo != null; assert stdenv.hostPlatform.isDarwin -> binutils != null; +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + let upstreamPatches = import ./bash-4.4-patches.nix (nr: sha256: fetchurl { url = "mirror://gnu/bash/bash-4.4-patches/bash44-${nr}"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 1f22099e90107..f6553cf634212 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-07-30"; + version = "2020-08-06"; pname = "oh-my-zsh"; - rev = "8755c5f101f801738dd249c7685dcf30dd03a7b2"; + rev = "079e7bb5e0a79171f3356d55d3f6302a82645a39"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0z6bcv91xxfnaj42n7yzlx0wv14f87wws0n5cciy2g4yd3kyzmkq"; + sha256 = "10fpq57alk117991wwbprcmv69f27hbpp7a3gb70mzyjmfiflgk3"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/shells/zsh/zsh-nix-shell/default.nix b/pkgs/shells/zsh/zsh-nix-shell/default.nix index c424cc334836f..6db78f1c0f567 100644 --- a/pkgs/shells/zsh/zsh-nix-shell/default.nix +++ b/pkgs/shells/zsh/zsh-nix-shell/default.nix @@ -4,14 +4,14 @@ # `programs.zsh.interactiveShellInit = "source ${pkgs.zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh";` stdenv.mkDerivation rec { - pname = "zsh-nix-shell-unstable"; - version = "2019-12-20"; + pname = "zsh-nix-shell"; + version = "0.1.0"; src = fetchFromGitHub { owner = "chisui"; repo = "zsh-nix-shell"; - rev = "a65382a353eaee5a98f068c330947c032a1263bb"; - sha256 = "0l41ac5b7p8yyjvpfp438kw7zl9dblrpd7icjg1v3ig3xy87zv0n"; + rev = "v${version}"; + sha256 = "0snhch9hfy83d4amkyxx33izvkhbwmindy0zjjk28hih1a9l2jmx"; }; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 7b6684092bae8..5d81ceaba1b21 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "1z6abvp642n40biya88n86ff1wiry00dlwawqwxp7q5ds55jhbv1"; + sha256 = "08zg4in70h3kray6lazszzy26gvil9w2cr6xmkbgjsv3k6w3k0jg"; }; patches = [ diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 7bd82b4ab2a53..c0c89d63ffff0 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -45,6 +45,14 @@ in stdenv.mkDerivation { NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c} ./ldflags-check + printf "Check whether -nostdinc and -nostdinc++ is handled correctly" >&2 + mkdir -p std-include + cp ${./stdio.h} std-include/stdio.h + NIX_DEBUG=1 $CC -I std-include -nostdinc -o nostdinc-main ${./nostdinc-main.c} + ./nostdinc-main + $CXX -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c} + ./nostdinc-main++ + ${optionalString sanitizersWorking '' printf "checking whether sanitizers are fully functional... ">&2 $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} diff --git a/pkgs/test/cc-wrapper/nostdinc-main.c b/pkgs/test/cc-wrapper/nostdinc-main.c new file mode 100644 index 0000000000000..f71d155b1b278 --- /dev/null +++ b/pkgs/test/cc-wrapper/nostdinc-main.c @@ -0,0 +1,8 @@ +// This one should not come from libc because of -nostdinc +#include <stdio.h> + +int main(int argc, char *argv[]) { + // provided by our own stdio.h + foo(); + return 0; +} diff --git a/pkgs/test/cc-wrapper/stdio.h b/pkgs/test/cc-wrapper/stdio.h new file mode 100644 index 0000000000000..4bddf1d9d4866 --- /dev/null +++ b/pkgs/test/cc-wrapper/stdio.h @@ -0,0 +1 @@ +static void foo(void) {} diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 5bccc026c4324..159273e39d3bd 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,22 +2,24 @@ buildGoModule rec { pname = "eksctl"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1iybsyx2la6dcz2g3rshzky15n5qs8z57zvdvpiisfa0pnjisdm5"; + sha256 = "1p3dzzbf840csqlgxyykmyg13z0nkzy4nkqq9y8jlpdm745vcryv"; }; - vendorSha256 = "033zj6jmxypj2plqpnkkzp8iffc078y9jfq01zcjnaij1v0sb8al"; + vendorSha256 = "1msid4857wsh4qp1f7nyrmpzjv3sklh49cl7a9c1a3qr9m99w4yb"; subPackages = [ "cmd/eksctl" ]; buildFlags = [ "-tags netgo" "-tags release" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/weaveworks/eksctl/pkg/version.gitCommit=${src.rev} -X github.com/weaveworks/eksctl/pkg/version.buildDate=19700101-00:00:00" ]; + buildFlagsArray = [ + "-ldflags=-s -w -X github.com/weaveworks/eksctl/pkg/version.gitCommit=${src.rev} -X github.com/weaveworks/eksctl/pkg/version.buildDate=19700101-00:00:00" + ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index c3c51a5605256..27af9ecf65e2f 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGo114Package rec { pname = "exoscale-cli"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "10sx542m6r6yq99nqn69bjfc6rv4nr9swi74rfccxb7dbifdrqpp"; + sha256 = "00cyxy4lidpdf1vvji1nbdlixqxzzpj91gwf0kkdqpr17v562h9m"; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 7c0f7de7e20ae..2e8ff96d41a8e 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.3"; + version = "4.4"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "07yakpnh1qf1jdb8ry0pmzh74skyc86xbz45jd02cbba13k1x2dn"; + sha256 = "0fk42spz57nfmwy6xn02nnlkq01111x03psjq003k2785ah4xk1h"; }; postPatch = '' diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 07106a72585f7..4745d065be935 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -7,11 +7,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "mycli"; - version = "1.22.1"; + version = "1.22.2"; src = fetchPypi { inherit pname version; - sha256 = "18qxxrpdksg3s73va7nkbkwi34kg9m1pls7w4fh5f4jk4p434zsf"; + sha256 = "1lq2x95553vdmhw13cxcgsd2g2i32izhsb7hxd4m1iwf9b3msbpv"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 749f795c449a1..672c99d80c008 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, autoreconfHook, acl }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { pname = "gnutar"; version = "1.32"; diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix index 0503f9bad6947..381591edb0218 100644 --- a/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,14 +1,14 @@ { stdenv, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: mkDerivation rec { - version = "1.5"; + version = "1.5.1"; pname = "OPL3BankEditor"; src = fetchFromGitHub { owner = "Wohlstand"; repo = pname; rev = "v${version}"; - sha256 = "16va5xfbyn2m63722ab5yph0l7kmghkbk6dkia93041mfhdyg9rc"; + sha256 = "1g59qrkcm4xnyxx0s2x28brqbf2ix6vriyx12pcdvfhhcdi55hxh"; fetchSubmodules = true; }; diff --git a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix b/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix index d8f15a65b45b0..1d10452470edb 100644 --- a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix +++ b/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix @@ -1,19 +1,14 @@ { opl3bankeditor, fetchFromGitHub }: opl3bankeditor.overrideAttrs (oldAttrs: rec { - version = "1.3-beta"; + version = "1.3"; pname = "OPN2BankEditor"; src = fetchFromGitHub { owner = "Wohlstand"; repo = pname; - rev = version; - sha256 = "0blcvqfj1yj6cmm079aw4jdzv3066jxqy9krp268i6cl2b3bmwvw"; + rev = "v${version}"; + sha256 = "0xsvv0gxqh1lx22f1jm384f7mq1jp57fmpsx1jjaxz435w5hf8s0"; fetchSubmodules = true; }; - - # to be removed with next release - postInstall = '' - install -Dm755 opn2_bank_editor $out/bin/opn2_bank_editor - ''; }) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix new file mode 100644 index 0000000000000..09f13598d9375 --- /dev/null +++ b/pkgs/tools/backup/kopia/default.nix @@ -0,0 +1,35 @@ +{ lib, buildGoModule, fetchFromGitHub, coreutils }: + +buildGoModule rec { + pname = "kopia"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1s74wa2r6nzrbp1f1bcbypwggishwwvpnwnqzs8gncz7dsa44zj4"; + }; + + vendorSha256 = "11az7zgwzbcx4dknwqiwmdbrbkdzhpwzqnyk8vw9mkbda0xaif3k"; + subPackages = [ "." ]; + + postConfigure = '' + # make 'vendor' writable + cp -L -r vendor tmp-vendor + rm -rf vendor + mv tmp-vendor vendor + + # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 + substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ + --replace "/bin/stty" "${coreutils}/bin/stty" + ''; + + meta = with lib; { + homepage = "https://kopia.io"; + description = "Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication"; + platforms = platforms.all; + license = licenses.asl20; + maintainers = [ maintainers.bbigras ]; + }; +} diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index 43703cce32ce6..9d33ce1f3f859 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "0jr9vsmjx6dfkkl2lnk8nc3i3snivy5za0zvcazss54xpa3k0fh1"; + sha256 = "16k5mp64a5l063rdj65hbpx414xv0bqdvhvz49k8018f2a2jj5xl"; }; - cargoSha256 = "15zz168igc255kyqd6nl9p2cm1s1hs6bp72jdxjvpzgsg990jp46"; + cargoSha256 = "0s5mv8mymycz4ga4zh9kbrhwmhgl4j01pw1sdzxy49l9waryk9p3"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 41dcd54ecdb60..3e20258cbbeeb 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -3,6 +3,11 @@ , autoreconfHook }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { pname = "bzip2"; version = "1.0.6.0.1"; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index eb680ff8a0610..9628e100c1cc5 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -4,6 +4,11 @@ , writeText }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { pname = "gzip"; version = "1.10"; diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 62f57a8cca792..e55af8b94ed26 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, texinfo }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { pname = "lzip"; version = "1.21"; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 545384c396d2e..5cf88288d813a 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, enableStatic ? false }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { name = "xz-5.2.5"; diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index ebb50cfad2ee3..c7f0beba8fb86 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,20 +1,21 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp , libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gromit-mpx"; - version = "1.3"; + version = "1.3.1"; src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; rev = version; - sha256 = "1dkmp5rhzp56sz9cfxill2pkdz2anwb8kkxkypvk2xhqi64cvkrs"; + sha256 = "1dvn7vwg4fg1a3lfj5f7nij1vcxm27gyf2wr817f3qb4sx5xmjwy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ cmake gtk glib pcre libappindicator libpthreadstubs diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix deleted file mode 100644 index ad86bdef80af5..0000000000000 --- a/pkgs/tools/misc/antimicro/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ mkDerivation, lib, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }: - -mkDerivation rec { - pname = "antimicro"; - version = "2.23"; - - src = fetchFromGitHub { - owner = "AntiMicro"; - repo = "antimicro"; - rev = version; - sha256 = "1q40ayxwwyq85lc89cnj1cm2nar625h4vhh8dvmb2qcxczaggf4v"; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ - SDL2 qtbase qttools xorg.libXtst - ]; - - meta = with lib; { - description = "GUI for mapping keyboard and mouse controls to a gamepad"; - inherit (src.meta) homepage; - maintainers = with maintainers; [ jb55 ]; - license = licenses.gpl3; - platforms = with platforms; linux; - broken = true; # 2018-04-10 - }; -} diff --git a/pkgs/tools/misc/antimicroX/default.nix b/pkgs/tools/misc/antimicroX/default.nix new file mode 100644 index 0000000000000..23418ced829ec --- /dev/null +++ b/pkgs/tools/misc/antimicroX/default.nix @@ -0,0 +1,44 @@ +{ mkDerivation +, lib +, cmake +, extra-cmake-modules +, pkgconfig +, SDL2 +, qtbase +, qttools +, qtx11extras +, xorg +, fetchFromGitHub +, itstool +}: + +mkDerivation rec { + pname = "antimicroX"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "juliagoda"; + repo = "antimicroX"; + rev = version; + sha256 = "0li22sjl95233azxhyda36idnfzbb4b02wf57hnpnba6qvrlpwwl"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig itstool ]; + buildInputs = [ + SDL2 + qtbase + qttools + qtx11extras + xorg.libX11 + xorg.libXtst + xorg.libXi + ]; + + meta = with lib; { + description = "GUI for mapping keyboard and mouse controls to a gamepad"; + inherit (src.meta) homepage; + maintainers = with maintainers; [ jb55 ]; + license = licenses.gpl3Plus; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 49edc002bec76..50d3a2437d708 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -10,6 +10,11 @@ , singleBinary ? "symlinks" # you can also pass "shebangs" or false }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + assert aclSupport -> acl != null; assert selinuxSupport -> libselinux != null && libsepol != null; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 97035258633ea..5e5bad8b54a32 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "153"; + version = "154"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "1wdmm7qdw15wxj26kxapnkyaa32yf3ywngak0smfb4nbzcy45dzm"; + sha256 = "1l39ayshl29fl54skcrwc6a412np4ki25h1zj2n9lhir3g1v4rxs"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 91ab681b2a0aa..dd33d0b091545 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.8.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "0z0aqasi42wv1np2a6b0qc14a64r2h8xh025411jdxfs6vjr15am"; + sha256 = "0qsk4pa7xywd6fdwd5v4qwj334hyp3xjlayjzgyhks7a87hdwjgs"; # 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 = "1g9248kqwrc46abwx6fakzfxf745jfvkywi49z7mvd4p99ysh2ir"; + cargoSha256 = "02wd4cw9hd8d96szwx8yxz6bll60f7w1z0xiz7k1h8h12mriaz4w"; doCheck = false; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 230e401ef82f1..84dd187e1fc7f 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -2,6 +2,11 @@ , coreutils }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { pname = "findutils"; version = "4.7.0"; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index cc40c89bc6f46..9150e04fc14f4 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "15nfzs1p6na0n98hpzh4lnzcj4g83dg2nfhd4f9lay32qj12cqgj"; + sha256 = "1q413rslsba8pqxlrypx4kpk1a4sp66p0swv3lrnd7k7bf55j3jk"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 82fd5c8210dd3..8da5c87165247 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, lib +, fetchpatch , cmake, perl, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango , readline, woff2, zeromq, libuninameslist @@ -21,6 +22,18 @@ stdenv.mkDerivation rec { sha256 = "0qf88wd6riycq56d24brybyc93ns74s0nyyavm43zp2kfcihn6fd"; }; + patches = [ + # Unreleased fix for https://github.com/fontforge/fontforge/issues/4229 + # which is required to fix an uninterposated `${CMAKE_INSTALL_PREFIX}/lib`, see + # see https://github.com/nh2/static-haskell-nix/pull/98#issuecomment-665395399 + # TODO: Remove https://github.com/fontforge/fontforge/pull/4232 is in a release. + (fetchpatch { + name = "fontforge-cmake-set-rpath-to-the-configure-time-CMAKE_INSTALL_PREFIX"; + url = "https://github.com/fontforge/fontforge/commit/297ee9b5d6db5970ca17ebe5305189e79a1520a1.patch"; + sha256 = "14qfp8pwh0vzzib4hq2nc6xhn8lc1cal1sb0lqwb2q5dijqx5kqk"; + }) + ]; + # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps postPatch = '' find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 2fe4bac88f0c3..f22ffc63f49c8 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "0piz1dzczcw1nsff775zicvpm6iy0iw0v0ba7rj7i0xqv9ni1prw"; + sha256 = "0n0cy5q2r3dm1a3ivlzrv9c5d11awxlqim5b9x8zc85dlr73n35l"; }; vendorSha256 = "1c2iz28hjrw9rig9a6r27wd8clycdhi8fgs3da91c63w4qi140zm"; diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index e30a5e62286a9..7d559a1468e3c 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.17.0"; + version = "1.18.2"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "1c81xcjzfp4fd2zbq3jbknkqlrn0l5wkr08sgvcsxxvqa80338xv"; + sha256 = "1gaqdcz0s31qncar9dzlr8izv50zlk4y6dgdm9xjk6as2g8b0fkk"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. @@ -19,10 +19,11 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" - "HARDEN=1" ] ++ stdenv.lib.optionals stdenv.isLinux [ "ENABLE_DEDUPE=1" "STATIC_DEDUPE_H=1" + ] ++ stdenv.lib.optionals stdenv.cc.isGNU [ + "HARDEN=1" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index c0f5aec1e4db2..8c544d3f0db1d 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -12,9 +12,16 @@ , Security }: -(rustPlatform.buildRustPackage rec { +let + # Run `eval $(nix-build -A lorri.updater)` after updating the revision! + version = "1.2"; + gitRev = "43a260c221d5dac4a44fd82271736c8444474eec"; + sha256 = "0g6zq27dpr8bdan5xrqchybpbqwnhhc7x8sxbfygigbqd3xv9i6n"; + cargoSha256 = "1zmlp14v7av0znmjyy2aq83lc74503p6r0l11l9iw7s3xad8rda4"; + +in (rustPlatform.buildRustPackage rec { pname = "lorri"; - version = "1.1.1"; + inherit version; meta = with stdenv.lib; { description = "Your project's nix-env"; @@ -26,13 +33,11 @@ src = fetchFromGitHub { owner = "target"; repo = pname; - # Run `eval $(nix-build -A lorri.updater)` after updating the revision! - # ALSO don’t forget to update the cargoSha256! - rev = "05ea21170a18800e83b3dcf1e3d347f83a9fa992"; - sha256 = "1lgig5q1anmmmc1i1qnbx8rd8mqvm5csgnlaxlj4l4rxjmgiv06n"; + rev = gitRev; + inherit sha256; }; - cargoSha256 = "16asbpq47f3zcv4j9rzqx9v1317qz7xjr7dxd019vpr88zyk4fi1"; + inherit cargoSha256; doCheck = false; BUILD_REV_COUNT = src.revCount or 1; diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index b2b665151686b..ebe99eca8cf95 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "osm2pgsql"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = pname; rev = version; - sha256 = "1j35aa8qinhavliqi5pdm0viyi7lm5xyk402rliaxxs1r2hbsafn"; + sha256 = "1dsyhcifixmcw05qxjald02pml0zfdij81pgy9yh8p00v0rqq57x"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 059b43baec398..d11c41195cee8 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200522"; + name = "parallel-20200722"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "10is46v5dpccxibby0zikg1q68mdwpmgdpxk796zka93idd6id29"; + sha256 = "0vqd8nhf4lkvbfy7nnibxjkpzpfandpklqm0hrix5vki5x7x80a8"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 44194314d77b2..bd4493db705f7 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "1prhzmxrvypqdbxjr9c3207w1c88z3kwsrr2rcbh1y7fx5rrspxv"; + sha256 = "1g0kdvc93ij155r3g7cd9f5p1x33vdi9p40403waanq5wiavjnzq"; }; vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index ce24854d04d9d..9a8a245a790bb 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -12,6 +12,11 @@ , brotliSupport ? false, brotli ? null }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + assert http2Support -> nghttp2 != null; assert idnSupport -> libidn != null; assert ldapSupport -> openldap != null; diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 055f92141b29b..19dbd00c1ee9c 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -12,11 +12,11 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.81"; + name = "dnsmasq-2.82"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "1yzq6anwgr5rlnwydpszb51cyhp2vjq29b24ck19flbwac1sk73l"; + sha256 = "0cn1xd1s6xs78jmrmwjnh9m6w3q38pk6dyqy2phvasqiyd33cll4"; }; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 09b228c0b8188..91112a2628e2d 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.1.7"; + version = "2.2.2"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "0fd3c1znid5a9w3gcf77b85hm2a2558w9s02c4b7xzkmivqnqbir"; + sha256 = "1mjld865p4f7i465fcc5c4jclih1c3345a3ylriql8668rd7071r"; }; buildInputs = [ openssl zlib ] diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 818d500d1e63c..44eb5c50ba802 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "isync"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "01g8hk9gisz67204k8ad7w7i3zp9vg2c68lscld44bwiii1d21li"; + sha256 = "10n8ykag0q3ws6fc15xqyg3v980v5nq3kzpablly2rh2z7vkn8gj"; }; nativeBuildInputs = [ pkg-config perl ]; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index a80f94d2e9f2a..58985f73f30a4 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openresolv"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { url = "mirror://roy/openresolv/${pname}-${version}.tar.xz"; - sha256 = "01ms6c087la4hk0f0w6n2vpsb7dg4kklah2rqyhz88p0vr9bqy20"; + sha256 = "0g7wb2880hbr0x99n73m7fgjm7lcdbpxfy2i620zxcq73qfrvspa"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1703e8c755945..1748a2d21d04e 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchurl, fetchpatch, zlib, openssl, libedit, pkgconfig, pam, autoreconfHook +{ stdenv +, fetchurl +, fetchpatch +, zlib +, openssl +, libedit +, pkgconfig +, pam +, autoreconfHook , etcDir ? null , hpnSupport ? false , withKerberos ? true @@ -6,33 +14,35 @@ , kerberos , libfido2 , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl -, linkOpenssl? true +, linkOpenssl ? true }: let + version = "8.3p1"; + # **please** update this patch when you update to a new openssh release. gssapiPatch = fetchpatch { name = "openssh-gssapi.patch"; - url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%258.2p1-1/debian/patches/gssapi.patch"; - sha256 = "081gryqkfr5zr4f5m4v0piq1sxz06sb38z5lqxccgpivql7pa8d8"; + url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-1/debian/patches/gssapi.patch"; + sha256 = "0j22ccg6msyi88mpsb6x0il5cg8v2b7qdah57ninbwx5isyld80l"; }; in with stdenv.lib; stdenv.mkDerivation rec { pname = "openssh"; - version = if hpnSupport then "8.1p1" else "8.2p1"; + inherit version; src = if hpnSupport then fetchurl { - url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-8_1_P1.tar.gz"; - sha256 = "1xiv28df9c15h44fv1i93fq8rvkyapjj9vj985ndnw3xk1nvqjyd"; + url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz"; + sha256 = "0lwr7xzhy8m4y0vzi1a78ddhag3qp6cba0c37mnhivbhb67dkywp"; } else fetchurl { url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz"; - sha256 = "0wg6ckzvvklbzznijxkk28fb8dnwyjd0w30ra0afwv6gwr8m34j3"; + sha256 = "1cl74ghi9y21dc3f4xa0qamb7dhwacbynh1ks9syprrg8zhgpgpj"; }; patches = @@ -99,8 +109,9 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://www.openssh.com/"; description = "An implementation of the SSH protocol"; + homepage = "https://www.openssh.com/"; + changelog = "https://www.openssh.com/releasenotes.html"; license = stdenv.lib.licenses.bsd2; platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ eelco aneeshusa ]; diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 7fc87534c1d16..ce8312a9158dd 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.3.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "1z6z4ad5id6bcxzd8p76akxwvf5jzr54w81798ri9lysf4hdi6sh"; + sha256 = "075jrarvpvh4hll3zvrf65ar3a2ya63ma343hss11l1mr3gykb9d"; }; - vendorSha256 = "0v14j4vsp7f29xajym2dd2zlfv0sqhb04qfs76bcnn0ys6j1xkny"; + vendorSha256 = "11ab1w89zn3m81swzsnyiw1x10v58phid4y68rralkp6bhisz25b"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 909c822374f4c..d5c1f7ec6fded 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "aws-okta"; - version = "1.0.2"; + version = "1.0.4"; goPackagePath = "github.com/segmentio/aws-okta"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "segmentio"; repo = "aws-okta"; rev = "v${version}"; - sha256 = "0rqkbhprz1j9b9bx3wvl5zi4p02q1qza905wkrvh42f9pbknajww"; + sha256 = "0a7xccnv0x0a6sydif0rvkdbw4jy9gjijajip1ac6m70l20dhl1v"; }; buildFlags = [ "--tags" "release" ]; diff --git a/pkgs/tools/security/doona/default.nix b/pkgs/tools/security/doona/default.nix new file mode 100644 index 0000000000000..5e1233f308c3f --- /dev/null +++ b/pkgs/tools/security/doona/default.nix @@ -0,0 +1,36 @@ +{ fetchFromGitHub +, stdenv +, perl +}: + +stdenv.mkDerivation rec { + pname = "doona"; + version = "unstable-2019-03-08"; + + src = fetchFromGitHub { + owner = "wireghoul"; + repo = pname; + rev = "master"; + sha256 = "0x9irwrw5x2ia6ch6gshadrlqrgdi1ivkadmr7j4m75k04a7nvz1"; + }; + + buildInputs = [ perl ]; + + installPhase = '' + mkdir -p $out/bin + cp -r ${src}/bedmod $out/bin/bedmod + cp ${src}/doona.pl $out/bin/doona + chmod +x $out/bin/doona + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/wireghoul/doona"; + description = "A fork of the Bruteforce Exploit Detector Tool (BED)"; + longDescription = '' + A fork of the Bruteforce Exploit Detector Tool (BED). + BED is a program which is designed to check daemons for potential buffer overflows, format string bugs etc. + ''; + license = licenses.gpl2; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/tools/security/hcxdumptool/default.nix index b59cef1394288..a41d925223ac9 100644 --- a/pkgs/tools/security/hcxdumptool/default.nix +++ b/pkgs/tools/security/hcxdumptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxdumptool"; - version = "6.0.7"; + version = "6.1.0"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxdumptool"; rev = version; - sha256 = "14w4f63nrcwhqj753rjif9cgs1xh1r1619827p69dz0v2x3xdvn1"; + sha256 = "10dhv8lgsciw6w9r328k50pv1ldldf9wikplgh0dq98djlf0l961"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 4e01a5792dcc6..98a3e8797fbf5 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pcsclite"; - version = "1.8.26"; + version = "1.9.0"; outputs = [ "bin" "out" "dev" "doc" "man" ]; src = fetchurl { url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2"; - sha256 = "1ndvvz0fgqwz70pijymsxmx25mzryb0zav1i8jjc067ndryvxdry"; + sha256 = "1y9f9zipnrmgiw0mxrvcgky8vfrcmg6zh40gbln5a93i2c1x8j01"; }; patches = [ ./no-dropdir-literals.patch ]; @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { # The OS should care on preparing the drivers into this location "--enable-usbdropdir=/var/lib/pcsc/drivers" "--enable-confdir=/etc" - "--enable-ipcdir=/run/pcscd" ] ++ stdenv.lib.optional stdenv.isLinux "--with-systemdsystemunitdir=\${out}/etc/systemd/system" ++ stdenv.lib.optional (!stdenv.isLinux) diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index aa36901e46b9c..f83d2675c6ac1 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "thc-hydra"; - version = "9.0"; + version = "9.1"; src = fetchFromGitHub { owner = "vanhauser-thc"; repo = "thc-hydra"; rev = "v${version}"; - sha256 = "09d2f55wky1iabnl871d4r6dyyvr8zhp47d9j1p6d0pvdv93kl4z"; + sha256 = "1533h9z5jdlazwy0z7ll2753i507wq55by7rm9lh6y59889p0hps"; }; postPatch = let diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix new file mode 100644 index 0000000000000..015d9d3adacca --- /dev/null +++ b/pkgs/tools/system/bpytop/default.nix @@ -0,0 +1,45 @@ +{ stdenv, python3Packages, fetchFromGitHub, makeWrapper, substituteAll }: + +stdenv.mkDerivation rec { + pname = "bpytop"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "aristocratos"; + repo = pname; + rev = "v${version}"; + sha256 = "0cxyrk5a9j0ymll9h5b6jq48yjy9srcxh4rmsqk8w0d14prmflgg"; + }; + + buildInputs = [ makeWrapper ]; + propagatedBuildInputs = with python3Packages; [ python psutil ]; + + dontBuild = true; + + postPatch = '' + sed -i -e "s#/usr/\[local/\]#$out/#g" \ + -e "s#/usr/{td}#$out/#g" \ + ./bpytop.py + ''; + + installPhase = '' + mkdir -p $out/{bin,libexec,share/bpytop}/ + cp -r ./themes $out/share/bpytop/ + cp ./bpytop.py $out/libexec/ + + makeWrapper ${python3Packages.python.interpreter} $out/bin/bpytop \ + --add-flags "$out/libexec/bpytop.py" \ + --prefix PYTHONPATH : "$PYTHONPATH" + ''; + + meta = with stdenv.lib; { + description = "A resource monitor; python port of bashtop"; + homepage = src.meta.homepage; + license = licenses.apsl20; + maintainers = with maintainers; [ aw ]; + platforms = with platforms; linux ++ freebsd ++ darwin; + + # https://github.com/NixOS/nixpkgs/pull/94625#issuecomment-668509399 + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix index 2a60283f122ad..e3d84cb213151 100644 --- a/pkgs/tools/system/kmon/default.nix +++ b/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.3.0"; + version = "1.3.5"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "0487blp5l82jscpf9m76cq5prvclg5ngvdgi500jh7vrrxxawnh4"; + sha256 = "1jbp1pd1xlbj5jzz7v2zmrzik45z91ddpvaxazjwcbqmw6hn732q"; }; - cargoSha256 = "1dfvkn1sw22csg635kl4mmcxb6c5bvc5aw370iicy9hwlkk7cqpd"; + cargoSha256 = "17srf1krknabqprjilk76mmvjq284zf138gf15vybsbjd9dkpals"; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 722df46c05f5e..e5316e028dbe0 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -14,14 +14,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.23.0"; + version = "1.23.2"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "04x53hr2d086y4q990h7lazaykaizb5g45nmfvahqzxj72b0hvdf"; + sha256 = "1vv92plk9dxk6fl76ik1zralpzc35ymrfyrf1cr6pv8q3agyy5k4"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -36,6 +36,12 @@ in stdenv.mkDerivation rec { patches = [ ./no-files-in-etc-and-var.patch + ] ++ stdenv.lib.optionals (!stdenv.cc.isGNU) [ + # fix memcpy typo for non-gnu. Remove with the next release. + (fetchpatch { + url = "https://github.com/netdata/netdata/commit/da7f267196b489e9a75724b68897e8f2e6137d72.patch"; + sha256 = "1j2sa06j6v491nw58bjx5nqqyfi1n2n9z3p3jiy4yh74m3asldlv"; + }) ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 3e38b7bfdf9a1..211192c1e736b 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "netdata-go.d.plugin"; - version = "0.19.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "03a67kvhickzg96jvzxhg1jih48m96rl4mkg0wgmbi7a676dl7lq"; + sha256 = "0wd1wg56q955jm5ksq2zqzlms1nlxx7n7vv43l096k1578fv93jv"; }; - vendorSha256 = "0mmnkkzpv8lmxn11idikddmjinxv1y823ny0wxp271agiinyfpn8"; + vendorSha256 = "1k84l97fw4s9jdwbka4p168m7l7wil0c4cpijis8ypj3g1xfrw90"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 06ecda9ff21dc..6fd69a9ba4cc5 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, xz, coreutils ? null }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + stdenv.mkDerivation rec { name = "diffutils-3.7"; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 3f5c4d7d86cf0..f7e3cd42a9b2a 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,5 +1,10 @@ { stdenv, fetchurl, pcre, libiconv, perl }: +# Note: this package is used for bootstrapping fetchurl, and thus +# cannot use fetchpatch! All mutable patches (generated by GitHub or +# cgit) that are needed here should be included directly in Nixpkgs as +# files. + let version = "3.4"; in stdenv.mkDerivation { @@ -19,7 +24,7 @@ stdenv.mkDerivation { # cygwin: FAIL: multibyte-white-space # freebsd: FAIL mb-non-UTF8-performance - # all platforms: timing sensitivity in long-pattern-perf + # all platforms: timing sensitivity in long-pattern-perf #doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin && !stdenv.isFreeBSD; doCheck = false; diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix index 83fdabb8f46fe..c2b055be7df94 100644 --- a/pkgs/tools/text/hyx/default.nix +++ b/pkgs/tools/text/hyx/default.nix @@ -1,14 +1,25 @@ { lib, stdenv, fetchurl }: - +let + # memstream — POSIX memory streams for BSD + memstream = fetchurl { + url = "https://piumarta.com/software/memstream/memstream-0.1.tar.gz"; + sha256 = "0kvdb897g7nyviaz72arbqijk2g2wa61cmi3l5yh48rzr49r3a3a"; + }; +in stdenv.mkDerivation rec { - name = "hyx-0.1.5"; + pname = "hyx"; + version = "2020-06-09"; src = fetchurl { - url = "https://yx7.cc/code/hyx/${name}.tar.xz"; - sha256 = "0gd8fbdyw12jwffa5dgcql4ry22xbdhqdds1qwzk1rkcrkgnc1mg"; + url = "https://yx7.cc/code/hyx/hyx-${lib.replaceStrings [ "-" ] [ "." ] version}.tar.xz"; + sha256 = "1x8dmll93hrnj24kn5knpwj36y6r1v2ygwynpjwrg2hwd4c1a8hi"; }; - patches = [ ./no-wall-by-default.patch ]; + postUnpack = lib.optionalString stdenv.isDarwin '' + tar --strip=1 -C $sourceRoot -xf ${memstream} --wildcards "memstream-0.1/memstream.[hc]" + ''; + + patches = lib.optional stdenv.isDarwin ./memstream.patch; installPhase = '' install -vD hyx $out/bin/hyx @@ -19,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://yx7.cc/code/"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/text/hyx/memstream.patch b/pkgs/tools/text/hyx/memstream.patch new file mode 100644 index 0000000000000..a02509ced762a --- /dev/null +++ b/pkgs/tools/text/hyx/memstream.patch @@ -0,0 +1,31 @@ +diff -Naur hyx-2020.06.09.org/Makefile hyx-2020.06.09/Makefile +--- hyx-2020.06.09.org/Makefile 2020-06-09 15:19:50.000000000 +0300 ++++ hyx-2020.06.09/Makefile 2020-07-22 11:46:40.000000000 +0300 +@@ -1,6 +1,6 @@ + + all: CFLAGS ?= -O2 -Wl,-s \ +- -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all ++ -D_FORTIFY_SOURCE=2 -fstack-protector-all + all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG + all: hyx + +@@ -13,7 +13,7 @@ + hyx: *.h *.c + $(CC) \ + $(CFLAGS) \ +- hyx.c common.c blob.c history.c view.c input.c \ ++ hyx.c common.c blob.c history.c view.c input.c memstream.c \ + -o hyx + + clean: +diff -Naur hyx-2020.06.09.org/view.c hyx-2020.06.09/view.c +--- hyx-2020.06.09.org/view.c 2020-06-09 15:19:50.000000000 +0300 ++++ hyx-2020.06.09/view.c 2020-07-22 11:49:09.000000000 +0300 +@@ -4,6 +4,7 @@ + #include "view.h" + #include "input.h" + #include "ansi.h" ++#include "memstream.h" + + #include <stdlib.h> + #include <stdio.h> diff --git a/pkgs/tools/text/hyx/no-wall-by-default.patch b/pkgs/tools/text/hyx/no-wall-by-default.patch deleted file mode 100644 index 48ee20eff179d..0000000000000 --- a/pkgs/tools/text/hyx/no-wall-by-default.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hyx-0.1.5.org/Makefile 2018-06-02 17:14:37.000000000 +0100 -+++ hyx-0.1.5/Makefile 2018-11-10 09:25:49.569961762 +0000 -@@ -1,7 +1,7 @@ - - all: CFLAGS ?= -O2 -Wl,-s \ - -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all --all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG -+all: CFLAGS += -std=c99 -DNDEBUG - all: hyx - - debug: CFLAGS ?= -O0 -g \ diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 7d5020f63b35b..a36881f36b5a2 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "13m23cky8axi7i4s1bvdjcdfr4v8mbxfvz4fy3q8b8gkd6abm3sf"; + sha256 = "0rfcvcz3cawyzhdxqyasd9dwrb8c2j6annpl9jx2n6y3ysl345ry"; }; - cargoSha256 = "0q1kf810494njd5ai2v4qsaq9w3b7120yaymhgxjpcmig8s86zhr"; + cargoSha256 = "02vfdr1zlagjya5i9wf6ag9k01cf20jlm4yqvgrpjg9zrwv4xr4s"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index a540918e56d23..a6af316e121c2 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "04jsni80jzhbb106283df34cdyp5p362l6m29kp30hnc6x49853q"; + sha256 = "0c5bsqs6c55x4j640vhzlmbiylhp5agr7lx0jrwcjazfyvxihc01"; }; - cargoSha256 = "1gwb76zys7gky42clzjs5g4hhgpfvzcw63chw9mnj703c7h0cgfh"; + cargoSha256 = "1mksmdp1wnsjd8gw1g3l16a24fk05xa9mxygc0qklr41bqf8kw8b"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 6035c2950a962..96969b0a310ab 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -1,19 +1,30 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "vale"; - version = "2.0.0"; + version = "2.2.2"; subPackages = [ "." ]; + outputs = ["out" "doc" "data"]; src = fetchFromGitHub { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "068973ayd883kzkxl60lpammf3icjz090nw07kfccvhcf24x07bh"; + sha256 = "11pgszm9cb65liczpnq04l1rx0v68jgmkzrw7ax5kln5hgnrh4kb"; }; + deleteVendor = true; + + vendorSha256 = "150pvy94vfjvn74d63az917szixw1nhl60y1adixg8xqpcjnv9hj"; + goPackagePath = "github.com/errata-ai/vale"; + postInstall = '' + mkdir -p $doc/share/doc/vale + mkdir -p $data/share/vale + cp -r docs/* $doc/share/doc/vale + cp -r styles $data/share/vale + ''; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix new file mode 100644 index 0000000000000..a7c6407705e0c --- /dev/null +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, which }: + +stdenv.mkDerivation rec { + pname = "lowdown"; + version = "0.7.2"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; + sha512 = "3ks1jfw4rjm0qb87ask7wx0xx1grxhbpg53r86q74zhsiqqi6xiza2czg75mydmgic1nr9ny43d5p44sl8ihhja9kwdx230nblx1176"; + }; + + nativeBuildInputs = [ which ]; + + configurePhase = '' + ./configure PREFIX=''${!outputDev} \ + BINDIR=''${!outputBin}/bin \ + MANDIR=''${!outputBin}/share/man + ''; + + meta = with stdenv.lib; { + homepage = "https://kristaps.bsd.lv/lowdown/"; + description = "Simple markdown translator"; + license = licenses.isc; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5bc4021ea0870..64c2d6f369e3c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -42,6 +42,7 @@ mapAliases ({ aircrackng = aircrack-ng; # added 2016-01-14 alienfx = throw "alienfx has been removed."; # added 2019-12-08 ammonite-repl = ammonite; # added 2017-05-02 + antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 at_spi2_atk = at-spi2-atk; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cb552e7c78ac..eec4fb4133d74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -504,9 +504,7 @@ in findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; - wrapGAppsHook = makeSetupHook { - deps = lib.optional (!stdenv.isDarwin) dconf.lib ++ [ gtk3 librsvg makeWrapper ]; - } ../build-support/setup-hooks/wrap-gapps-hook.sh; + wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { }; separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; @@ -525,6 +523,9 @@ in #package writers writers = callPackage ../build-support/writers {}; + # lib functions depending on pkgs + inherit (import ../pkgs-lib { inherit lib pkgs; }) formats; + ### TOOLS _0x0 = callPackage ../tools/misc/0x0 { }; @@ -954,6 +955,8 @@ in dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; + doona = callPackage ../tools/security/doona { }; + ecdsautils = callPackage ../tools/security/ecdsautils { }; sedutil = callPackage ../tools/security/sedutil { }; @@ -1052,6 +1055,8 @@ in httperf = callPackage ../tools/networking/httperf { }; + hwi = with python3Packages; toPythonApplication hwi; + ili2c = callPackage ../tools/misc/ili2c { }; imageworsener = callPackage ../tools/graphics/imageworsener { }; @@ -1364,6 +1369,8 @@ in boxfs = callPackage ../tools/filesystems/boxfs { }; + bpytop = callPackage ../tools/system/bpytop { }; + brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; @@ -1993,6 +2000,8 @@ in gthree = callPackage ../development/libraries/gthree { }; + gtg = callPackage ../applications/office/gtg { }; + gti = callPackage ../tools/misc/gti { }; hdate = callPackage ../applications/misc/hdate { }; @@ -2071,6 +2080,8 @@ in long-shebang = callPackage ../misc/long-shebang {}; + lowdown = callPackage ../tools/typesetting/lowdown { }; + numatop = callPackage ../os-specific/linux/numatop { }; iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; @@ -5437,6 +5448,8 @@ in nat-traverse = callPackage ../tools/networking/nat-traverse { }; + navi = callPackage ../applications/misc/navi { }; + navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; }; nawk = callPackage ../tools/text/nawk { }; @@ -5549,6 +5562,8 @@ in ndstool = callPackage ../tools/archivers/ndstool { }; + nfs-ganesha = callPackage ../servers/nfs-ganesha { }; + ngrep = callPackage ../tools/networking/ngrep { }; neuron-notes = haskell.lib.justStaticExecutables (haskell.lib.generateOptparseApplicativeCompletion "neuron" haskellPackages.neuron); @@ -5657,6 +5672,8 @@ in ntfy = callPackage ../tools/misc/ntfy {}; + ntirpc = callPackage ../development/libraries/ntirpc { }; + ntopng = callPackage ../tools/networking/ntopng { }; ntp = callPackage ../tools/networking/ntp { @@ -5800,9 +5817,6 @@ in openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; - # the hpn patchset does not yet support openssl>1.0.2 - # https://github.com/rapier1/openssh-portable/issues/14 - openssl = openssl_1_0_2; }); openssh_gssapi = pkgs.appendToName "with-gssapi" (openssh.override { @@ -7152,6 +7166,8 @@ in timetable = callPackage ../applications/office/timetable { }; + timezonemap = callPackage ../development/libraries/timezonemap { }; + tzupdate = callPackage ../applications/misc/tzupdate { }; tinc = callPackage ../tools/networking/tinc { }; @@ -9620,6 +9636,7 @@ in ### DEVELOPMENT / INTERPRETERS acl2 = callPackage ../development/interpreters/acl2 { }; + acl2-minimal = callPackage ../development/interpreters/acl2 { certifyBooks = false; }; angelscript = callPackage ../development/interpreters/angelscript {}; @@ -10608,6 +10625,8 @@ in elfutils = callPackage ../development/tools/misc/elfutils { }; + eliot-tree = callPackage ../development/tools/eliot-tree { }; + emma = callPackage ../development/tools/analysis/emma { }; epm = callPackage ../development/tools/misc/epm { }; @@ -12643,7 +12662,7 @@ in stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); - icu = icu64; + icu = icu67; id3lib = callPackage ../development/libraries/id3lib { }; @@ -14028,7 +14047,17 @@ in } # Temporary fix for .drivers that avoids causing lots of rebuilds; see #91145 // { drivers = (mesa.overrideAttrs (a: { - nativeBuildInputs = [ patchelf_0_9 ] ++ a.nativeBuildInputs or []; + nativeBuildInputs = [ + (patchelf.overrideAttrs (pa: { + src = fetchFromGitHub { + owner = "NixOS"; + repo = "patchelf"; + rev = "61bc10176"; # current master; what matters is merge of #225 + sha256 = "0cy77mn77w3mn64ggp20f4ygnbxfjmddhjjhfwkva53lsirg6w93"; + }; + nativeBuildInputs = pa.nativeBuildInputs or [] ++ [ autoreconfHook ]; + })) + ] ++ a.nativeBuildInputs or []; })).drivers; } ; @@ -14446,7 +14475,7 @@ in python = python37; }; - protobuf = protobuf3_8; + protobuf = protobuf3_12; protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { }; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; @@ -16070,6 +16099,12 @@ in jetty = callPackage ../servers/http/jetty { }; + jicofo = callPackage ../servers/jicofo { }; + + jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { }; + + jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; + kapow = callPackage ../servers/kapow { }; keycloak = callPackage ../servers/keycloak { }; @@ -17257,14 +17292,6 @@ in ]; }; - linux_5_6 = callPackage ../os-specific/linux/kernel/linux-5.6.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" - ]; - }; - linux_5_7 = callPackage ../os-specific/linux/kernel/linux-5.7.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -17502,7 +17529,6 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); - linuxPackages_5_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_6); linuxPackages_5_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_7); # When adding to this list: @@ -17541,7 +17567,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_latest; + linux_latest_for_hardened = pkgs.linux_5_7; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { @@ -18468,6 +18494,8 @@ in kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + kopia = callPackage ../tools/backup/kopia { }; + lato = callPackage ../data/fonts/lato {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; @@ -19872,6 +19900,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + finalfusion-utils = callPackage ../applications/science/machine-learning/finalfusion-utils { + inherit (darwin.apple_sdk.frameworks) Security; + }; + flacon = libsForQt5.callPackage ../applications/audio/flacon { }; flexget = callPackage ../applications/networking/flexget { }; @@ -20325,6 +20357,8 @@ in gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { }); + gnunet-gtk = callPackage ../applications/networking/p2p/gnunet/gtk.nix { }; + gocr = callPackage ../applications/graphics/gocr { }; gobby5 = callPackage ../applications/editors/gobby { }; @@ -20849,7 +20883,7 @@ in inherit (kdeApplications) akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog - keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake + keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; @@ -20992,6 +21026,8 @@ in ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; + lazpaint = callPackage ../applications/graphics/lazpaint { }; + caps = callPackage ../applications/audio/caps { }; lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; @@ -21054,6 +21090,7 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { + icu = icu64; variant = "still"; }); }); @@ -21073,12 +21110,7 @@ in linuxband = callPackage ../applications/audio/linuxband { }; - ledger = callPackage ../applications/office/ledger { - # Boost >= 1.67 changed the name of boost python; ledger's cmake build needs - # an update to find it: - # https://www.boost.org/doc/libs/1_68_0/libs/python/doc/html/rn.html - boost = boost15x; - }; + ledger = callPackage ../applications/office/ledger { }; ledger-autosync = callPackage ../applications/office/ledger-autosync { }; @@ -22371,6 +22403,8 @@ in udiskie = callPackage ../applications/misc/udiskie { }; + sacc = callPackage ../applications/networking/gopher/sacc { }; + sakura = callPackage ../applications/misc/sakura { }; sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; @@ -23864,12 +23898,10 @@ in monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; boost = boost17x; - pythonProtobuf = python3Packages.protobuf.override { protobuf = protobuf3_10; }; }; monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { boost = boost17x; - protobuf = protobuf3_10; }; masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; @@ -24567,6 +24599,8 @@ in service-wrapper = callPackage ../os-specific/linux/service-wrapper { }; + sfrotz = callPackage ../games/sfrotz { }; + sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { }; shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; @@ -24941,7 +24975,7 @@ in inherit (python3Packages) python pygobject3 pyxdg wrapPython; inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa; geoclue = geoclue2; - }) redshift redshift-wlr; + }) redshift redshift-wlr gammastep; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; @@ -25647,6 +25681,8 @@ in caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; + csxcad = callPackage ../applications/science/electronics/csxcad { }; + fparser = callPackage ../applications/science/electronics/fparser { }; geda = callPackage ../applications/science/electronics/geda { @@ -25657,6 +25693,8 @@ in gtkwave = callPackage ../applications/science/electronics/gtkwave { }; + hyp2mat = callPackage ../applications/science/electronics/hyp2mat { }; + fped = callPackage ../applications/science/electronics/fped { }; # this is a wrapper for kicad.base and kicad.libraries @@ -25911,7 +25949,7 @@ in android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; - antimicro = libsForQt5.callPackage ../tools/misc/antimicro { }; + antimicroX = libsForQt5.callPackage ../tools/misc/antimicroX { }; atari800 = callPackage ../misc/emulators/atari800 { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1e362d46361b7..63d4ec79a949c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -569,6 +569,8 @@ let mtime = callPackage ../development/ocaml-modules/mtime { }; + mustache = callPackage ../development/ocaml-modules/mustache { }; + nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; notty = callPackage ../development/ocaml-modules/notty { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 20c23c766e2ab..a8433bbfb9a02 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2166,7 +2166,7 @@ let ../development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch ]; buildInputs = [ TestWWWMechanizeCatalyst ]; - propagatedBuildInputs = [ CatalystRuntime Starman ]; + propagatedBuildInputs = [ CatalystRuntime Starman PodParser ]; meta = { description = "Replace the development server with Starman"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -11103,10 +11103,10 @@ let LogHandler = buildPerlModule { pname = "Log-Handler"; - version = "0.88"; + version = "0.90"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BL/BLOONIX/Log-Handler-0.88.tar.gz"; - sha256 = "45bf540ab2138ed3ff93afc205b0516dc75755b86acdcc5e75c41347833c293d"; + url = "mirror://cpan/authors/id/B/BL/BLOONIX/Log-Handler-0.90.tar.gz"; + sha256 = "0kgp3frz0y51j8kw67d6b4yyrrbh7syqraxchc7pfm442bkq0p1s"; }; propagatedBuildInputs = [ ParamsValidate ]; meta = { @@ -16231,7 +16231,7 @@ let url = "mirror://cpan/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.tar.gz"; sha256 = "01xifj83dv492lxixijmg6va02rf3ydlxly0a9slmx22r6qa1drh"; }; - propagatedBuildInputs = [ DevelSymdump ]; + propagatedBuildInputs = [ DevelSymdump PodParser ]; }; PodCoverageTrustPod = buildPerlPackage { @@ -16345,6 +16345,7 @@ let url = "mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz"; sha256 = "15a840ea1c8a76cd3c865fbbf2fec33b03615c0daa50f9c800c54e0cf0659d46"; }; + propagatedBuildInputs = [ PodParser ]; meta = { homepage = "https://github.com/timj/perl-Pod-LaTeX/tree/master"; description = "Convert Pod data to formatted Latex"; @@ -16413,6 +16414,7 @@ let url = "mirror://cpan/authors/id/R/RM/RMBARKER/Pod-Plainer-1.04.tar.gz"; sha256 = "1bbfbf7d1d4871e5a83bab2137e22d089078206815190eb1d5c1260a3499456f"; }; + propagatedBuildInputs = [ PodParser ]; meta = { description = "Perl extension for converting Pod to old-style Pod"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -16466,7 +16468,7 @@ let url = "mirror://cpan/authors/id/D/DO/DOLMEN/Pod-Spell-1.20.tar.gz"; sha256 = "6383f7bfe22bc0d839a08057a0ce780698b046184aea935be4833d94986dd03c"; }; - propagatedBuildInputs = [ ClassTiny FileShareDir LinguaENInflect PathTiny ]; + propagatedBuildInputs = [ ClassTiny FileShareDir LinguaENInflect PathTiny PodParser ]; buildInputs = [ FileShareDirInstall TestDeep ]; }; @@ -16521,6 +16523,7 @@ let url = "mirror://cpan/authors/id/N/NU/NUFFIN/Pod-Wrap-0.01.tar.gz"; sha256 = "0qwb5hp26f85xnb3zivf8ccfdplabiyl5sd53c6wgdgvzzicpjjh"; }; + propagatedBuildInputs = [ PodParser ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19537,7 +19540,7 @@ let sha256 = "2bfe771173c38b69eeb089504e3f76511b8e45e6a9e6dac3e616e400ea67bcf0"; }; buildInputs = [ ModuleBuildTiny TestPod ]; - propagatedBuildInputs = [ CaptureTiny Moose podlinkcheck ]; + propagatedBuildInputs = [ CaptureTiny Moose podlinkcheck PodParser ]; meta = { description = "Tests POD for invalid links"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e45f9a5bf15e3..578dcaf761bf9 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c -, gettext, bzip2, curl, libxml2, openssl, gmp, icu, oniguruma, libsodium +, gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng , freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit @@ -547,7 +547,7 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ cyrus_sasl - icu + icu64 openssl snappy zlib @@ -972,7 +972,7 @@ in enable = (!stdenv.isDarwin); } # interbase (7.3, 7.2) { name = "intl"; - buildInputs = [ icu ]; + buildInputs = [ icu64 ]; patches = lib.optional (lib.versionOlder php.version "7.4") (fetchpatch { url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch"; sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f06af874b919..5d1936056863c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -543,12 +543,16 @@ in { breezy = callPackage ../development/python-modules/breezy { }; + brother = callPackage ../development/python-modules/brother { }; + build = callPackage ../development/python-modules/build { }; ciso8601 = callPackage ../development/python-modules/ciso8601 { }; deepdiff = callPackage ../development/python-modules/deepdiff { }; + deepmerge = callPackage ../development/python-modules/deepmerge { }; + django-sesame = callPackage ../development/python-modules/django-sesame { }; bravado-core = callPackage ../development/python-modules/bravado-core { }; @@ -726,6 +730,8 @@ in { diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + eliot = callPackage ../development/python-modules/eliot {}; + entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; }; entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; }; @@ -870,6 +876,8 @@ in { httptools = callPackage ../development/python-modules/httptools { }; + hwi = callPackage ../development/python-modules/hwi { }; + i3ipc = callPackage ../development/python-modules/i3ipc { }; ignite = callPackage ../development/python-modules/ignite { }; @@ -1416,6 +1424,10 @@ in { pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; + pytest-tornasync = callPackage ../development/python-modules/pytest-tornasync { }; + + pytest-trio = callPackage ../development/python-modules/pytest-trio { }; + pytest-twisted = callPackage ../development/python-modules/pytest-twisted { }; pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; @@ -1549,6 +1561,10 @@ in { tokenizers = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenizers { })); + towncrier = callPackage ../development/python-modules/towncrier { + inherit (pkgs) git; + }; + transformers = callPackage ../development/python-modules/transformers { }; transforms3d = callPackage ../development/python-modules/transforms3d { }; @@ -1914,6 +1930,8 @@ in { async_generator = callPackage ../development/python-modules/async_generator { }; + async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; + asn1ate = callPackage ../development/python-modules/asn1ate { }; atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; @@ -2090,9 +2108,7 @@ in { cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; - cirq = callPackage ../development/python-modules/cirq { - pythonProtobuf = self.protobuf; - }; + cirq = callPackage ../development/python-modules/cirq { }; citeproc-py = callPackage ../development/python-modules/citeproc-py { }; @@ -2229,6 +2245,8 @@ in { bsddb3 = callPackage ../development/python-modules/bsddb3 { }; + bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; + bkcharts = callPackage ../development/python-modules/bkcharts { }; bokeh = callPackage ../development/python-modules/bokeh { }; @@ -2348,6 +2366,8 @@ in { click-completion = callPackage ../development/python-modules/click-completion {}; + click-datetime = callPackage ../development/python-modules/click-datetime { }; + click-default-group = callPackage ../development/python-modules/click-default-group { }; click-didyoumean = callPackage ../development/python-modules/click-didyoumean {}; @@ -2502,6 +2522,8 @@ in { openidc-client = callPackage ../development/python-modules/openidc-client {}; + openwebifpy = callPackage ../development/python-modules/openwebifpy {}; + optuna = callPackage ../development/python-modules/optuna { }; idna = callPackage ../development/python-modules/idna { }; @@ -2560,6 +2582,8 @@ in { pysingleton = callPackage ../development/python-modules/pysingleton { }; + python-didl-lite = callPackage ../development/python-modules/python-didl-lite { }; + python-jose = callPackage ../development/python-modules/python-jose {}; python-json-logger = callPackage ../development/python-modules/python-json-logger { }; @@ -2568,6 +2592,8 @@ in { pyhcl = callPackage ../development/python-modules/pyhcl { }; + pyhs100 = callPackage ../development/python-modules/pyhs100 { }; + pytest = if isPy3k then self.pytest_5 else self.pytest_4; pytest_5 = callPackage ../development/python-modules/pytest { @@ -3591,6 +3617,8 @@ in { rotate-backups = callPackage ../tools/backup/rotate-backups { }; + liblarch = callPackage ../development/python-modules/liblarch { }; + librosa = callPackage ../development/python-modules/librosa { }; samplerate = callPackage ../development/python-modules/samplerate { }; @@ -4004,6 +4032,8 @@ in { jsonschema = callPackage ../development/python-modules/jsonschema { }; + vcver = callPackage ../development/python-modules/vcver { }; + vcversioner = callPackage ../development/python-modules/vcversioner { }; falcon = callPackage ../development/python-modules/falcon { }; @@ -5342,7 +5372,7 @@ in { protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; doCheck = !isPy3k; - protobuf = pkgs.protobuf3_8; + protobuf = pkgs.protobuf3_12; }; psd-tools = callPackage ../development/python-modules/psd-tools { }; @@ -5539,6 +5569,8 @@ in { pyinotify = callPackage ../development/python-modules/pyinotify { }; + pyipp = callPackage ../development/python-modules/pyipp { }; + pyjwt = callPackage ../development/python-modules/pyjwt { }; pykickstart = callPackage ../development/python-modules/pykickstart { }; @@ -6702,6 +6734,8 @@ in { vultr = callPackage ../development/python-modules/vultr { }; + vulture = callPackage ../development/python-modules/vulture { }; + wadllib = callPackage ../development/python-modules/wadllib { }; waitress = callPackage ../development/python-modules/waitress { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 5e392ff1b88e2..af4dab5d263c0 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -161,6 +161,10 @@ in i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded; x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded; + # we test `embedded` instead of `linuxCommon` because very few packages + # successfully cross-compile to Redox so far + x86_64-redox = mapTestOnCross lib.systems.examples.x86_64-unknown-redox embedded; + /* Cross-built bootstrap tools for every supported platform */ bootstrapTools = let tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index c11858f09c8f5..5fc6e91b31181 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -34,6 +34,7 @@ let manual = import ../../doc { inherit pkgs nixpkgs; }; lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; + pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; }; darwin-tested = if supportDarwin then pkgs.releaseTools.aggregate { name = "nixpkgs-darwin-${jobs.tarball.version}"; @@ -91,6 +92,7 @@ let [ jobs.tarball jobs.manual jobs.lib-tests + jobs.pkgs-lib-tests jobs.stdenv.x86_64-linux jobs.linux.x86_64-linux jobs.pandoc.x86_64-linux diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index b4c1ee9ab3de9..2d7f0883ca25e 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -216,6 +216,10 @@ in { libressl = super.libressl.override { buildShared = false; }; + libjpeg_turbo = super.libjpeg_turbo.override { + enableStatic = true; + enableShared = false; + }; darwin = super.darwin // { libiconv = super.darwin.libiconv.override { @@ -276,4 +280,28 @@ in { libev = super.libev.override { static = true; }; libexecinfo = super.libexecinfo.override { enableShared = false; }; + + xorg = super.xorg.overrideScope' (xorgself: xorgsuper: { + libX11 = xorgsuper.libX11.overrideAttrs (attrs: { + depsBuildBuild = attrs.depsBuildBuild ++ [ (self.buildPackages.stdenv.cc.libc.static or null) ]; + }); + xauth = xorgsuper.xauth.overrideAttrs (attrs: { + # missing transitive dependencies + preConfigure = attrs.preConfigure or "" + '' + export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp" + ''; + }); + xdpyinfo = xorgsuper.xdpyinfo.overrideAttrs (attrs: { + # missing transitive dependencies + preConfigure = attrs.preConfigure or "" + '' + export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lXau -lXdmcp" + ''; + }); + libxcb = xorgsuper.libxcb.overrideAttrs (attrs: { + configureFlags = attrs.configureFlags ++ [ "--disable-shared" ]; + }); + libXi= xorgsuper.libXi.overrideAttrs (attrs: { + configureFlags = attrs.configureFlags ++ [ "--disable-shared" ]; + }); + }); } |